From 6db893a23dc9cd24802c2e8ea790bfb287750e65 Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Sat, 12 Apr 2025 17:42:57 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E7=BB=99=E5=89=A9=E4=BD=99=E7=90=86?=
 =?UTF-8?q?=E6=99=BA=E5=8A=A0=E4=B8=AA=E5=85=9C=E5=BA=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/UI/TaskQueueViewModel.cs       | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
index 42e88e6382..2cc28cd2d2 100644
--- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
@@ -1584,25 +1584,30 @@ namespace MaaWpfGui.ViewModels.UI
                 }
             }
 
-            if (mainFightRet && FightTask.UseRemainingSanityStage && !string.IsNullOrEmpty(FightTask.RemainingSanityStage))
+            if (!mainFightRet || !FightTask.UseRemainingSanityStage || string.IsNullOrEmpty(FightTask.RemainingSanityStage))
             {
-                var task = new AsstFightTask()
-                {
-                    Stage = FightTask.RemainingSanityStage,
-                    MaxTimes = int.MaxValue,
-                    Series = 1,
-                    IsDrGrandet = FightTask.IsDrGrandet,
-                    ReportToPenguin = SettingsViewModel.GameSettings.EnablePenguin,
-                    ReportToYituliu = SettingsViewModel.GameSettings.EnableYituliu,
-                    PenguinId = SettingsViewModel.GameSettings.PenguinId,
-                    YituliuId = SettingsViewModel.GameSettings.PenguinId,
-                    ServerType = Instances.SettingsViewModel.ServerType,
-                    ClientType = SettingsViewModel.GameSettings.ClientType,
-                };
-                return Instances.AsstProxy.AsstAppendTaskWithEncoding(TaskType.FightRemainingSanity, type, task.Serialize().Params);
+                return mainFightRet;
             }
 
-            return mainFightRet;
+            var remainingSanityTask = new AsstFightTask()
+            {
+                Stage = FightTask.RemainingSanityStage,
+                MaxTimes = int.MaxValue,
+                Series = 1,
+                IsDrGrandet = FightTask.IsDrGrandet,
+                ReportToPenguin = SettingsViewModel.GameSettings.EnablePenguin,
+                ReportToYituliu = SettingsViewModel.GameSettings.EnableYituliu,
+                PenguinId = SettingsViewModel.GameSettings.PenguinId,
+                YituliuId = SettingsViewModel.GameSettings.PenguinId,
+                ServerType = Instances.SettingsViewModel.ServerType,
+                ClientType = SettingsViewModel.GameSettings.ClientType,
+            };
+            if (!Instances.AsstProxy.AsstAppendTaskWithEncoding(TaskType.FightRemainingSanity, type, remainingSanityTask.Serialize().Params))
+            {
+                AddLog("RemainingSanity Error", UiLogColor.Error);
+            }
+
+            return true;
         }
 
         public bool EnableSetFightParams { get; set; } = true;