From d967a2cf9defeafb93a632842c6db95a9075093d Mon Sep 17 00:00:00 2001 From: MistEO Date: Sat, 14 May 2022 15:56:22 +0800 Subject: [PATCH] =?UTF-8?q?chore.=E5=8A=A0=E4=BA=86=E4=B8=80=E7=82=B9?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BB=A5=E8=BF=BD=E8=B8=AA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20issues/502?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/502 --- src/MeoAssistant/InfrastProductionTask.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/MeoAssistant/InfrastProductionTask.cpp b/src/MeoAssistant/InfrastProductionTask.cpp index 342f1d18f5..28f8ea8541 100644 --- a/src/MeoAssistant/InfrastProductionTask.cpp +++ b/src/MeoAssistant/InfrastProductionTask.cpp @@ -556,10 +556,7 @@ bool asst::InfrastProductionTask::opers_choose() [&](const infrast::BattleRealTimeOper& lhs) -> bool { int dist = HashImageAnalyzer::hamming(lhs.face_hash, find_iter->face_hash); Log.debug("opers_choose | face hash dist", dist); - if (dist < face_hash_thres) { - return true; - } - return false; + return dist < face_hash_thres; } ); if (avlb_iter != m_all_available_opers.cend()) { @@ -574,13 +571,12 @@ bool asst::InfrastProductionTask::opers_choose() opt_iter = m_optimal_combs.erase(opt_iter); } if (m_optimal_combs.empty()) { - if (count >= cur_max_num_of_opers) { - break; - } - else { // 这种情况可能是萌新，可用干员人数不足以填满当前设施 + Log.trace(__FUNCTION__, "| count", count, "cur_max_num_of_opers", cur_max_num_of_opers); + if (count < cur_max_num_of_opers) { + // 这种情况可能是萌新，可用干员人数不足以填满当前设施 callback(AsstMsg::SubTaskExtraInfo, basic_info_with_what("NotEnoughStaff")); - break; } + break; } // 因为识别完了还要点击，所以这里不能异步滑动