junsong
Merge branch 'nz' of https://github.com/yby415098820/nz into nz

Conflicts:
	app/fight/fightConfigs/wave1_2.lua