From e854641f48eaa962c1c4fc42ee74bf1d0f77c445 Mon Sep 17 00:00:00 2001 From: MistEO Date: Tue, 5 Jul 2022 22:22:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9F=BA=E5=BB=BA?= =?UTF-8?q?=E9=81=87=E5=88=B0=E4=B8=8D=E8=AE=A4=E8=AF=86=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E7=9A=84=E5=B9=B2=E5=91=98=E6=97=B6=EF=BC=8C=E4=B8=8D=E7=BB=A7?= =?UTF-8?q?=E7=BB=AD=E8=AF=86=E5=88=AB=E5=90=8E=E7=BB=AD=E5=B9=B2=E5=91=98?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/InfrastProductionTask.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/MeoAssistant/InfrastProductionTask.cpp b/src/MeoAssistant/InfrastProductionTask.cpp index e2de3fa272..8a20c4f77f 100644 --- a/src/MeoAssistant/InfrastProductionTask.cpp +++ b/src/MeoAssistant/InfrastProductionTask.cpp @@ -156,14 +156,7 @@ bool asst::InfrastProductionTask::opers_detect_with_swipe() size_t num = opers_detect(); Log.trace("opers_detect return", num); - // 无论如何也不会没有干员的，除非前面的操作哪里出错了，没进到干员选择的页面。那也就没必要继续下去了 if (num == 0) { - return false; - } - - // 这里本来是判断不相等就可以退出循环。 - // 但是有时候滑动会把一个干员挡住一半，一个页面完整的干员真的只有10个，所以加个2的差值 - if (max_num_of_opers_per_page - num > 2) { break; } @@ -194,10 +187,9 @@ size_t asst::InfrastProductionTask::opers_detect() const int face_hash_thres = std::dynamic_pointer_cast( Task.get("InfrastOperFaceHash"))->dist_threshold; - int cur_available_num = static_cast(cur_all_opers.size()); + const size_t pre_size = m_all_available_opers.size(); for (const auto& cur_oper : cur_all_opers) { if (cur_oper.skills.empty()) { - --cur_available_num; continue; } { @@ -230,7 +222,7 @@ size_t asst::InfrastProductionTask::opers_detect() } m_all_available_opers.emplace_back(cur_oper); } - return cur_available_num; + return m_all_available_opers.size() - pre_size; } bool asst::InfrastProductionTask::optimal_calc()