From 4d200bdcc93fe4c9f24e11fc59ea48e4074f8346 Mon Sep 17 00:00:00 2001
From: zzyyyl <aysyxx53@hotmail.com>
Date: Tue, 10 Oct 2023 16:35:33 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=20AllTasksCompleted?=
 =?UTF-8?q?=20=E7=9B=B8=E5=85=B3=20WPF=20=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Main/AsstProxy.cs | 39 ++++++++++++++-------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs
index c98c0f0232..13d9ce0517 100644
--- a/src/MaaWpfGui/Main/AsstProxy.cs
+++ b/src/MaaWpfGui/Main/AsstProxy.cs
@@ -615,32 +615,27 @@ namespace MaaWpfGui.Main
 
                 case AsstMsg.AllTasksCompleted:
                     bool isMainTaskQueueAllCompleted = false;
-                    var finishedTasks = details["finished_tasks"] as JArray;
-
-                    var taskList = finishedTasks?.Select(i => (AsstTaskId)i).ToList();
-                    if (taskList?.Count > 0)
+                    var taskList = details["finished_tasks"]?.ToObject<AsstTaskId[]>();
+                    if (taskList?.Length > 0)
                     {
-                        isMainTaskQueueAllCompleted = true;
-
-                        // 只要有非主界面任务时，就不执行任务链结束后操作
-                        foreach (AsstTaskId taskId in taskList)
+                        // 有非主界面任务时，不执行任务链结束后操作
+                        var minorTaskTypes = new HashSet<TaskType>
                         {
-                            if (taskId == (_latestTaskId.TryGetValue(TaskType.Copilot, out var copilotTaskId) ? copilotTaskId : 0)
-                                || taskId == (_latestTaskId.TryGetValue(TaskType.RecruitCalc, out var recruitCalcTaskId) ? recruitCalcTaskId : 0)
-                                || taskId == (_latestTaskId.TryGetValue(TaskType.Depot, out var depotTaskId) ? depotTaskId : 0)
-                                || taskId == (_latestTaskId.TryGetValue(TaskType.OperBox, out var operBoxTaskId) ? operBoxTaskId : 0)
-                                || taskId == (_latestTaskId.TryGetValue(TaskType.Gacha, out var gachaTaskId) ? gachaTaskId : 0))
-                            {
-                                isMainTaskQueueAllCompleted = false;
-                                break;
-                            }
+                            TaskType.Copilot,
+                            TaskType.RecruitCalc,
+                            TaskType.Depot,
+                            TaskType.OperBox,
+                            TaskType.Gacha,
+                        };
 
-                            if (taskList.Count == 1 && taskId == (_latestTaskId.TryGetValue(TaskType.CloseDown, out var closeDownTaskId) ? closeDownTaskId : 0))
-                            {
-                                // 仅有一个CloseDown任务时，不执行完成后
-                                isMainTaskQueueAllCompleted = false;
-                            }
+                        // 仅有一个任务且为 CloseDown 时，不执行任务链结束后操作
+                        if (taskList.Length == 1)
+                        {
+                            minorTaskTypes.Add(TaskType.CloseDown);
                         }
+
+                        var latestMinorTaskIds = _latestTaskId.Where(i => minorTaskTypes.Contains(i.Key)).Select(i => i.Value);
+                        isMainTaskQueueAllCompleted = taskList.All(i => !latestMinorTaskIds.Contains(i));
                     }
 
                     bool buyWine = _latestTaskId.ContainsKey(TaskType.Mall) && Instances.SettingsViewModel.DidYouBuyWine();