修改map1图片 去掉黑色部分
添加遮挡的图片和逻辑
Merge branch 'master' of https://github.com/ZeusTeam/Zeus into able

Conflicts:
	src/client/zeusclient/gameobject/map/gamemap.cpp
	src/client/zeusclient/scene/playscene.cpp
解决冲突
解决冲突
没法从master拉到 只好自己传到branch
Merge branch 'master' of https://github.com/ZeusTeam/Zeus into AngryPowman
修改打印文字的顺序
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
回滚！
Merge branch 'master' of https://github.com/ZeusTeam/Zeus

Conflicts:
	src/client/zeusclient/control/controlobject/out_text.cpp
	src/client/zeusclient/scene/playscene.cpp
回滚
Merge branch 'master' of https://github.com/ZeusTeam/Zeus
回滚！
Merge pull request #6 from ZeusTeam/Sum

回滚！
回滚！
Merge branch 'master' of https://github.com/ZeusTeam/Zeus into Sum
修改代码格式