no message
Merge branch 'nz' of https://github.com/yby415098820/nz into nz
no message
第一关boss
Merge branch 'nz' of https://github.com/yby415098820/nz into nz

Conflicts:
	app/fight/MapView.lua
	app/fight/enemys/BossView.lua
	app/fight/fightConfigs/wave1_1.lua
第一关boss
no message
第一个boss 关卡配置
Merge branch 'nz' of https://github.com/yby415098820/nz into yanxin

Conflicts:
	app/fight/Actor.lua
	app/fight/MapView.lua
	app/fight/enemys/Boss.lua
	app/fight/enemys/BossView.lua
	app/fight/enemys/EnemyView.lua
	app/includes/functionUtils.lua
合并分支,解决冲突