From 5af7efa04be3c0cf3a27747423aa1ff8a3a93b7b Mon Sep 17 00:00:00 2001
From: status102 <102887808+status102@users.noreply.github.com>
Date: Sat, 12 Apr 2025 20:35:24 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"chore:=20=E7=BB=99=E5=89=A9=E4=BD=99?=
 =?UTF-8?q?=E7=90=86=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

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

diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
index 2cc28cd2d2..42e88e6382 100644
--- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
@@ -1584,30 +1584,25 @@ namespace MaaWpfGui.ViewModels.UI
                 }
             }
 
-            if (!mainFightRet || !FightTask.UseRemainingSanityStage || string.IsNullOrEmpty(FightTask.RemainingSanityStage))
+            if (mainFightRet && FightTask.UseRemainingSanityStage && !string.IsNullOrEmpty(FightTask.RemainingSanityStage))
             {
-                return mainFightRet;
+                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);
             }
 
-            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;
+            return mainFightRet;
         }
 
         public bool EnableSetFightParams { get; set; } = true;