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

Conflicts:
	app/fight/FightPlayer.lua