From 78ca31a75fa48a1a9fd5146c220f7bc9ff484811 Mon Sep 17 00:00:00 2001 From: status102 Date: Wed, 25 Oct 2023 15:14:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=BD=BF=E7=94=A8=E4=B8=B4?= =?UTF-8?q?=E6=9C=9F=E8=8D=AF=E6=97=B6=E5=8F=AF=E8=83=BD=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=A7=BB=E9=99=A4=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Task/Fight/MedicineCounterPlugin.cpp | 42 ++++++++++--------- .../Task/Fight/MedicineCounterPlugin.h | 18 ++++---- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/src/MaaCore/Task/Fight/MedicineCounterPlugin.cpp b/src/MaaCore/Task/Fight/MedicineCounterPlugin.cpp index a099a632fd..ba5e67bcb9 100644 --- a/src/MaaCore/Task/Fight/MedicineCounterPlugin.cpp +++ b/src/MaaCore/Task/Fight/MedicineCounterPlugin.cpp @@ -24,7 +24,7 @@ bool asst::MedicineCounterPlugin::verify(AsstMsg msg, const json::value& details bool asst::MedicineCounterPlugin::_run() { LogTraceFunction; - + if (m_using_count >= m_max_count && !m_use_expiring) { return true; } @@ -35,33 +35,33 @@ bool asst::MedicineCounterPlugin::_run() // 预计最大使用药品情况不会超过2种，不考虑滑动 // 10+10+N - auto initialCount = initial_count(image); - if (!initialCount) [[unlikely]] { + auto initial_count = init_count(image); + if (!initial_count) [[unlikely]] { return false; } auto refresh_medicine_count = [&]() { image = ctrler()->get_image(); - auto count = initial_count(image); + auto count = init_count(image); if (!count) [[unlikely]] { return false; } - initialCount = count; + initial_count = count; return true; }; - if (m_using_count < m_max_count && initialCount->using_count + m_using_count > m_max_count) { - reduce_excess(*initialCount); + if (m_using_count < m_max_count && initial_count->using_count + m_using_count > m_max_count) { + reduce_excess(*initial_count); if (!refresh_medicine_count()) { return false; } } else if (m_using_count >= m_max_count && m_use_expiring) { bool changed = false; - for (auto& [use, inventory, rect, is_expiring] : initialCount->medicines | std::ranges::views::reverse) { - while (use > 0 && is_expiring != ExpiringStatus::Expiring) { - ctrler()->click(rect); + for (const auto& [use, inventory, reduce_rect, is_expiring] : + initial_count->medicines | std::ranges::views::reverse) { + if (use > 0 && is_expiring != ExpiringStatus::Expiring) { + ctrler()->click(reduce_rect); sleep(Config.get_options().task_delay); - use--; changed = true; } } @@ -70,7 +70,7 @@ bool asst::MedicineCounterPlugin::_run() return false; } } - m_using_count += initialCount->using_count; + m_using_count += initial_count->using_count; // 博朗台：如果溢出则等待 if (m_dr_grandet) { @@ -90,13 +90,12 @@ bool asst::MedicineCounterPlugin::_run() auto info = basic_info_with_what("UseMedicine"); info["details"]["is_expiring"] = m_using_count > m_max_count; - info["details"]["count"] = initialCount->using_count; + info["details"]["count"] = initial_count->using_count; callback(AsstMsg::SubTaskExtraInfo, info); return true; } -std::optional asst::MedicineCounterPlugin::initial_count( - cv::Mat image) +std::optional asst::MedicineCounterPlugin::init_count(cv::Mat image) { int use = 0; MultiMatcher multiMatcher(image); @@ -107,10 +106,11 @@ std::optional asst::Medicine } std::vector medicines; + auto using_count_task = Task.get("UsingMedicineCount"); + auto inventory_task = Task.get("MedicineInventory"); + auto expiring_task = Task.get("MedicineExpiringTime"); + for (const auto& result : multiMatcher.get_result()) { - auto using_count_task = Task.get("UsingMedicineCount"); - auto inventory_task = Task.get("MedicineInventory"); - auto expiring_task = Task.get("MedicineExpiringTime"); auto using_rect = result.rect.move(using_count_task->rect_move); auto inventory_rect = result.rect.move(inventory_task->rect_move); auto expiring_rect = result.rect.move(expiring_task->rect_move); @@ -149,6 +149,8 @@ std::optional asst::Medicine int using_count = 0, inventory_count = 0; if (!utils::chars_to_number(using_count_ocr.get_result().text, using_count) || !utils::chars_to_number(inventry_ocr.get_result().text, inventory_count)) { + Log.error(__FUNCTION__, "unable to convert ocr result to int, use:", using_count_ocr.get_result().text, + ", inventory:", inventry_ocr.get_result().text); return std::nullopt; } use += using_count; @@ -160,10 +162,10 @@ std::optional asst::Medicine return InitialMedicineResult { .using_count = use, .medicines = medicines }; } -void asst::MedicineCounterPlugin::reduce_excess(InitialMedicineResult using_medicine) +void asst::MedicineCounterPlugin::reduce_excess(const InitialMedicineResult& using_medicine) { auto reduce = m_using_count + using_medicine.using_count - m_max_count; - for (auto& [use, inventory, rect, is_expiring] : using_medicine.medicines | std::ranges::views::reverse) { + for (const auto& [use, inventory, rect, is_expiring] : using_medicine.medicines | std::ranges::views::reverse) { ctrler()->click(rect); sleep(Config.get_options().task_delay); reduce -= use; diff --git a/src/MaaCore/Task/Fight/MedicineCounterPlugin.h b/src/MaaCore/Task/Fight/MedicineCounterPlugin.h index 12804bac89..ba3672361c 100644 --- a/src/MaaCore/Task/Fight/MedicineCounterPlugin.h +++ b/src/MaaCore/Task/Fight/MedicineCounterPlugin.h @@ -26,8 +26,8 @@ namespace asst }; struct Medicine { - int use; - int inventry; + int use = 0; + int inventry = 0; asst::Rect reduce_button_position; ExpiringStatus is_expiring; }; @@ -35,18 +35,20 @@ namespace asst // 库存量, 移除按钮的位置 struct InitialMedicineResult { - int using_count; + int using_count = 0; std::vector medicines; }; - // 识别初始使用的药量 - std::optional initial_count(cv::Mat image); + // 识别使用的药量 + std::optional init_count(cv::Mat image); // 减少药品使用 - void reduce_excess(InitialMedicineResult using_medicine); + void reduce_excess(const InitialMedicineResult& using_medicine); std::optional get_target_of_sanity(const cv::Mat& image); std::optional get_maximun_of_sanity(const cv::Mat& image); - bool m_use_expiring, m_dr_grandet = false; - int m_using_count = 0, m_max_count = 0; + bool m_use_expiring = false; + bool m_dr_grandet = false; + int m_using_count = 0; + int m_max_count = 0; }; }