敌人基类
更换武器
战斗
Merge branch 'nz' of https://github.com/yby415098820/nz into nz
俊松 数值
狙击
no message
Merge branch 'nz' of https://github.com/yby415098820/nz into nz

Conflicts:
	app/fight/Hero.lua
	app/fight/MapView.lua
	app/fight/fightConfigs/wave1_3.lua
no message
Merge branch 'nz' into store

Conflicts:
	app/scenes/MainScene.lua