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());