From 753c59562593a39a8fb35e3bc827de262db602a9 Mon Sep 17 00:00:00 2001
From: cookie981 <83451181+cookie981@users.noreply.github.com>
Date: Sun, 17 May 2026 23:10:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=B8=80=E9=94=AE=E5=AE=8F=E5=81=9C?=
 =?UTF-8?q?=E6=AD=A2=E6=97=B6=E7=AB=8B=E5=8D=B3=E6=9D=BE=E5=BC=80=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E6=8C=89=E9=94=AE=20(#3126)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BetterGenshinImpact/GameTask/AutoFight/OneKeyFightTask.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/BetterGenshinImpact/GameTask/AutoFight/OneKeyFightTask.cs b/BetterGenshinImpact/GameTask/AutoFight/OneKeyFightTask.cs
index 88f2864e..dbfa63db 100644
--- a/BetterGenshinImpact/GameTask/AutoFight/OneKeyFightTask.cs
+++ b/BetterGenshinImpact/GameTask/AutoFight/OneKeyFightTask.cs
@@ -1,4 +1,5 @@
 using BetterGenshinImpact.Core.Config;
+using BetterGenshinImpact.Core.Simulator;
 using BetterGenshinImpact.GameTask.AutoFight.Model;
 using BetterGenshinImpact.GameTask.AutoFight.Script;
 using BetterGenshinImpact.Model;
@@ -74,6 +75,7 @@ public class OneKeyFightTask : Singleton<OneKeyFightTask>
             else
             {
                 _cts.Cancel();
+                Simulation.ReleaseAllKey();
             }
         }
     }
@@ -89,6 +91,7 @@ public class OneKeyFightTask : Singleton<OneKeyFightTask>
         if (IsHoldOnMode())
         {
             _cts?.Cancel();
+            Simulation.ReleaseAllKey();
         }
     }
 
@@ -179,9 +182,9 @@ public class OneKeyFightTask : Singleton<OneKeyFightTask>
                     // 通用化战斗策略
                     foreach (var command in combatCommands)
                     {
+                        if (ct.IsCancellationRequested) break;
                         if (command.ActivatingRound != null && command.ActivatingRound.Count > 0 && !command.ActivatingRound.Contains(round))
                         {
-                            // 跳过强制首轮指令
                             continue;
                         }
                         command.Execute(activeAvatar);