实现战斗流程，修复相关战斗中心错误
Merge branch 'master' of github.com:MacDino/fightgame