提交本周稳定版本
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
合并分支,解决冲突