初步调通战斗过程
初步调通
Merge branch 'master' of https://github.com/babizhu/The-city-of-hero.git

Conflicts:
	CityOfHero/.classpath
	CityOfHero/bin/game/battle/auto/AttackInfo.class
	CityOfHero/bin/game/battle/auto/AutoBattle.class
	CityOfHero/bin/game/battle/auto/AutoBattleTest.class
	CityOfHero/bin/game/battle/auto/Formation.class
	CityOfHero/bin/game/battle/formula/Formula$1.class
	CityOfHero/bin/game/battle/formula/Formula$2.class
	CityOfHero/bin/game/battle/formula/Formula$3.class
	CityOfHero/bin/game/battle/formula/Formula$4.class
	CityOfHero/bin/game/battle/formula/Formula.class
	CityOfHero/bin/game/battle/skill/cfg/SkillTempletCfg.class
	CityOfHero/bin/game/fighter/FighterBase.class
	CityOfHero/bin/game/fighter/cfg/NpcFighterTemplet.class
	CityOfHero/bin/game/fighter/cfg/NpcFighterTempletCfg.class
	CityOfHero/bin/game/mission/cfg/MissionTempletCfg.class
	CityOfHero/bin/game/partner/PartnerBase.class
	CityOfHero/src/game/fighter/FighterBase.java
	CityOfHero/src/game/fighter/cfg/NpcFighterTemplet.java