From f874dc836ae3adc0e06e614d06b6368f86830f4c Mon Sep 17 00:00:00 2001 From: zzyyyl <74587068+zzyyyl@users.noreply.github.com> Date: Tue, 21 Jun 2022 22:01:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=AC=E6=8B=9B=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E6=97=B6=E6=98=BE=E7=A4=BA=E5=88=B7=E6=96=B0=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E4=BD=BF=E5=88=B7=E6=96=B0=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E4=B8=8D=E8=B6=85=E8=BF=873?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/AutoRecruitTask.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/MeoAssistant/AutoRecruitTask.cpp b/src/MeoAssistant/AutoRecruitTask.cpp index 51e2e8cb8a..75bc01076a 100644 --- a/src/MeoAssistant/AutoRecruitTask.cpp +++ b/src/MeoAssistant/AutoRecruitTask.cpp @@ -125,7 +125,7 @@ bool asst::AutoRecruitTask::calc_and_recruit() int maybe_level; bool has_robot_tag; - while (true) { + for (int refresh_count = 0; refresh_count <= 3; ) { RecruitCalcTask recruit_task(m_callback, m_callback_arg, m_task_chain); recruit_task.set_param(m_select_level, true, m_skip_robot) .set_retry_times(m_retry_times) @@ -152,14 +152,15 @@ bool asst::AutoRecruitTask::calc_and_recruit() && recruit_task.get_has_refresh() && !(m_skip_robot && has_robot_tag)) { if (refresh()) { - Log.trace("recruit tags refreshed, rerunning recruit task"); + // TODO: Add callback + Log.trace("recruit tags refreshed for the " + std::to_string(++refresh_count) + "-th time, rerunning recruit task"); continue; } } // 如果时间没调整过，那 tag 十有八九也没选，重新试一次 // 造成时间没调的原因可见： https://github.com/MaaAssistantArknights/MaaAssistantArknights/pull/300#issuecomment-1073287984 if (!check_time_reduced()) { - Log.trace("unreduced recruit check time detected, rerunning recruit task"); + Log.warn("unreduced recruit check time detected, rerunning recruit task"); continue; }