edit collision of the map
Merge pull request #1 from ZeusTeam/Sum

加入地图滚动 新碰撞
Merge branch 'able' of https://github.com/ZeusTeam/Zeus into Sum
修正BUG
Merge branch 'master' of https://github.com/ZeusTeam/Zeus into Sum