From 0c2a7944e5db74c224f4859fb28fbf7e158f0bbf 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:35:00 +0800
Subject: [PATCH] 1

---
 logic/service/fight/fightc.go | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/logic/service/fight/fightc.go b/logic/service/fight/fightc.go
index 3e8798062..b58a0a955 100644
--- a/logic/service/fight/fightc.go
+++ b/logic/service/fight/fightc.go
@@ -33,7 +33,12 @@ func (*FightC) processSkillAttack(attacker, defender *input.Input, skill *info.S
 	var originalProps [2][6]int8
 	var originalPetInfo [2]model.PetInfo
 	originalProps[0], originalProps[1] = attacker.Prop, defender.Prop //先复制能力提升
-	originalPetInfo[0], originalPetInfo[1] = attacker.CurrentPet.Info, defender.CurrentPet.Info
+	if attacker != nil {
+		originalPetInfo[0] = attacker.CurrentPet.Info
+	}
+	if defender != nil {
+		originalPetInfo[1] = defender.CurrentPet.Info
+	}
 
 	attacker.Exec(func(effect input.Effect) bool {
 		//计算变威力
@@ -53,7 +58,13 @@ func (*FightC) processSkillAttack(attacker, defender *input.Input, skill *info.S
 	}
 
 	attacker.Prop, defender.Prop = originalProps[0], originalProps[1]
-	attacker.CurrentPet.Info, defender.CurrentPet.Info = originalPetInfo[0], originalPetInfo[1]
+	if attacker != nil {
+		attacker.CurrentPet.Info = originalPetInfo[0]
+	}
+	if defender != nil {
+		defender.CurrentPet.Info = originalPetInfo[1]
+	}
+
 	if attacker.IsCritical == 1 { //命中了才有暴击
 		//暴击破防
 		if skill.Category() == info.Category.PHYSICAL && defender.Prop[1] > 0 {