技能选项
Merge remote-tracking branch 'origin/master'

Conflicts:
	game/resource/skill.xml
	game/src/game/battle/auto/AutoBattle.java
	game/src/game/battle/auto/skill/S001.java
	game/src/game/battle/formation/IFormation.java
	game/src/game/fighter/FighterAttribute.java