no message
no message
no message
no message
Merge branch 'fight_yby' of https://github.com/yby415098820/nz into fight_yby

Conflicts:
	app/fight/FightPlayer.lua
多点触摸
no message
no message
多点触摸
LevelMapLayer层UI部分基本写完，除了按钮的高亮和置灰。
no message
准星
UI动画处理完毕，还差按钮高亮置灰、弹窗。
no message
Merge branch 'nz' into levelMap

Conflicts:
	app/scenes/MainScene.lua
no message
Merge branch 'nz' into levelDetail