没法从master拉到 只好自己传到branch
修改打印文字的顺序
Revert "Merge branch 'master' of https://github.com/ZeusTeam/Zeus into able"

This reverts commit 87232b165140faec6c9beb8bba1c45f5d76b49bb, reversing
changes made to 808b6c1611b016761ae5395daf4534c757cc7687.

Conflicts:
	src/client/zeusclient/control/controlobject/out_text.cpp
	src/client/zeusclient/scene/playscene.cpp
Revert "Merge branch 'master' of https://github.com/ZeusTeam/Zeus into able"

This reverts commit 87232b165140faec6c9beb8bba1c45f5d76b49bb, reversing
changes made to 808b6c1611b016761ae5395daf4534c757cc7687.

Conflicts:
	src/client/zeusclient/control/controlobject/out_text.cpp
	src/client/zeusclient/scene/playscene.cpp
Revert "Merge branch 'master' of https://github.com/ZeusTeam/Zeus into able"

This reverts commit 87232b165140faec6c9beb8bba1c45f5d76b49bb, reversing
changes made to 808b6c1611b016761ae5395daf4534c757cc7687.

Conflicts:
	src/client/zeusclient/control/controlobject/out_text.cpp
	src/client/zeusclient/scene/playscene.cpp