1

logic/service/fight/boss/NewSeIdx_1.go

@@ -22,6 +22,12 @@ func (e *NewSel0) SwitchOut(in *input.Input) bool {
 	return true
 }
 func (e *NewSel0) IsOwner() bool {
+	if e.Ctx().Our == nil {
+		return false
+	}
+	if e.Ctx().Our.CurrentPet == nil {
+		return false
+	}
 	return e.ID().GetCatchTime() == e.Ctx().Our.CurrentPet.Info.CatchTime
 }
 

logic/service/fight/boss/NewSeIdx_65.go

@@ -14,9 +14,10 @@ type NewSel65 struct {
 }
 
 func (e *NewSel65) DamageAdd(t *info.DamageZone) bool {
-	if e.ID().GetCatchTime() != e.Ctx().Our.CurrentPet.Info.CatchTime {
+	if !e.IsOwner() {
 		return true
 	}
+
 	if e.Ctx().SkillEntity == nil {
 		return true
 	}

logic/service/fight/loop.go

@@ -245,7 +245,7 @@ func (f *FightC) handleTimeout(ourID, oppID uint32, actions map[uint32]action.Ba
 		if _, exists := actions[pid]; exists {
 			continue
 		}
-		cool.Logger.Debug(context.Background(), "玩家超时", pid)
+		//cool.Logger.Debug(context.Background(), "玩家超时", pid)
 
 		f.Reason = info.BattleOverReason.PlayerOVerTime
 		f.closefight = true