修改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
解决冲突
解决冲突