From 0dd1405061419764aacbcdb5bb2d2fbf3bdcf58b Mon Sep 17 00:00:00 2001 From: status102 Date: Mon, 25 Sep 2023 11:00:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E5=8A=A8=E6=88=98=E6=96=97-?= =?UTF-8?q?=E6=88=98=E6=96=97=E5=88=97=E8=A1=A8=E5=90=AF=E7=94=A8=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=8A=A8=E8=BF=BD=E5=8A=A0=E6=91=86=E5=AE=8C?= =?UTF-8?q?=E6=8C=82=E6=9C=BA=E9=80=89=E9=A1=B9=20close=20#6507?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Task/Interface/CopilotTask.cpp | 1 + src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp | 5 +++++ src/MaaCore/Task/Miscellaneous/BattleProcessTask.h | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/MaaCore/Task/Interface/CopilotTask.cpp b/src/MaaCore/Task/Interface/CopilotTask.cpp index 027ab8e9dd..e3e07c7f47 100644 --- a/src/MaaCore/Task/Interface/CopilotTask.cpp +++ b/src/MaaCore/Task/Interface/CopilotTask.cpp @@ -118,6 +118,7 @@ bool asst::CopilotTask::set_params(const json::value& params) // 启用队列的话，这项为true bool need_navigate = params.get("need_navigate", false); m_task_file_reload_task_ptr->set_enable(need_navigate); + m_battle_task_ptr->set_wait_until_end(need_navigate); // 不使用代理指挥 m_not_use_prts_task_ptr->set_enable(need_navigate); diff --git a/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp index 08ef3ad02d..be2e032776 100644 --- a/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp @@ -78,6 +78,11 @@ bool asst::BattleProcessTask::set_stage_name(const std::string& stage_name) return true; } +void asst::BattleProcessTask::set_wait_until_end(bool wait_until_end) +{ + m_need_to_wait_until_end = wait_until_end; +} + bool asst::BattleProcessTask::to_group() { std::unordered_map> groups; diff --git a/src/MaaCore/Task/Miscellaneous/BattleProcessTask.h b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.h index cde77e8a95..5a69ce9d9a 100644 --- a/src/MaaCore/Task/Miscellaneous/BattleProcessTask.h +++ b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.h @@ -15,6 +15,7 @@ namespace asst virtual ~BattleProcessTask() override = default; virtual bool set_stage_name(const std::string& stage_name) override; + void set_wait_until_end(bool wait_until_end); protected: virtual bool _run() override; @@ -27,7 +28,7 @@ namespace asst return false; } virtual battle::copilot::CombatData& get_combat_data() { return m_combat_data; } - virtual bool need_to_wait_until_end() const { return false; } + virtual bool need_to_wait_until_end() const { return m_need_to_wait_until_end; } bool to_group(); bool do_action(const battle::copilot::Action& action, size_t index); @@ -42,5 +43,6 @@ namespace asst std::unordered_map m_oper_in_group; bool m_in_bullet_time = false; + bool m_need_to_wait_until_end = false; }; }