From 98cb5eaec8b4820095c508f246100d9997e362ce Mon Sep 17 00:00:00 2001
From: uye <2396806385@qq.com>
Date: Sat, 11 Mar 2023 16:29:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=87=E9=80=89=E5=85=B3=E5=8D=A1?=
 =?UTF-8?q?=E4=B8=8E=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5=E5=85=B3=E5=8D=A1?=
 =?UTF-8?q?=E5=90=8D=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix #3837
---
 src/MaaWpfGui/Main/SettingsViewModel.cs       |  2 +-
 src/MaaWpfGui/Main/TaskQueueViewModel.cs      | 10 ++--
 .../UserControl/FightSettingsUserControl.xaml | 48 +++++++++++++------
 .../OtherCombatSettingsUserControl.xaml       |  3 +-
 4 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/src/MaaWpfGui/Main/SettingsViewModel.cs b/src/MaaWpfGui/Main/SettingsViewModel.cs
index a60e82b126..b15f1713ae 100644
--- a/src/MaaWpfGui/Main/SettingsViewModel.cs
+++ b/src/MaaWpfGui/Main/SettingsViewModel.cs
@@ -2298,7 +2298,7 @@ namespace MaaWpfGui
             set
             {
                 SetAndNotify(ref _useAlternateStage, value);
-                _taskQueueViewModel.AlternateStageDisplay = value;
+                _taskQueueViewModel.UseAlternateStage = value;
                 ViewStatusStorage.Set("GUI.UseAlternateStage", value.ToString());
                 if (value)
                 {
diff --git a/src/MaaWpfGui/Main/TaskQueueViewModel.cs b/src/MaaWpfGui/Main/TaskQueueViewModel.cs
index 5430550958..e661ee26e8 100644
--- a/src/MaaWpfGui/Main/TaskQueueViewModel.cs
+++ b/src/MaaWpfGui/Main/TaskQueueViewModel.cs
@@ -1526,16 +1526,15 @@ namespace MaaWpfGui
             }
         }
 
-        private bool _alternateStageDisplay = !Convert.ToBoolean(ViewStatusStorage.Get("GUI.CustomStageCode", bool.FalseString))
-            && Convert.ToBoolean(ViewStatusStorage.Get("GUI.UseAlternateStage", bool.FalseString));
+        private bool _useAlternateStage = Convert.ToBoolean(ViewStatusStorage.Get("GUI.UseAlternateStage", bool.FalseString));
 
         /// <summary>
         /// Gets or sets a value indicating whether to use alternate stage.
         /// </summary>
-        public bool AlternateStageDisplay
+        public bool UseAlternateStage
         {
-            get => _alternateStageDisplay;
-            set => SetAndNotify(ref _alternateStageDisplay, value);
+            get => _useAlternateStage;
+            set => SetAndNotify(ref _useAlternateStage, value);
         }
 
         private bool _useRemainingSanityStage = Convert.ToBoolean(ViewStatusStorage.Get("Fight.UseRemainingSanityStage", bool.TrueString));
@@ -1557,7 +1556,6 @@ namespace MaaWpfGui
             set
             {
                 SetAndNotify(ref _customStageCode, value);
-                AlternateStageDisplay = !value && _settingsViewModel.UseAlternateStage;
             }
         }
 
diff --git a/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml
index e1c3100ca9..966ff764a5 100644
--- a/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml
@@ -149,7 +149,7 @@
                             TextAlignment="Center"
                             TextWrapping="Wrap" />
                     </Grid>
-                    <Grid Height="42" Visibility="{c:Binding AlternateStageDisplay}">
+                    <Grid Height="42" Visibility="{c:Binding UseAlternateStage}">
                         <maa:TextBlock
                             Margin="10,6"
                             HorizontalAlignment="Center"
@@ -158,7 +158,7 @@
                             TextAlignment="Center"
                             TextWrapping="Wrap" />
                     </Grid>
-                    <Grid Height="42" Visibility="{c:Binding AlternateStageDisplay}">
+                    <Grid Height="42" Visibility="{c:Binding UseAlternateStage}">
                         <!--  a placeholder  -->
                         <maa:TextBlock
                             Margin="10,6"
@@ -193,15 +193,6 @@
                         SelectedValue="{Binding Stage1}"
                         SelectedValuePath="Value"
                         Visibility="{c:Binding !CustomStageCode}" />
-                    <TextBox
-                        Height="30"
-                        Margin="0,6"
-                        Padding="6,0,0,0"
-                        VerticalContentAlignment="Center"
-                        IsHitTestVisible="{c:Binding !FightTaskRunning}"
-                        Text="{Binding Stage1, UpdateSourceTrigger=PropertyChanged}"
-                        ToolTip="{DynamicResource CustomStageCodeTip}"
-                        Visibility="{c:Binding CustomStageCode}" />
                     <ComboBox
                         Height="30"
                         Margin="0,6"
@@ -212,7 +203,7 @@
                         ItemsSource="{Binding StageList}"
                         SelectedValue="{Binding Stage2}"
                         SelectedValuePath="Value"
-                        Visibility="{c:Binding AlternateStageDisplay}" />
+                        Visibility="{c:Binding !CustomStageCode and UseAlternateStage}" />
                     <ComboBox
                         Height="30"
                         Margin="0,6"
@@ -223,7 +214,7 @@
                         ItemsSource="{Binding StageList}"
                         SelectedValue="{Binding Stage3}"
                         SelectedValuePath="Value"
-                        Visibility="{c:Binding AlternateStageDisplay}" />
+                        Visibility="{c:Binding !CustomStageCode and UseAlternateStage}" />
                     <ComboBox
                         Height="30"
                         Margin="0,6"
@@ -235,7 +226,34 @@
                         SelectedValue="{Binding RemainingSanityStage}"
                         SelectedValuePath="Value"
                         ToolTip="{DynamicResource UseRemainingSanityStageTip}"
-                        Visibility="{c:Binding UseRemainingSanityStage and !CustomStageCode}" />
+                        Visibility="{c:Binding !CustomStageCode and UseRemainingSanityStage}" />
+                    <TextBox
+                        Height="30"
+                        Margin="0,6"
+                        Padding="6,0,0,0"
+                        VerticalContentAlignment="Center"
+                        IsHitTestVisible="{c:Binding !FightTaskRunning}"
+                        Text="{Binding Stage1, UpdateSourceTrigger=PropertyChanged}"
+                        ToolTip="{DynamicResource CustomStageCodeTip}"
+                        Visibility="{c:Binding CustomStageCode}" />
+                    <TextBox
+                        Height="30"
+                        Margin="0,6"
+                        Padding="6,0,0,0"
+                        VerticalContentAlignment="Center"
+                        IsHitTestVisible="{c:Binding !FightTaskRunning}"
+                        Text="{Binding Stage2, UpdateSourceTrigger=PropertyChanged}"
+                        ToolTip="{DynamicResource CustomStageCodeTip}"
+                        Visibility="{c:Binding CustomStageCode and UseAlternateStage}" />
+                    <TextBox
+                        Height="30"
+                        Margin="0,6"
+                        Padding="6,0,0,0"
+                        VerticalContentAlignment="Center"
+                        IsHitTestVisible="{c:Binding !FightTaskRunning}"
+                        Text="{Binding Stage3, UpdateSourceTrigger=PropertyChanged}"
+                        ToolTip="{DynamicResource CustomStageCodeTip}"
+                        Visibility="{c:Binding CustomStageCode and UseAlternateStage}" />
                     <TextBox
                         Height="30"
                         Margin="0,6"
@@ -244,7 +262,7 @@
                         IsHitTestVisible="{c:Binding !FightTaskRunning}"
                         Text="{Binding RemainingSanityStage, UpdateSourceTrigger=PropertyChanged}"
                         ToolTip="{DynamicResource UseRemainingSanityStageTip}"
-                        Visibility="{c:Binding UseRemainingSanityStage and CustomStageCode}" />
+                        Visibility="{c:Binding CustomStageCode and UseRemainingSanityStage}" />
                 </StackPanel>
             </Grid>
             <Grid Grid.Row="3">
diff --git a/src/MaaWpfGui/Views/UserControl/OtherCombatSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/OtherCombatSettingsUserControl.xaml
index f041076f3e..71b15e851b 100644
--- a/src/MaaWpfGui/Views/UserControl/OtherCombatSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/OtherCombatSettingsUserControl.xaml
@@ -42,8 +42,7 @@
                     Margin="10"
                     HorizontalAlignment="Left"
                     Content="{DynamicResource UseAlternateStage}"
-                    IsChecked="{Binding UseAlternateStage}"
-                    IsEnabled="{c:Binding !CustomStageCode}" />
+                    IsChecked="{Binding UseAlternateStage}" />
             </StackPanel>
             <StackPanel
                 HorizontalAlignment="Center"