From 71216b8d4d07d5fb103ba970f73ffad2de1e3be7 Mon Sep 17 00:00:00 2001
From: status102 <102887808+status102@users.noreply.github.com>
Date: Fri, 1 Nov 2024 02:21:10 +0800
Subject: [PATCH] =?UTF-8?q?i18n:=20UI=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/UI/SettingsViewModel.cs        | 20 +++++++++----------
 .../ViewModels/UI/TaskQueueViewModel.cs       |  3 +--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
index 87091951a4..bcebd802d8 100644
--- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
@@ -1954,16 +1954,16 @@ namespace MaaWpfGui.ViewModels.UI
         private void UpdateRoguelikeDifficultyList()
         {
             RoguelikeDifficultyList = [
-                new CombinedData { Display = "MAX", Value = int.MaxValue.ToString() }
+                new() { Display = "MAX", Value = int.MaxValue }
             ];
 
             for (int i = 20; i >= 0; --i)
             {
                 var value = i.ToString();
-                RoguelikeDifficultyList.Add(new CombinedData { Display = value, Value = value });
+                RoguelikeDifficultyList.Add(new() { Display = value, Value = i });
             }
 
-            RoguelikeDifficultyList.Add(new CombinedData { Display = "Current", Value = (-1).ToString() });
+            RoguelikeDifficultyList.Add(new() { Display = LocalizationHelper.GetString("Current"), Value = -1 });
         }
 
         private void UpdateRoguelikeModeList()
@@ -2144,15 +2144,15 @@ namespace MaaWpfGui.ViewModels.UI
                 new() { Display = LocalizationHelper.GetString("RoguelikeThemeSarkaz"), Value = "Sarkaz" },
             ];
 
-        private ObservableCollection<CombinedData> _roguelikeDifficultyList = new();
+        private ObservableCollection<GenericCombinedData<int>> _roguelikeDifficultyList = [];
 
-        public ObservableCollection<CombinedData> RoguelikeDifficultyList
+        public ObservableCollection<GenericCombinedData<int>> RoguelikeDifficultyList
         {
             get => _roguelikeDifficultyList;
             set => SetAndNotify(ref _roguelikeDifficultyList, value);
         }
 
-        private ObservableCollection<CombinedData> _roguelikeModeList = new();
+        private ObservableCollection<CombinedData> _roguelikeModeList = [];
 
         /// <summary>
         /// Gets or sets the list of roguelike modes.
@@ -2163,7 +2163,7 @@ namespace MaaWpfGui.ViewModels.UI
             set => SetAndNotify(ref _roguelikeModeList, value);
         }
 
-        private ObservableCollection<CombinedData> _roguelikeSquadList = new();
+        private ObservableCollection<CombinedData> _roguelikeSquadList = [];
 
         /// <summary>
         /// Gets or sets the list of roguelike squad.
@@ -2205,15 +2205,15 @@ namespace MaaWpfGui.ViewModels.UI
             }
         }
 
-        private string _roguelikeDifficulty = ConfigurationHelper.GetValue(ConfigurationKeys.RoguelikeDifficulty, int.MaxValue.ToString());
+        private int _roguelikeDifficulty = Convert.ToInt32(ConfigurationHelper.GetValue(ConfigurationKeys.RoguelikeDifficulty, int.MaxValue.ToString()));
 
-        public string RoguelikeDifficulty
+        public int RoguelikeDifficulty
         {
             get => _roguelikeDifficulty;
             set
             {
                 SetAndNotify(ref _roguelikeDifficulty, value);
-                ConfigurationHelper.SetValue(ConfigurationKeys.RoguelikeDifficulty, value);
+                ConfigurationHelper.SetValue(ConfigurationKeys.RoguelikeDifficulty, value.ToString());
             }
         }
 
diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
index 568b577770..85ab91131a 100644
--- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
@@ -1726,11 +1726,10 @@ namespace MaaWpfGui.ViewModels.UI
         private static bool AppendRoguelike()
         {
             _ = int.TryParse(Instances.SettingsViewModel.RoguelikeMode, out var mode);
-            _ = int.TryParse(Instances.SettingsViewModel.RoguelikeDifficulty, out var difficulty);
 
             return Instances.AsstProxy.AsstAppendRoguelike(
                 mode,
-                difficulty,
+                Instances.SettingsViewModel.RoguelikeDifficulty,
                 Instances.SettingsViewModel.RoguelikeStartsCount,
                 Instances.SettingsViewModel.RoguelikeInvestmentEnabled,
                 Instances.SettingsViewModel.RoguelikeInvestmentWithMoreScore,