调整阵型
Merge remote-tracking branch 'origin/master'

Conflicts:
	game/src/game/battle/auto/Formation9.java
	game/src/game/fighter/BaseFighter.java