From da7a3eceeed714db3acb7a11d99ea9fad14aa9af Mon Sep 17 00:00:00 2001 From: uye <2396806385@qq.com> Date: Sat, 27 May 2023 04:02:27 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96UpdateStageList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewModels/UI/TaskQueueViewModel.cs | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs index e201b5897c..d1890f53a9 100644 --- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs @@ -205,7 +205,7 @@ namespace MaaWpfGui.ViewModels.UI UpdateStageList(false); // 随机延迟,防止同时更新 - var delayTime = new Random().Next(0, 10 * 60 * 1000); + var delayTime = new Random().Next(10, 10 * 60 * 1000); _ = Task.Run(async () => { await Task.Delay(delayTime); @@ -367,6 +367,7 @@ namespace MaaWpfGui.ViewModels.UI var stage1 = Stage1 ??= string.Empty; var stage2 = Stage2 ??= string.Empty; var stage3 = Stage3 ??= string.Empty; + var rss = RemainingSanityStage ??= string.Empty; EnableSetFightParams = false; @@ -381,32 +382,29 @@ namespace MaaWpfGui.ViewModels.UI AlternateStageList = new ObservableCollection(_stageManager.GetStageList()); + RemainingSanityStageList = new ObservableCollection(_stageManager.GetStageList()) + { + [0] = new CombinedData { Display = LocalizationHelper.GetString("NoUse"), Value = string.Empty }, + }; + // reset closed stages to "Last/Current" if (!CustomStageCode) { Stage1 = StageList.Any(x => x.Value == stage1) ? stage1 : string.Empty; Stage2 = AlternateStageList.Any(x => x.Value == stage2) ? stage2 : string.Empty; Stage3 = AlternateStageList.Any(x => x.Value == stage3) ? stage3 : string.Empty; + RemainingSanityStage = RemainingSanityStageList.Any(x => x.Value == rss) ? rss : string.Empty; } else { Stage1 = stage1; Stage2 = stage2; Stage3 = stage3; + RemainingSanityStage = rss; } EnableSetFightParams = true; } - - var rss = RemainingSanityStage ??= string.Empty; - RemainingSanityStageList = new ObservableCollection(_stageManager.GetStageList()) - { - [0] = new CombinedData { Display = LocalizationHelper.GetString("NoUse"), Value = string.Empty }, - }; - if (!CustomStageCode) - { - RemainingSanityStage = RemainingSanityStageList.Any(x => x.Value == rss) ? rss : string.Empty; - } } private bool NeedToUpdateDatePrompt()