From 8da3e1deb3b04bfdf463eadfb3698dcfd060517c Mon Sep 17 00:00:00 2001 From: MistEO Date: Sun, 12 Jun 2022 22:12:57 +0800 Subject: [PATCH] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=8E=89=E8=90=BD=E8=AF=86=E5=88=AB=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/846 --- resource/tasks.json | 4 ++++ src/MeoAssistant/StageDropsImageAnalyzer.cpp | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resource/tasks.json b/resource/tasks.json index 091fd6509a..a93ee9f77f 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -6754,6 +6754,10 @@ "l", "1" ], + [ + "工", + "1" + ], [ "o", "0" diff --git a/src/MeoAssistant/StageDropsImageAnalyzer.cpp b/src/MeoAssistant/StageDropsImageAnalyzer.cpp index c540e312cf..a07c27e3f6 100644 --- a/src/MeoAssistant/StageDropsImageAnalyzer.cpp +++ b/src/MeoAssistant/StageDropsImageAnalyzer.cpp @@ -31,9 +31,7 @@ bool asst::StageDropsImageAnalyzer::analyze() cv::imwrite("debug/" + stem + "_draw.png", m_image_draw); #endif - return std::all_of(m_drops.cbegin(), m_drops.cend(), [](const auto& item_info) -> bool { - return item_info.quantity > 0; - }); + return ret; } asst::StageKey asst::StageDropsImageAnalyzer::get_stage_key() const @@ -203,10 +201,8 @@ bool asst::StageDropsImageAnalyzer::analyze_drops() if (quantity <= 0) { has_error = true; Log.error(__FUNCTION__, "quantity error", quantity); - continue; } if (item.empty()) { - has_error = true; Log.warn(__FUNCTION__, "item id is empty"); } StageDropInfo info;