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

fix: fix recruit min max level

Browse Source
This commit is contained in:
Horror Proton
2022-07-25 11:04:36 +08:00
parent 4e1ce9d6e8
commit 13e54e418a
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/MeoAssistant/AutoRecruitTask.cpp
View File

@@ -21,8 +21,8 @@ namespace asst::recruit_calc
{
RecruitCombs result;
result.tags = { t };
result.min_level = 3;
result.max_level = 3;
result.min_level = 6;
result.max_level = 0;
result.avg_level = 3;
return result;
});
@@ -35,7 +35,7 @@ namespace asst::recruit_calc
if (op.level == 6 && rc.tags.front() != SeniorOper) continue;
rc.opers.push_back(op);
rc.min_level = (std::min)(rc.min_level, op.level);
rc.max_level = (std::min)(rc.max_level, op.level);
rc.max_level = (std::max)(rc.max_level, op.level);
}
}
@@ -44,7 +44,7 @@ namespace asst::recruit_calc
std::sort(rc.tags.begin(), rc.tags.end());
std::sort(rc.opers.begin(), rc.opers.end());
rc.recompute_average_level();
rc.update_attributes();
}
}
@@ -448,6 +448,14 @@ bool asst::AutoRecruitTask::recruit_calc_task(bool& out_force_skip, int& out_sel
continue;
}
if (need_exit()) return false;
if (m_set_time) {
for (const Rect& rect : image_analyzer.get_set_time_rect()) {
m_ctrler->click(rect);
}
}
if (std::find(m_select_level.cbegin(), m_select_level.cend(), final_combination.min_level) == m_select_level.cend()) {
// nothing to select
out_force_skip = false;
@@ -455,12 +463,6 @@ bool asst::AutoRecruitTask::recruit_calc_task(bool& out_force_skip, int& out_sel
return true;
}
if (need_exit()) return false;
if (m_set_time){
Log.error(__FILE__, __LINE__, "SET TIME NOT IMPLEMENTED"); // TODO: set time
}
for (const std::string& final_tag_name : final_combination.tags) {
auto tag_rect_iter =
std::find_if(tags.cbegin(), tags.cend(), [&](const TextRect& r) { return r.text == final_tag_name; });