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

fix: fix recruit slot force skip

Browse Source
This commit is contained in:
Horror Proton
2022-08-01 11:17:55 +08:00
parent 22edec16c8
commit d6b2f47f9a
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/MeoAssistant/AutoRecruitTask.cpp
View File

@@ -163,7 +163,15 @@ std::optional<asst::Rect> asst::AutoRecruitTask::try_get_start_button(const cv::
start_analyzer.set_image(image);
if (!start_analyzer.analyze()) return std::nullopt;
start_analyzer.sort_result_horizontal();
return start_analyzer.get_result().front().rect;
auto iter =
std::find_if(start_analyzer.get_result().cbegin(), start_analyzer.get_result().cend(),
[&](const TextRect& r) -> bool
{
return m_force_skipped.find(slot_index_from_rect(r.rect)) == m_force_skipped.cend();
});
if (iter == start_analyzer.get_result().cend()) return std::nullopt;
Log.info("Found slot index", slot_index_from_rect(iter->rect), ".");
return iter->rect;
}
/// open a pending recruit slot, set timer and tags then confirm, or leave the slot doing nothing
@@ -197,6 +205,7 @@ bool asst::AutoRecruitTask::recruit_one(const Rect& button)
if (calc_result.force_skip) {
// mark the slot as completed and return
m_force_skipped.emplace(slot_index_from_rect(button));
click_return_button();
return true;
}