From ed2f4604a98a6de71ddc193f8535dbfb44545568 Mon Sep 17 00:00:00 2001 From: MistEO Date: Sun, 30 Jan 2022 01:28:44 +0800 Subject: [PATCH] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D=E8=82=89=E9=B8=BD?= =?UTF-8?q?=E9=87=8D=E5=BC=80=E5=90=8E=E8=AE=A1=E6=95=B0=E6=B8=85=E9=9B=B6?= =?UTF-8?q?=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 | 5 ++-- src/MeoAssistant/ProcessTask.cpp | 41 +++++++++++++++++--------------- src/MeoAssistant/ProcessTask.h | 2 +- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/src/MeoAssistant/Assistant.cpp b/src/MeoAssistant/Assistant.cpp index e5f798ce68..ef4530f1dc 100644 --- a/src/MeoAssistant/Assistant.cpp +++ b/src/MeoAssistant/Assistant.cpp @@ -338,9 +338,8 @@ bool asst::Assistant::append_roguelike(int mode) std::unique_lock lock(m_mutex); // 这个任务如果卡住会放弃当前的肉鸽并重新开始，所以多添加一点。先这样凑合用 - for (int i = 0; i != 100; ++i) { - auto temp = std::make_shared(*roguelike_task_ptr); - m_tasks_queue.emplace(temp); + for (int i = 0; i != 10000; ++i) { + m_tasks_queue.emplace(roguelike_task_ptr); } return true; diff --git a/src/MeoAssistant/ProcessTask.cpp b/src/MeoAssistant/ProcessTask.cpp index a4002e0e5e..ad8088cedf 100644 --- a/src/MeoAssistant/ProcessTask.cpp +++ b/src/MeoAssistant/ProcessTask.cpp @@ -16,20 +16,21 @@ using namespace asst; asst::ProcessTask::ProcessTask(const AbstractTask& abs, std::vector tasks_name) : AbstractTask(abs), - m_cur_tasks_name(std::move(tasks_name)) + m_raw_tasks_name(std::move(tasks_name)) { m_basic_info_cache = json::value(); } asst::ProcessTask::ProcessTask(AbstractTask&& abs, std::vector tasks_name) noexcept : AbstractTask(std::move(abs)), - m_cur_tasks_name(std::move(tasks_name)) + m_raw_tasks_name(std::move(tasks_name)) { m_basic_info_cache = json::value(); } bool asst::ProcessTask::run() { + m_cur_tasks_name = m_raw_tasks_name; for (m_cur_retry = 0; m_cur_retry <= m_retry_times; ++m_cur_retry) { if (_run()) { return true; @@ -50,7 +51,7 @@ bool asst::ProcessTask::run() asst::ProcessTask& asst::ProcessTask::set_tasks(std::vector tasks_name) noexcept { - m_cur_tasks_name = std::move(tasks_name); + m_raw_tasks_name = std::move(tasks_name); return *this; } @@ -82,10 +83,12 @@ bool ProcessTask::_run() Log.info(info.to_string()); Rect rect; + std::shared_ptr cur_task_ptr = nullptr; + // 如果第一个任务是JustReturn的，那就没必要再截图并计算了 if (auto front_task_ptr = Task.get(m_cur_tasks_name.front()); front_task_ptr->algorithm == AlgorithmType::JustReturn) { - m_cur_task_ptr = front_task_ptr; + cur_task_ptr = front_task_ptr; } else { const auto image = Ctrler.get_image(); @@ -93,15 +96,15 @@ bool ProcessTask::_run() if (!analyzer.analyze()) { return false; } - m_cur_task_ptr = analyzer.get_result(); + cur_task_ptr = analyzer.get_result(); rect = analyzer.get_rect(); } if (need_exit()) { return false; } - std::string cur_name = m_cur_task_ptr->name; + std::string cur_name = cur_task_ptr->name; - const auto& res_move = m_cur_task_ptr->rect_move; + const auto& res_move = cur_task_ptr->rect_move; if (!res_move.empty()) { rect.x += res_move.x; rect.y += res_move.y; @@ -111,7 +114,7 @@ bool ProcessTask::_run() int& exec_times = m_exec_times[cur_name]; - int max_times = m_cur_task_ptr->max_times; + int max_times = cur_task_ptr->max_times; if (auto iter = m_times_limit.find(cur_name); iter != m_times_limit.cend()) { max_times = iter->second; @@ -119,7 +122,7 @@ bool ProcessTask::_run() if (exec_times >= max_times) { Log.info("exec times exceeds the limit", info.to_string()); - set_tasks(m_cur_task_ptr->exceeded_next); + m_cur_tasks_name = cur_task_ptr->exceeded_next; sleep(task_delay); continue; } @@ -129,23 +132,23 @@ bool ProcessTask::_run() info["details"] = json::object{ { "task", cur_name }, - { "action", static_cast(m_cur_task_ptr->action) }, + { "action", static_cast(cur_task_ptr->action) }, { "exec_times", exec_times }, { "max_times", max_times }, - { "algorithm", static_cast(m_cur_task_ptr->algorithm) } + { "algorithm", static_cast(cur_task_ptr->algorithm) } }; callback(AsstMsg::SubTaskStart, info); // 前置固定延时 - if (!sleep(m_cur_task_ptr->pre_delay)) { + if (!sleep(cur_task_ptr->pre_delay)) { return false; } bool need_stop = false; - switch (m_cur_task_ptr->action) { + switch (cur_task_ptr->action) { case ProcessTaskAction::ClickRect: - rect = m_cur_task_ptr->specific_rect; + rect = cur_task_ptr->specific_rect; [[fallthrough]]; case ProcessTaskAction::ClickSelf: exec_click_task(rect); @@ -157,7 +160,7 @@ bool ProcessTask::_run() } break; case ProcessTaskAction::SwipeToTheLeft: case ProcessTaskAction::SwipeToTheRight: - exec_swipe_task(m_cur_task_ptr->action); + exec_swipe_task(cur_task_ptr->action); break; case ProcessTaskAction::DoNothing: break; @@ -174,12 +177,12 @@ bool ProcessTask::_run() // 减少其他任务的执行次数 // 例如，进入吃理智药的界面了，相当于上一次点蓝色开始行动没生效 // 所以要给蓝色开始行动的次数减一 - for (const std::string& reduce : m_cur_task_ptr->reduce_other_times) { + for (const std::string& reduce : cur_task_ptr->reduce_other_times) { --m_exec_times[reduce]; } // 后置固定延时 - int rear_delay = m_cur_task_ptr->rear_delay; + int rear_delay = cur_task_ptr->rear_delay; if (auto iter = m_rear_delay.find(cur_name); iter != m_rear_delay.cend()) { rear_delay = iter->second; @@ -193,7 +196,7 @@ bool ProcessTask::_run() if (need_stop) { return true; } - set_tasks(m_cur_task_ptr->next); + m_cur_tasks_name = cur_task_ptr->next; sleep(task_delay); } @@ -231,4 +234,4 @@ void asst::ProcessTask::exec_swipe_task(ProcessTaskAction action) default: // 走不到这里，TODO 报个错 break; } -} \ No newline at end of file +} diff --git a/src/MeoAssistant/ProcessTask.h b/src/MeoAssistant/ProcessTask.h index ebc694cc84..facf6784ef 100644 --- a/src/MeoAssistant/ProcessTask.h +++ b/src/MeoAssistant/ProcessTask.h @@ -27,7 +27,7 @@ namespace asst void exec_click_task(const Rect& matched_rect); void exec_swipe_task(ProcessTaskAction action); - std::shared_ptr m_cur_task_ptr; + std::vector m_raw_tasks_name; std::vector m_cur_tasks_name; std::unordered_map m_rear_delay; std::unordered_map m_times_limit;