From 89961c4dbd3051241d503030bc861a096c3f0942 Mon Sep 17 00:00:00 2001 From: MistEO Date: Thu, 23 Dec 2021 22:23:58 +0800 Subject: [PATCH] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D=E5=90=83=E7=90=86?= =?UTF-8?q?=E6=99=BA=E8=8D=AF/=E5=90=83=E7=9F=B3=E5=A4=B4=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E5=BC=80=E5=A7=8B=E8=A1=8C=E5=8A=A8=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E8=A2=AB=E6=B8=85=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/Assistant.cpp | 9 +++++++++ src/MeoAssistant/ProcessTask.cpp | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/MeoAssistant/Assistant.cpp b/src/MeoAssistant/Assistant.cpp index 8aadb9d3bf..0e35e1f012 100644 --- a/src/MeoAssistant/Assistant.cpp +++ b/src/MeoAssistant/Assistant.cpp @@ -188,11 +188,19 @@ bool asst::Assistant::append_fight(const std::string& stage, int mecidine, int s terminal_task_ptr->set_task_chain(TaskChain); terminal_task_ptr->set_tasks({ "StageBegin" }); terminal_task_ptr->set_times_limit("LastBattle", 0); + terminal_task_ptr->set_times_limit("StartButton1", 0); + terminal_task_ptr->set_times_limit("StartButton2", 0); + terminal_task_ptr->set_times_limit("MedicineConfirm", 0); + terminal_task_ptr->set_times_limit("StoneConfirm", 0); // 进入对应的关卡 auto stage_task_ptr = std::make_shared(task_callback, (void*)this); stage_task_ptr->set_task_chain(TaskChain); stage_task_ptr->set_tasks({ stage }); + stage_task_ptr->set_times_limit("StartButton1", 0); + stage_task_ptr->set_times_limit("StartButton2", 0); + stage_task_ptr->set_times_limit("MedicineConfirm", 0); + stage_task_ptr->set_times_limit("StoneConfirm", 0); // 开始战斗任务 auto fight_task_ptr = std::make_shared(task_callback, (void*)this); @@ -201,6 +209,7 @@ bool asst::Assistant::append_fight(const std::string& stage, int mecidine, int s fight_task_ptr->set_times_limit("MedicineConfirm", mecidine); fight_task_ptr->set_times_limit("StoneConfirm", stone); fight_task_ptr->set_times_limit("StartButton1", times); + fight_task_ptr->set_times_limit("StartButton2", times); std::unique_lock lock(m_mutex); diff --git a/src/MeoAssistant/ProcessTask.cpp b/src/MeoAssistant/ProcessTask.cpp index c755b5e2f1..9ecb5e368b 100644 --- a/src/MeoAssistant/ProcessTask.cpp +++ b/src/MeoAssistant/ProcessTask.cpp @@ -80,7 +80,8 @@ bool ProcessTask::_run() int max_times = task_info_ptr->max_times; if (auto iter = m_times_limit.find(task_info_ptr->name); iter != m_times_limit.cend()) { - max_times = iter->second; + max_times = iter->second; + callback_json["times_limit"] = max_times; } if (exec_times >= max_times) {