重构战斗模块中
Merge remote-tracking branch 'origin/master'

Conflicts:
	game/src/game/battle/auto/AutoBattleUtil.java
	game/src/game/battle/formula/NormalAttackFormula.java