From 7ad445fb4e7c2e153404ea6ac4c98e20d643c733 Mon Sep 17 00:00:00 2001 From: status102 <102887808+status102@users.noreply.github.com> Date: Thu, 1 Feb 2024 19:13:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3CopilotTask=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=90=8D`is=5Fadverse`=20-->>=20`is=5Fraid`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Task/Interface/CopilotTask.cpp | 22 +++++++++++++++------- src/MaaWpfGui/Main/AsstProxy.cs | 6 +++--- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/MaaCore/Task/Interface/CopilotTask.cpp b/src/MaaCore/Task/Interface/CopilotTask.cpp index 676d1de0e2..59a418a448 100644 --- a/src/MaaCore/Task/Interface/CopilotTask.cpp +++ b/src/MaaCore/Task/Interface/CopilotTask.cpp @@ -70,12 +70,20 @@ bool asst::CopilotTask::set_params(const json::value& params) bool need_navigate = params.get("need_navigate", false); // 是否在当前页面左右滑动寻找关卡，启用战斗列表则为true std::string navigate_name = params.get("navigate_name", std::string()); // 导航的关卡名 - bool is_adverse = 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 is_raid = params.get("is_raid", false); // 是否为突袭关卡 + if (params.contains("is_adverse")) { + Log.warn("================ DEPRECATED ================"); + 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 + } + } + 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); // 是否自动补用户自定义干员 std::string support_unit_name = params.get("support_unit_name", std::string()); auto filename_opt = params.find("filename"); @@ -119,7 +127,7 @@ bool asst::CopilotTask::set_params(const json::value& params) } m_navigate_task_ptr->set_enable(need_navigate); - m_change_difficulty_task_ptr->set_enable(need_navigate && is_adverse); + m_change_difficulty_task_ptr->set_enable(need_navigate && is_raid); m_not_use_prts_task_ptr->set_enable(need_navigate); // 不使用代理指挥 m_medicine_task_ptr->set_enable(use_sanity_potion); diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs index b5536023a2..5451f9f91d 100644 --- a/src/MaaWpfGui/Main/AsstProxy.cs +++ b/src/MaaWpfGui/Main/AsstProxy.cs @@ -2123,13 +2123,13 @@ namespace MaaWpfGui.Main /// 自定干员列表 /// 是否导航至关卡（启用自动战斗序列） /// 关卡名 - /// 是不是突袭 + /// 是不是突袭 /// 任务类型 /// 任务重复执行次数 /// 是否使用理智药 /// 是否启动战斗 /// 是否成功。 - public bool AsstStartCopilot(string filename, bool formation, bool addTrust, bool addUserAdditional, JArray userAdditional, bool needNavigate, string navigateName, bool isAdverse, string type, int loopTimes, bool useSanityPotion, bool asstStart = true) + public bool AsstStartCopilot(string filename, bool formation, bool addTrust, bool addUserAdditional, JArray userAdditional, bool needNavigate, string navigateName, bool isRaid, string type, int loopTimes, bool useSanityPotion, bool asstStart = true) { var taskParams = new JObject { @@ -2140,7 +2140,7 @@ namespace MaaWpfGui.Main ["user_additional"] = userAdditional, ["need_navigate"] = needNavigate, ["navigate_name"] = navigateName, - ["is_adverse"] = isAdverse, + ["is_raid"] = isRaid, ["loop_times"] = loopTimes, ["use_sanity_potion"] = useSanityPotion, };