From 6a5872339811c65a80e90aa226d0e8d5188a742e Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Wed, 3 Sep 2025 20:07:19 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=B0=86=20=EF=BD=A2=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E8=82=89=E9=B8=BD=E5=9C=A8=E6=88=98=E6=96=97=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E5=89=8D=E5=BB=B6=E8=BF=9F=E5=81=9C=E6=AD=A2=E5=8A=A8?=
 =?UTF-8?q?=E4=BD=9C=EF=BD=A3=20=E4=BB=8E=20=EF=BD=A2=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=EF=BD=A3=20=E7=A7=BB=E5=88=B0=20=EF=BD=A2?=
 =?UTF-8?q?=E8=82=89=E9=B8=BD=E8=AE=BE=E7=BD=AE=EF=BD=A3=20=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Main/AsstProxy.cs                   |  2 +-
 src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs |  4 ++--
 .../Settings/GameSettingsUserControlModel.cs      | 15 ---------------
 .../RoguelikeSettingsUserControlModel.cs          | 15 +++++++++++++++
 .../Settings/GameSettingsUserControl.xaml         |  6 ------
 .../TaskQueue/RoguelikeSettingsUserControl.xaml   |  6 ++++++
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs
index 8c1c17a8bc..a4150e3ae9 100644
--- a/src/MaaWpfGui/Main/AsstProxy.cs
+++ b/src/MaaWpfGui/Main/AsstProxy.cs
@@ -1712,7 +1712,7 @@ namespace MaaWpfGui.Main
                 case "StageInfo":
                     {
                         Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("StartCombat") + subTaskDetails!["name"]);
-                        if (SettingsViewModel.GameSettings.RoguelikeDelayAbortUntilCombatComplete)
+                        if (TaskQueueViewModel.RoguelikeTask.RoguelikeDelayAbortUntilCombatComplete)
                         {
                             Instances.TaskQueueViewModel.RoguelikeInCombatAndShowWait = true;
                         }
diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
index 6cc9736da9..3fb2a73b3e 100644
--- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
@@ -1394,7 +1394,7 @@ namespace MaaWpfGui.ViewModels.UI
         {
             Waiting = true;
             AddLog(LocalizationHelper.GetString("Waiting"));
-            if (SettingsViewModel.GameSettings.RoguelikeDelayAbortUntilCombatComplete)
+            if (RoguelikeTask.RoguelikeDelayAbortUntilCombatComplete)
             {
                 await WaitUntilRoguelikeCombatComplete();
 
@@ -1411,7 +1411,7 @@ namespace MaaWpfGui.ViewModels.UI
         private async Task WaitUntilRoguelikeCombatComplete()
         {
             int time = 0;
-            while (SettingsViewModel.GameSettings.RoguelikeDelayAbortUntilCombatComplete && RoguelikeInCombatAndShowWait && time < 600 && !Stopping)
+            while (RoguelikeTask.RoguelikeDelayAbortUntilCombatComplete && RoguelikeInCombatAndShowWait && time < 600 && !Stopping)
             {
                 await Task.Delay(1000);
                 ++time;
diff --git a/src/MaaWpfGui/ViewModels/UserControl/Settings/GameSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/Settings/GameSettingsUserControlModel.cs
index 1e9ba07ba9..5314d73729 100644
--- a/src/MaaWpfGui/ViewModels/UserControl/Settings/GameSettingsUserControlModel.cs
+++ b/src/MaaWpfGui/ViewModels/UserControl/Settings/GameSettingsUserControlModel.cs
@@ -150,21 +150,6 @@ public class GameSettingsUserControlModel : PropertyChangedBase
         }
     }
 
-    private bool _roguelikeDelayAbortUntilCombatComplete = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.RoguelikeDelayAbortUntilCombatComplete, bool.FalseString));
-
-    /// <summary>
-    /// Gets or sets a value indicating whether delay abort until battle complete
-    /// </summary>
-    public bool RoguelikeDelayAbortUntilCombatComplete
-    {
-        get => _roguelikeDelayAbortUntilCombatComplete;
-        set
-        {
-            SetAndNotify(ref _roguelikeDelayAbortUntilCombatComplete, value);
-            ConfigurationHelper.SetValue(ConfigurationKeys.RoguelikeDelayAbortUntilCombatComplete, value.ToString());
-        }
-    }
-
     private string _startsWithScript = ConfigurationHelper.GetValue(ConfigurationKeys.StartsWithScript, string.Empty);
 
     public string StartsWithScript
diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/RoguelikeSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/RoguelikeSettingsUserControlModel.cs
index cbe4a72158..d1d4a945b6 100644
--- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/RoguelikeSettingsUserControlModel.cs
+++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/RoguelikeSettingsUserControlModel.cs
@@ -933,6 +933,21 @@ public class RoguelikeSettingsUserControlModel : TaskViewModel
         }
     }
 
+    private bool _roguelikeDelayAbortUntilCombatComplete = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.RoguelikeDelayAbortUntilCombatComplete, bool.FalseString));
+
+    /// <summary>
+    /// Gets or sets a value indicating whether delay abort until battle complete
+    /// </summary>
+    public bool RoguelikeDelayAbortUntilCombatComplete
+    {
+        get => _roguelikeDelayAbortUntilCombatComplete;
+        set
+        {
+            SetAndNotify(ref _roguelikeDelayAbortUntilCombatComplete, value);
+            ConfigurationHelper.SetValue(ConfigurationKeys.RoguelikeDelayAbortUntilCombatComplete, value.ToString());
+        }
+    }
+
     private bool _roguelikeStartWithSeed = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.RoguelikeStartWithSeed, bool.FalseString));
 
     /// <summary>
diff --git a/src/MaaWpfGui/Views/UserControl/Settings/GameSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/Settings/GameSettingsUserControl.xaml
index c8b146f707..a87dcbda77 100644
--- a/src/MaaWpfGui/Views/UserControl/Settings/GameSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/Settings/GameSettingsUserControl.xaml
@@ -80,12 +80,6 @@
                 Margin="20,10"
                 Content="{DynamicResource AutoRestartOption}"
                 IsChecked="{Binding AutoRestartOnDrop}" />
-            <CheckBox Margin="0,10" IsChecked="{Binding RoguelikeDelayAbortUntilCombatComplete}">
-                <TextBlock
-                    Block.TextAlignment="Left"
-                    Text="{DynamicResource RoguelikeDelayAbortUntilCombatComplete}"
-                    TextWrapping="Wrap" />
-            </CheckBox>
         </StackPanel>
         <hc:TextBox
             Grid.Row="7"
diff --git a/src/MaaWpfGui/Views/UserControl/TaskQueue/RoguelikeSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/TaskQueue/RoguelikeSettingsUserControl.xaml
index ce73abc7dc..9f25f21069 100644
--- a/src/MaaWpfGui/Views/UserControl/TaskQueue/RoguelikeSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/TaskQueue/RoguelikeSettingsUserControl.xaml
@@ -337,6 +337,12 @@
                     Text="{DynamicResource RoguelikeStartWithSeed}"
                     TextWrapping="Wrap" />
             </CheckBox>-->
+            <CheckBox Margin="0,10" IsChecked="{Binding RoguelikeDelayAbortUntilCombatComplete}">
+                <TextBlock
+                    Block.TextAlignment="Left"
+                    Text="{DynamicResource RoguelikeDelayAbortUntilCombatComplete}"
+                    TextWrapping="Wrap" />
+            </CheckBox>
         </StackPanel>
     </StackPanel>
 </UserControl>