From 94c9c4e44c766d6d4575b8ab3281fc77005ac346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=94=E5=BF=B5?=
 <12574910+72wo@users.noreply.github.com>
Date: Tue, 3 Feb 2026 00:31:38 +0800
Subject: [PATCH] 1

---
 logic/service/fight/boss/NewSeIdx_1.go  | 6 ++++++
 logic/service/fight/boss/NewSeIdx_65.go | 3 ++-
 logic/service/fight/loop.go             | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/logic/service/fight/boss/NewSeIdx_1.go b/logic/service/fight/boss/NewSeIdx_1.go
index 4e6ac4de4..ba57697e1 100644
--- a/logic/service/fight/boss/NewSeIdx_1.go
+++ b/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
 }
 
diff --git a/logic/service/fight/boss/NewSeIdx_65.go b/logic/service/fight/boss/NewSeIdx_65.go
index fd29c64f5..ab2ab3305 100644
--- a/logic/service/fight/boss/NewSeIdx_65.go
+++ b/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
 	}
diff --git a/logic/service/fight/loop.go b/logic/service/fight/loop.go
index 61ffe5d32..304be1c3b 100644
--- a/logic/service/fight/loop.go
+++ b/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