From f7f9d709b59425b18755df1eae21d6dca3feb76a Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Fri, 4 Jul 2025 23:31:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BD=93=E9=A6=96=E9=80=89=E5=85=B3?=
 =?UTF-8?q?=E5=8D=A1=E4=B8=BA=E5=89=BF=E7=81=AD=E6=97=B6=EF=BC=8C=E5=90=8E?=
 =?UTF-8?q?=E7=BB=AD=E5=A4=87=E9=80=89=E5=85=B3=E5=8D=A1=E5=92=8C=E5=89=A9?=
 =?UTF-8?q?=E4=BD=99=E7=90=86=E6=99=BA=E5=87=BA=E7=8E=B0=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E4=BC=9A=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Main/AsstProxy.cs                   | 4 +++-
 src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs
index e986b17169..7f6b1c661d 100644
--- a/src/MaaWpfGui/Main/AsstProxy.cs
+++ b/src/MaaWpfGui/Main/AsstProxy.cs
@@ -760,7 +760,8 @@ namespace MaaWpfGui.Main
                 case AsstMsg.TaskChainError:
                     {
                         // 对剿灭的特殊处理，如果刷完了剿灭还选了剿灭会因为找不到入口报错
-                        if (taskChain == "Fight" && (TaskQueueViewModel.FightTask.Stage == "Annihilation"))
+                        _tasksStatus.TryGetValue(taskId, out var value);
+                        if (value is { Type: TaskType.Fight } && (TaskQueueViewModel.FightTask.Stage == "Annihilation"))
                         {
                             if (TaskQueueViewModel.FightTask.Stages.Any(stage => Instances.TaskQueueViewModel.IsStageOpen(stage) && (stage != "Annihilation")))
                             {
@@ -2060,6 +2061,7 @@ namespace MaaWpfGui.Main
             StartUp,
             CloseDown,
             Fight,
+            FightAnnihilationAlternate,
             FightRemainingSanity,
             Recruit,
             Infrast,
diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
index a98990c69a..409c5eebba 100644
--- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
@@ -1616,7 +1616,7 @@ namespace MaaWpfGui.ViewModels.UI
                     task.Stone = 0;
                     task.MaxTimes = int.MaxValue;
                     task.Drops = [];
-                    mainFightRet = Instances.AsstProxy.AsstAppendTaskWithEncoding(TaskType.FightRemainingSanity, type, task.Serialize().Params);
+                    mainFightRet = Instances.AsstProxy.AsstAppendTaskWithEncoding(TaskType.FightAnnihilationAlternate, type, task.Serialize().Params);
                     break;
                 }
             }