From f37f87e76dff217b91111ee7430ceccfa59ef74c Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Tue, 12 Apr 2022 00:27:04 +0800
Subject: [PATCH] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D=E5=85=AC=E6=8B=9B?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=90=8E=E7=9A=84=E8=AF=86=E5=88=AB=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=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

https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/336
---
 resource/tasks.json                  |  9 +++++++--
 src/MeoAssistant/AutoRecruitTask.cpp | 13 +++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

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<int> 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
+}