diff --git a/resource/tasks.json b/resource/tasks.json index 2ac57def0e..579cba8da8 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -1756,7 +1756,7 @@ ], "next": [ "RecruitLoading", - "Stop" + "SleepThenStop" ] }, "RecruitLoading": { @@ -1774,9 +1774,14 @@ ], "next": [ "RecruitLoading", - "Stop" + "SleepThenStop" ] }, + "SleepThenStop": { + "algorithm": "JustReturn", + "action": "doNothing", + "rearDelay": 2000 + }, "RecruitCheckTimeUnreduced": { "action": "Stop", "template": "RecruitTimeReduce.png", diff --git a/src/MeoAssistant/AutoRecruitTask.cpp b/src/MeoAssistant/AutoRecruitTask.cpp index 0fa9de580d..7ae550be58 100644 --- a/src/MeoAssistant/AutoRecruitTask.cpp +++ b/src/MeoAssistant/AutoRecruitTask.cpp @@ -5,6 +5,7 @@ #include "Controller.h" #include "ProcessTask.h" #include "RecruitTask.h" +#include "Logger.hpp" asst::AutoRecruitTask& asst::AutoRecruitTask::set_select_level(std::vector select_level) noexcept { @@ -56,6 +57,7 @@ bool asst::AutoRecruitTask::_run() if (!m_use_expedited) { return true; } + Log.info("ready to use expedited"); // 使用加急许可 for (; m_cur_times < m_max_times; ++m_cur_times) { if (need_exit()) { @@ -84,20 +86,25 @@ bool asst::AutoRecruitTask::analyze_start_buttons() auto image = Ctrler.get_image(); start_analyzer.set_image(image); if (!start_analyzer.analyze()) { + Log.info("There is no start button"); return false; } start_analyzer.sort_result(); m_start_buttons = start_analyzer.get_result(); + Log.info("Recruit start button size", m_start_buttons.size()); return true; } bool asst::AutoRecruitTask::recruit_index(size_t index) { + LogTraceFunction; + int delay = Resrc.cfg().get_options().task_delay; if (m_start_buttons.size() <= index) { return false; } + Log.info("recruit_index", index); Rect button = m_start_buttons.at(index).rect; Ctrler.click(button); sleep(delay); @@ -107,6 +114,8 @@ bool asst::AutoRecruitTask::recruit_index(size_t index) bool asst::AutoRecruitTask::calc_and_recruit() { + LogTraceFunction; + RecruitTask recruit_task(m_callback, m_callback_arg, m_task_chain); recruit_task.set_retry_times(m_retry_times); recruit_task.set_param(m_select_level, true); @@ -152,7 +161,7 @@ bool asst::AutoRecruitTask::calc_and_recruit() } bool asst::AutoRecruitTask::check_time_unreduced() { - ProcessTask task(*this, {"RecruitCheckTimeUnreduced"}); + ProcessTask task(*this, { "RecruitCheckTimeUnreduced" }); task.set_retry_times(1); return task.run(); } @@ -180,4 +189,4 @@ bool asst::AutoRecruitTask::refresh() { ProcessTask refresh_task(*this, { "RecruitRefresh" }); return refresh_task.run(); -} \ No newline at end of file +}