增加战斗逻辑
Merge branch 'master' of github.com:MacDino/fightgame
Merge branch 'master' of github.com:MacDino/fightgame
Merge branch 'master' of github.com:MacDino/fightgame
增加新战斗逻辑判断