第一关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
合并分支,解决冲突
稳定版本
Merge branches 'yanxin' and 'nz' of https://github.com/yby415098820/nz into yanxin
提交yanxin分支稳定版本,新增改变金币数目功能,10个连杀触发黄金武器功能,boss和玩家血条功能,
no message
Merge branch 'nz' of https://github.com/yby415098820/nz into nz
no message
Merge branch 'nz' into inlay

Conflicts:
	app/inl/InlayLayer.lua
	app/inl/InlayListCell.lua
	app/inlay/InlayListCell.lua
	app/weaponList/WeaponListCell.lua
	app/weaponList/WeaponListLayer.lua