From 4dc4e57082c30f971b2098b966d3cb3af9c1ff07 Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Sun, 27 Jul 2025 10:50:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=89=BF=E7=81=AD=E5=85=B3=E5=8D=A1=E5=8B=BE=E9=80=89?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Constants/ConfigurationKeys.cs  |  3 +-
 src/MaaWpfGui/Res/Localizations/en-us.xaml    |  2 +
 src/MaaWpfGui/Res/Localizations/ja-jp.xaml    |  2 +
 src/MaaWpfGui/Res/Localizations/ko-kr.xaml    |  2 +
 src/MaaWpfGui/Res/Localizations/zh-cn.xaml    |  2 +
 src/MaaWpfGui/Res/Localizations/zh-tw.xaml    |  4 +-
 .../FightSettingsUserControlModel.cs          | 12 +++++
 .../TaskQueue/FightSettingsUserControl.xaml   | 46 +++++++------------
 8 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/src/MaaWpfGui/Constants/ConfigurationKeys.cs b/src/MaaWpfGui/Constants/ConfigurationKeys.cs
index 4b34937b4a..93b46db6af 100644
--- a/src/MaaWpfGui/Constants/ConfigurationKeys.cs
+++ b/src/MaaWpfGui/Constants/ConfigurationKeys.cs
@@ -246,7 +246,8 @@ namespace MaaWpfGui.Constants
         public const string Stage2 = "MainFunction.Stage2";
         public const string Stage3 = "MainFunction.Stage3";
         public const string Stage4 = "MainFunction.Stage4";
-        public const string AnnihilationStage = "MainFunction.AnnihilationStage";
+        public const string UseCustomAnnihilation = "MainFunction.Annihilation.UseCustom";
+        public const string AnnihilationStage = "MainFunction.Annihilation.Stage";
         public const string UseMedicine = "MainFunction.UseMedicine";
         public const string UseMedicineQuantity = "MainFunction.UseMedicine.Quantity";
         public const string UseStone = "MainFunction.UseStone";
diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml
index aa82f66ee5..7b31d732de 100644
--- a/src/MaaWpfGui/Res/Localizations/en-us.xaml
+++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml
@@ -647,6 +647,8 @@ Do not adjust the proxy multiplier setting in the game</system:String>
     <system:String x:Key="PR-C-2">Pio/Sup Ⅱ</system:String>
     <system:String x:Key="PR-D-1">Grd/Spc Ⅰ</system:String>
     <system:String x:Key="PR-D-2">Grd/Spc Ⅱ</system:String>
+    <system:String x:Key="AnnihilationStage">Annihilation Stage</system:String>
+    <system:String x:Key="UseCustomAnnihilation">Custom {key=AnnihilationStage}</system:String>
     <system:String x:Key="AnnihilationMode">Annihilation Mode</system:String>
     <system:String x:Key="Annihilation">Annihilation</system:String>
     <system:String x:Key="Chernobog">Chernobog</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
index b7e57a797e..bdacb8fb8a 100644
--- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
@@ -648,6 +648,8 @@ C:\\leidian\\LDPlayer9
     <system:String x:Key="PR-C-2">先鋒/補助SoC・中</system:String>
     <system:String x:Key="PR-D-1">前衛/特殊SoC・初</system:String>
     <system:String x:Key="PR-D-2">前衛/特殊SoC・中</system:String>
+    <system:String x:Key="AnnihilationStage">殲滅ステージ</system:String>
+    <system:String x:Key="UseCustomAnnihilation">カスタム{key=AnnihilationStage}</system:String>
     <system:String x:Key="AnnihilationMode">殲滅作戦</system:String>
     <system:String x:Key="Annihilation">今期の殲滅作戦</system:String>
     <system:String x:Key="Chernobog">チェルノボーグ</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
index ad68a1ba53..9f58503dd9 100644
--- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
@@ -648,6 +648,8 @@ C:\\leidian\\LDPlayer9
     <system:String x:Key="PR-D-1">PR-D-1 (가드/스페셜리스트)</system:String>
     <system:String x:Key="PR-D-2">PR-D-2 (가드/스페셜리스트)</system:String>
     <system:String x:Key="Annihilation">섬멸 작전</system:String>
+    <system:String x:Key="AnnihilationStage">섬멸 작전</system:String>
+    <system:String x:Key="UseCustomAnnihilation">사용자 지정 {key=AnnihilationStage}</system:String>
     <system:String x:Key="AnnihilationMode">섬멸 모드</system:String>
     <system:String x:Key="Chernobog">체르노보그</system:String>
     <system:String x:Key="LungmenOutskirts">용문 외곽</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index e178fd286e..03e69d9175 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -647,6 +647,8 @@ C:\\leidian\\LDPlayer9。\n
     <system:String x:Key="PR-C-2">先/辅芯片组</system:String>
     <system:String x:Key="PR-D-1">近/特芯片</system:String>
     <system:String x:Key="PR-D-2">近/特芯片组</system:String>
+    <system:String x:Key="AnnihilationStage">剿灭关卡</system:String>
+    <system:String x:Key="UseCustomAnnihilation">自定义{key=AnnihilationStage}</system:String>
     <system:String x:Key="AnnihilationMode">剿灭模式</system:String>
     <system:String x:Key="Annihilation">当期剿灭</system:String>
     <system:String x:Key="Chernobog">切尔诺伯格</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
index 5cfc055252..8db12d6946 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
@@ -645,9 +645,11 @@ C:\\leidian\\LDPlayer9。\n
     <system:String x:Key="PR-C-2">先/輔晶片組</system:String>
     <system:String x:Key="PR-D-1">近/特晶片</system:String>
     <system:String x:Key="PR-D-2">近/特晶片組</system:String>
+    <system:String x:Key="AnnihilationStage">殲滅關卡</system:String>
+    <system:String x:Key="UseCustomAnnihilation">自訂{key=AnnihilationStage}</system:String>
     <system:String x:Key="AnnihilationMode">剿滅模式</system:String>
     <system:String x:Key="Annihilation">當期剿滅</system:String>
-	<system:String x:Key="Chernobog">切爾諾伯格</system:String>
+    <system:String x:Key="Chernobog">切爾諾伯格</system:String>
     <system:String x:Key="LungmenOutskirts">龍門外環</system:String>
     <system:String x:Key="LungmenDowntown">龍門市區</system:String>
     <system:String x:Key="TodaysStageTip" xml:space="preserve">今日關卡小提示: </system:String>
diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs
index 7ae5fb1000..e4a9a3b7d2 100644
--- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs
+++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs
@@ -715,6 +715,18 @@ public class FightSettingsUserControlModel : TaskViewModel
         { LocalizationHelper.GetString("LungmenDowntown"), "LungmenDowntown@AnnihilationReturn@Annihilation" },
     };
 
+    private bool _useCustomAnnihilation = ConfigurationHelper.GetValue(ConfigurationKeys.UseCustomAnnihilation, false);
+
+    public bool UseCustomAnnihilation
+    {
+        get => _useCustomAnnihilation;
+        set
+        {
+            SetAndNotify(ref _useCustomAnnihilation, value);
+            ConfigurationHelper.SetValue(ConfigurationKeys.UseCustomAnnihilation, value.ToString());
+        }
+    }
+
     private string _annihilationStage = ConfigurationHelper.GetValue(ConfigurationKeys.AnnihilationStage, "Annihilation");
 
     public string AnnihilationStage
diff --git a/src/MaaWpfGui/Views/UserControl/TaskQueue/FightSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/TaskQueue/FightSettingsUserControl.xaml
index c03c6b993f..aa9ef64630 100644
--- a/src/MaaWpfGui/Views/UserControl/TaskQueue/FightSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/TaskQueue/FightSettingsUserControl.xaml
@@ -414,36 +414,22 @@
             </Grid>
         </Grid>
 
-        <StackPanel d:Visibility="Visible" Visibility="{c:Binding EnableAdvancedSettings, Source={x:Static setting:TaskQueueViewModel.TaskSettingVisibilities}}">            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" MinWidth="100" />
-                    <ColumnDefinition />
-                </Grid.ColumnDefinitions>
-                <StackPanel Orientation="Vertical">
-                    <Grid Height="42">
-                        <controls:TextBlock
-                            x:Name="AnnihilationMode"
-                            Margin="0,6"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Text="{DynamicResource AnnihilationMode}"
-                            TextAlignment="Center"
-                            TextWrapping="Wrap" />
-                    </Grid>
-                </StackPanel>
-                <StackPanel Grid.Column="1" Orientation="Vertical">
-                    <ComboBox
-                        Height="30"
-                        Margin="6"
-                        VerticalContentAlignment="Center"
-                        DisplayMemberPath="Key"
-                        IsHitTestVisible="{c:Binding !FightTaskRunning,
-                                                     Source={x:Static helper:Instances.TaskQueueViewModel}}"
-                        ItemsSource="{Binding AnnihilationModeList}"
-                        SelectedValue="{Binding AnnihilationStage}"
-                        SelectedValuePath="Value"/>
-                </StackPanel>
-            </Grid>
+        <StackPanel d:Visibility="Visible" Visibility="{c:Binding EnableAdvancedSettings, Source={x:Static setting:TaskQueueViewModel.TaskSettingVisibilities}}">
+            <StackPanel>
+                <CheckBox
+                    Margin="0,10"
+                    Content="{DynamicResource UseCustomAnnihilation}"
+                    IsChecked="{Binding UseCustomAnnihilation}" />
+                <ComboBox
+                    Height="30"
+                    DisplayMemberPath="Key"
+                    IsHitTestVisible="{c:Binding !FightTaskRunning,
+                                                 Source={x:Static helper:Instances.TaskQueueViewModel}}"
+                    ItemsSource="{Binding AnnihilationModeList}"
+                    SelectedValue="{Binding AnnihilationStage}"
+                    SelectedValuePath="Value"
+                    Visibility="{c:Binding UseCustomAnnihilation}" />
+            </StackPanel>
             <StackPanel Margin="0,10" Orientation="Horizontal">
                 <CheckBox Content="{DynamicResource DrGrandet}" IsChecked="{Binding IsDrGrandet}" />
                 <controls:TooltipBlock TooltipText="{DynamicResource DrGrandetTip}" />