From 0071cee5e707fd82a447ffc9709f8fbb10dca8d0 Mon Sep 17 00:00:00 2001 From: status102 <102887808+status102@users.noreply.github.com> Date: Fri, 15 Aug 2025 17:22:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=89=BF=E7=81=AD=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E4=B8=8D=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/Main/AsstProxy.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs index 01353094fd..387311f02a 100644 --- a/src/MaaWpfGui/Main/AsstProxy.cs +++ b/src/MaaWpfGui/Main/AsstProxy.cs @@ -862,12 +862,9 @@ namespace MaaWpfGui.Main { // 对剿灭的特殊处理，如果刷完了剿灭还选了剿灭会因为找不到入口报错 _tasksStatus.TryGetValue(taskId, out var value); - if (value is { Type: TaskType.Fight } && (TaskQueueViewModel.FightTask.Stage == "Annihilation")) + if (value is { Type: TaskType.Fight } && (TaskQueueViewModel.FightTask.Stage == "Annihilation") && TaskQueueViewModel.FightTask.UseAlternateStage && TaskQueueViewModel.FightTask.Stages.Any(stage => Instances.TaskQueueViewModel.IsStageOpen(stage ?? string.Empty) && (stage != "Annihilation"))) { - if (TaskQueueViewModel.FightTask.UseAlternateStage && TaskQueueViewModel.FightTask.Stages.Any(stage => Instances.TaskQueueViewModel.IsStageOpen(stage ?? string.Empty) && (stage != "Annihilation"))) - { - Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("AnnihilationTaskFailed"), UiLogColor.Warning); - } + Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("AnnihilationTaskFailed"), UiLogColor.Warning); } else { @@ -1979,7 +1976,7 @@ namespace MaaWpfGui.Main } var headersToken = details["headers"]; - Dictionary headers = new Dictionary(); + Dictionary headers = []; if (headersToken is JObject headersObj) { foreach (var prop in headersObj.Properties())