From 1383499623092d9acf47dc7b0d7bcaed2cd984d4 Mon Sep 17 00:00:00 2001
From: status102 <102887808+status102@users.noreply.github.com>
Date: Tue, 27 Feb 2024 19:58:50 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=87=8F=E5=B0=91=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[skip changelog]
---
 src/MaaCore/Task/Interface/CopilotTask.cpp | 16 +++++++++++-----
 src/MaaWpfGui/Main/AsstProxy.cs            | 10 ++++------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/MaaCore/Task/Interface/CopilotTask.cpp b/src/MaaCore/Task/Interface/CopilotTask.cpp
index 34aca0159c..d669dad8b6 100644
--- a/src/MaaCore/Task/Interface/CopilotTask.cpp
+++ b/src/MaaCore/Task/Interface/CopilotTask.cpp
@@ -80,13 +80,19 @@ bool asst::CopilotTask::set_params(const json::value& params)
             is_raid = params.get("is_adverse", false);
         }
     }
-    bool use_sanity_potion = params.get("use_sanity_potion", false);     // 是否吃理智药
-    bool with_formation = params.get("formation", false);                // 是否使用自动编队
-    int select_formation = params.get("select_formation", 0);            // 选择第几个编队，0为不选择
-    bool add_trust = params.get("add_trust", false);                     // 是否自动补信赖
-    bool add_user_additional = params.get("add_user_additional", false); // 是否自动补用户自定义干员
+    bool use_sanity_potion = params.get("use_sanity_potion", false); // 是否吃理智药
+    bool with_formation = params.get("formation", false);            // 是否使用自动编队
+    int select_formation = params.get("select_formation", 0);        // 选择第几个编队，0为不选择
+    bool add_trust = params.get("add_trust", false);                 // 是否自动补信赖
+    bool add_user_additional = params.contains("user_additional");   // 是否自动补用户自定义干员
     std::string support_unit_name = params.get("support_unit_name", std::string());
 
+    if (params.contains("add_user_additional")) {
+        Log.warn("================  DEPRECATED  ================");
+        Log.warn("`add_user_additional` has been deprecated since v5.1.0-beta.1;");
+        Log.warn("================  DEPRECATED  ================");
+    }
+
     auto filename_opt = params.find<std::string>("filename");
     if (!filename_opt) {
         Log.error("CopilotTask set_params failed, stage_name or filename not found");
diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs
index 76f3e3574d..b7ba885ab4 100644
--- a/src/MaaWpfGui/Main/AsstProxy.cs
+++ b/src/MaaWpfGui/Main/AsstProxy.cs
@@ -2041,16 +2041,15 @@ namespace MaaWpfGui.Main
             {
                 ["mode"] = mode,
                 ["starts_count"] = starts,
-                ["investment_enabled"] = investmentEnabled,
-                ["investment_enter_second_floor"] = investmentEnterSecondFloor,
-                ["investments_count"] = invests,
-                ["stop_when_investment_full"] = stopWhenFull,
                 ["theme"] = theme,
             };
 
-            if (mode == 1)
+            if (mode == 1 || investmentEnabled)
             {
                 taskParams["investment_enabled"] = true;
+                taskParams["investment_enter_second_floor"] = investmentEnterSecondFloor;
+                taskParams["investments_count"] = invests;
+                taskParams["stop_when_investment_full"] = stopWhenFull;
             }
 
             if (squad.Length > 0)
@@ -2214,7 +2213,6 @@ namespace MaaWpfGui.Main
                 ["filename"] = filename,
                 ["formation"] = formation,
                 ["add_trust"] = addTrust,
-                ["add_user_additional"] = addUserAdditional,
                 ["need_navigate"] = needNavigate,
                 ["is_raid"] = isRaid,
                 ["loop_times"] = loopTimes,