From 0217827cbac2a6a197239056cabaa4bddfdb3272 Mon Sep 17 00:00:00 2001 From: Lancarus Date: Fri, 6 Oct 2023 19:57:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=AF=BC=E8=88=AA=E5=90=8D?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E4=B8=BA=E6=95=99=E5=AD=A6?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Task/Interface/CopilotTask.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/MaaCore/Task/Interface/CopilotTask.cpp b/src/MaaCore/Task/Interface/CopilotTask.cpp index 385e19434e..fb87559898 100644 --- a/src/MaaCore/Task/Interface/CopilotTask.cpp +++ b/src/MaaCore/Task/Interface/CopilotTask.cpp @@ -91,9 +91,8 @@ bool asst::CopilotTask::set_params(const json::value& params) Log.error("Not support stage"); return false; } - - // 关卡名含有"tr"的为教学关,不需要编队 - bool with_formation = (m_stage_name.find("tr") == std::string::npos) && params.get("formation", false); + + bool with_formation = params.get("formation", false); m_formation_task_ptr->set_enable(with_formation); // 自动补信赖 @@ -136,6 +135,9 @@ bool asst::CopilotTask::set_params(const json::value& params) m_navigate_task_ptr->set_tasks({ m_navigate_name + "@Copilot@StageNavigationBegin" }); m_navigate_task_ptr->set_enable(need_navigate); + // 关卡名含有"TR"的为教学关,不需要编队 + m_formation_task_ptr->set_enable(m_navigate_name.find("TR") == std::string::npos); + std::string support_unit_name = params.get("support_unit_name", std::string()); m_formation_task_ptr->set_support_unit_name(std::move(support_unit_name));