1

logic/service/fight/loop.go

@@ -138,7 +138,7 @@ func (f *FightC) battleLoop() {
 func (f *FightC) collectPlayerActions(ourID, oppID uint32) map[uint32]action.BattleActionI {
 	actions := make(map[uint32]action.BattleActionI)
 
-	waitr := time.Duration(f.waittime)*time.Millisecond*10 + 60*time.Second
+	waitr := time.Duration(f.waittime)*time.Millisecond*10 + 30*time.Second
 
 	timeout := time.After(waitr)
 	for len(actions) < 2 {
@@ -188,6 +188,7 @@ func (f *FightC) collectPlayerActions(ourID, oppID uint32) map[uint32]action.Bat
 					// oldpet := selfinput.CurrentPet
 					// InitAttackValue := *selfinput.AttackValue
 					selfinput.CurrentPet, ret.Reason = selfinput.GetPet(ret.Cid)
+
 					selfinput.Player.SendPackCmd(2407, &ret.Reason)
 
 					f.Switch[selfinput.UserID] = ret
@@ -214,6 +215,8 @@ func (f *FightC) collectPlayerActions(ourID, oppID uint32) map[uint32]action.Bat
 						}
 						continue
 					}
+				} else {
+					continue
 				}
 
 			} else {