From 5d2935b00567748c6e29ae7f08e4e8ce66dee27e Mon Sep 17 00:00:00 2001 From: MistEO Date: Sat, 30 Jul 2022 01:32:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=82=89=E9=B8=BD=E4=B8=8D=E5=9C=A8?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=86=85=E7=9A=84=E5=B9=B2=E5=91=98=E6=8E=92?= =?UTF-8?q?=E4=B8=AA=E5=BA=8F=EF=BC=88=E6=8B=9B=E7=B2=BE=E4=BA=8C=E4=B9=9F?= =?UTF-8?q?=E8=A6=81=E4=BC=98=E5=85=88=E6=8B=9B=E7=AD=89=E7=BA=A7=E9=AB=98?= =?UTF-8?q?=E7=9A=84=EF=BC=81=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/RoguelikeRecruitImageAnalyzer.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/MeoAssistant/RoguelikeRecruitImageAnalyzer.cpp b/src/MeoAssistant/RoguelikeRecruitImageAnalyzer.cpp index 3351748ad9..3bcf957cdf 100644 --- a/src/MeoAssistant/RoguelikeRecruitImageAnalyzer.cpp +++ b/src/MeoAssistant/RoguelikeRecruitImageAnalyzer.cpp @@ -37,6 +37,18 @@ bool asst::RoguelikeRecruitImageAnalyzer::analyze() Log.info(__FUNCTION__, name, elite, level, rect.to_string()); m_result.emplace_back(std::move(info)); } + + auto first_un_req = std::find_if(m_result.begin(), m_result.end(), + [&](const auto& info) -> bool { + return info.required == false; + }); + std::sort(first_un_req, m_result.end(), + [&](const auto& lhs, const auto& rhs) -> bool { + if (lhs.elite == rhs.elite) { + return lhs.level > rhs.level; + } + return lhs.elite > rhs.elite; + }); return !m_result.empty(); }