From 830d2f3e3c736c90d99cdd83d5c4469edba31e1c Mon Sep 17 00:00:00 2001
From: Horror Proton <107091537+horror-proton@users.noreply.github.com>
Date: Tue, 26 Jul 2022 14:02:21 +0800
Subject: [PATCH] fix: use member variable as recruit counter to allow retrying
 as AbstractTask

---
 src/MeoAssistant/AutoRecruitTask.cpp | 6 +++---
 src/MeoAssistant/AutoRecruitTask.h   | 1 -
 src/MeoAssistant/RecruitTask.cpp     | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/MeoAssistant/AutoRecruitTask.cpp b/src/MeoAssistant/AutoRecruitTask.cpp
index 8408e84de8..d94f31ecf0 100644
--- a/src/MeoAssistant/AutoRecruitTask.cpp
+++ b/src/MeoAssistant/AutoRecruitTask.cpp
@@ -137,8 +137,8 @@ bool asst::AutoRecruitTask::_run()
     static constexpr size_t slot_retry_limit = 3;
 
     size_t slot_fail = 0;
-    size_t recruit_times = 0; // how many times has the confirm button been pressed, NOT expedited plan used
-    while ((m_use_expedited || !m_pending_recruit_slot.empty()) && static_cast<int>(recruit_times) != m_max_times) {
+    // m_cur_times means how many times has the confirm button been pressed, NOT expedited plan used
+    while ((m_use_expedited || !m_pending_recruit_slot.empty()) && m_cur_times != m_max_times) {
         if (slot_fail >= slot_retry_limit) { return false; }
         if (m_use_expedited) {
             Log.info("ready to use expedited");
@@ -151,7 +151,7 @@ bool asst::AutoRecruitTask::_run()
         if (!recruit_one())
             ++slot_fail;
         else
-            ++recruit_times;
+            ++m_cur_times;
     }
     return true;
 }
diff --git a/src/MeoAssistant/AutoRecruitTask.h b/src/MeoAssistant/AutoRecruitTask.h
index 7f6adeae02..536b537937 100644
--- a/src/MeoAssistant/AutoRecruitTask.h
+++ b/src/MeoAssistant/AutoRecruitTask.h
@@ -25,7 +25,6 @@ namespace asst
         bool is_calc_only_task() { return m_max_times <= 0 || m_confirm_level.empty(); }
         bool analyze_start_buttons();
         bool recruit_one();
-        bool calc_and_recruit();
         bool check_recruit_home_page();
         bool recruit_begin();
         bool check_time_unreduced();
diff --git a/src/MeoAssistant/RecruitTask.cpp b/src/MeoAssistant/RecruitTask.cpp
index a218951924..1e66eb3838 100644
--- a/src/MeoAssistant/RecruitTask.cpp
+++ b/src/MeoAssistant/RecruitTask.cpp
@@ -50,7 +50,7 @@ bool asst::RecruitTask::set_params(const json::value& params)
             .set_select_level(std::move(select))
             .set_confirm_level(std::move(confirm))
             .set_skip_robot(skip_robot)
-            .set_set_time(set_time).set_retry_times(0);
+            .set_set_time(set_time).set_retry_times(3);
 
     return true;
 }