fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 让日志行内没有影响功能的代码，并对刷新次数上限检测做一个小改进

Browse Source
This commit is contained in:
zzyyyl
2022-06-21 23:01:53 +08:00
parent ff8b10bebf
commit 0dcb030128
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/MeoAssistant/AutoRecruitTask.cpp
View File

@@ -125,7 +125,7 @@ bool asst::AutoRecruitTask::calc_and_recruit()
int maybe_level;
bool has_robot_tag;
for (int refresh_count = 0; refresh_count <= 3; ) {
for (int refresh_count = 0; ; ) {
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)
@@ -153,8 +153,17 @@ bool asst::AutoRecruitTask::calc_and_recruit()
&& !(m_skip_robot && has_robot_tag)) {
if (refresh()) {
// TODO: Add callback
Log.trace("recruit tags refreshed for the " + std::to_string(++refresh_count) + "-th time, rerunning recruit task");
continue;
if(++refresh_count > 3) {
// 按理来说不会到这里，因为超过三次刷新的时候上面的 recruit_task.get_has_refresh() 应该是 false
// 报个错，返回
callback(AsstMsg::SubTaskError, basic_info());
click_return_button();
return true;
}
else {
Log.trace("recruit tags refreshed for the " + std::to_string(refresh_count) + "-th time, rerunning recruit task");
continue;
}
}
}
// 如果时间没调整过，那 tag 十有八九也没选，重新试一次