diff --git a/logic/service/fight/loop.go b/logic/service/fight/loop.go index b7829e05..c4a04faa 100644 --- a/logic/service/fight/loop.go +++ b/logic/service/fight/loop.go @@ -162,13 +162,10 @@ func (f *FightC) collectPlayerActions(ourID, oppID uint32) map[uint32]action.Bat if pid != ourID && pid != oppID { continue } - // if f.Info.Status == info.BattleMode.FIGHT_WITH_NPC && pid != 0 { - // f.Opp.GetAction() - // } selfinput := f.GetInputByAction(paction, false) if ret, ok := paction.(*action.ActiveSwitchAction); ok { - // println("玩家执行切换精灵动作:", pid, ret.Cid) + //正常结束可以切换,以及死切后还能再切一次 if selfinput.CanChange == 0 { if selfinput.CurrentPet.Info.Hp > 0 { //非死亡切换