From a0807bd3d9fa319bef2d28062d06e86ce94d395b Mon Sep 17 00:00:00 2001 From: MistEO Date: Sat, 28 Jan 2023 02:00:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8D=95=E6=AD=A5?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=8D=E6=89=A7=E8=A1=8C=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=BA=9B=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Task/Interface/SingleStepTask.cpp | 6 ++++++ src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp | 5 ++++- src/MaaCore/Task/SingleStep/SingleStepBattleProcessTask.cpp | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/MaaCore/Task/Interface/SingleStepTask.cpp b/src/MaaCore/Task/Interface/SingleStepTask.cpp index a7658ac4b1..d51430691f 100644 --- a/src/MaaCore/Task/Interface/SingleStepTask.cpp +++ b/src/MaaCore/Task/Interface/SingleStepTask.cpp @@ -11,6 +11,8 @@ asst::SingleStepTask::SingleStepTask(const AsstCallback& callback, Assistant* in bool asst::SingleStepTask::set_params(const json::value& params) { + LogTraceFunction; + std::string type = params.get("type", ""); std::string subtype = params.get("subtype", ""); auto details_opt = params.find("details"); @@ -28,6 +30,8 @@ bool asst::SingleStepTask::set_params(const json::value& params) bool asst::SingleStepTask::append_copllot_start() { + LogTraceFunction; + auto start_2_tp = std::make_shared(m_callback, m_inst, TaskType); start_2_tp->set_tasks({ "BattleStartAll" }).set_ignore_error(false); m_subtasks.emplace_back(std::move(start_2_tp)); @@ -37,6 +41,8 @@ bool asst::SingleStepTask::append_copllot_start() bool asst::SingleStepTask::append_copilot_action(const json::value& details) { + LogTraceFunction; + auto task = std::make_shared(m_callback, m_inst, TaskType); // for debug diff --git a/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp index 853a8f3a91..b47a82dc31 100644 --- a/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp @@ -244,7 +244,10 @@ bool asst::BattleProcessTask::wait_condition(const Action& action) { cv::Mat image; auto update_image_if_empty = [&]() { - if (image.empty()) image = ctrler()->get_image(); + if (image.empty()) { + image = ctrler()->get_image(); + check_in_battle(image); + } }; auto do_strategy_and_update_image = [&]() { do_strategic_action(image); diff --git a/src/MaaCore/Task/SingleStep/SingleStepBattleProcessTask.cpp b/src/MaaCore/Task/SingleStep/SingleStepBattleProcessTask.cpp index 2e98ec04fb..7ce41a5b3b 100644 --- a/src/MaaCore/Task/SingleStep/SingleStepBattleProcessTask.cpp +++ b/src/MaaCore/Task/SingleStep/SingleStepBattleProcessTask.cpp @@ -19,7 +19,7 @@ bool asst::SingleStepBattleProcessTask::_run() } size_t action_size = m_actions.size(); - for (size_t i = 0; i < action_size && !need_exit() && m_in_battle; ++i) { + for (size_t i = 0; i < action_size && !need_exit(); ++i) { const auto& action = m_actions.at(i); do_action(action, i); }