From 1ed2973d6a48fb15cb2bc10508618b18dc0c9e6a Mon Sep 17 00:00:00 2001
From: status102 <102887808+status102@users.noreply.github.com>
Date: Sat, 3 Feb 2024 19:23:27 +0800
Subject: [PATCH] =?UTF-8?q?perf(WpfGui):=20=E7=A7=BB=E9=99=A4CopilotTask?=
 =?UTF-8?q?=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaCore/Task/Interface/CopilotTask.cpp |  3 ++-
 src/MaaWpfGui/Main/AsstProxy.cs            | 13 +++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/MaaCore/Task/Interface/CopilotTask.cpp b/src/MaaCore/Task/Interface/CopilotTask.cpp
index 59a418a448..3dce916ffe 100644
--- a/src/MaaCore/Task/Interface/CopilotTask.cpp
+++ b/src/MaaCore/Task/Interface/CopilotTask.cpp
@@ -76,7 +76,8 @@ bool asst::CopilotTask::set_params(const json::value& params)
         Log.warn("`is_adverse` has been deprecated since v5.0.0-beta.3; Please use 'is_raid'");
         Log.warn("================  DEPRECATED  ================");
         if (!params.contains("is_raid")) {
-            is_raid = params.get("is_adverse", false); // 兼容旧版本，在v6.0改为存在此参数时直接return false
+            // 兼容旧版本，在v6.0改为存在此参数时直接return false
+            is_raid = params.get("is_adverse", false);
         }
     }
     bool use_sanity_potion = params.get("use_sanity_potion", false);     // 是否吃理智药
diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs
index 860af40057..e4bd6bfb58 100644
--- a/src/MaaWpfGui/Main/AsstProxy.cs
+++ b/src/MaaWpfGui/Main/AsstProxy.cs
@@ -2147,13 +2147,22 @@ namespace MaaWpfGui.Main
                 ["formation"] = formation,
                 ["add_trust"] = addTrust,
                 ["add_user_additional"] = addUserAdditional,
-                ["user_additional"] = userAdditional,
                 ["need_navigate"] = needNavigate,
-                ["navigate_name"] = navigateName,
                 ["is_raid"] = isRaid,
                 ["loop_times"] = loopTimes,
                 ["use_sanity_potion"] = useSanityPotion,
             };
+
+            if (addUserAdditional)
+            {
+                taskParams["user_additional"] = userAdditional;
+            }
+
+            if (needNavigate)
+            {
+                taskParams["navigate_name"] = navigateName;
+            }
+
             AsstTaskId id = AsstAppendTaskWithEncoding(type, taskParams);
             _latestTaskId[TaskType.Copilot] = id;
             return id != 0 && (!asstStart || AsstStart());