From a3e8e4dd19ed57acff878ee3b5c67ec9177e2c57 Mon Sep 17 00:00:00 2001
From: 1 <1@72wo.cn>
Date: Tue, 16 Dec 2025 07:42:45 +0000
Subject: [PATCH] =?UTF-8?q?fix(fight):=20=E6=81=A2=E5=A4=8DNPC=E6=AD=BB?=
 =?UTF-8?q?=E5=88=87=E5=8A=A8=E4=BD=9C=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=B9=B6=E6=B3=A8=E9=87=8A=E6=8E=89=E5=AF=B9=E6=89=8B=E5=8A=A8?=
 =?UTF-8?q?=E4=BD=9C=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logic/service/fight/loop.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/logic/service/fight/loop.go b/logic/service/fight/loop.go
index d09bc0fad..dec32f7d2 100644
--- a/logic/service/fight/loop.go
+++ b/logic/service/fight/loop.go
@@ -173,12 +173,12 @@ func (f *FightC) collectPlayerActions(ourID, oppID uint32) map[uint32]action.Bat
 					if selfinput.CanChange == 2 {
 
 						selfinput.CanChange = 0
-						// if f.Info.Status == info.BattleMode.FIGHT_WITH_NPC && pid == 0 {
-						// 	f.Switch = make(map[uint32]*action.ActiveSwitchAction)
-						// 	f.Our.Player.SendPackCmd(2407, &ret.Reason)
-						// 	f.Opp.GetAction()
-						// 	println("开始执行NPC死切动作")
-						// }
+						if f.Info.Status == info.BattleMode.FIGHT_WITH_NPC && pid == 0 {
+							f.Switch = make(map[uint32]*action.ActiveSwitchAction)
+							f.Our.Player.SendPackCmd(2407, &ret.Reason)
+							// f.Opp.GetAction()
+							println("开始执行NPC死切动作")
+						}
 						continue
 					}
 				}