From 2e17de49835c7772028e50fb10afdaf092139ee8 Mon Sep 17 00:00:00 2001
From: status102 <102887808+status102@users.noreply.github.com>
Date: Sun, 9 Mar 2025 14:03:16 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E8=82=89=E9=B8=BD=E6=8A=95=E8=B5=84ocr?=
 =?UTF-8?q?=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Roguelike/RoguelikeInvestTaskPlugin.cpp   | 34 +++++++++++++------
 .../Roguelike/RoguelikeInvestTaskPlugin.h     |  6 ++++
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/MaaCore/Task/Roguelike/RoguelikeInvestTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeInvestTaskPlugin.cpp
index af235f5dcf..26937a1e87 100644
--- a/src/MaaCore/Task/Roguelike/RoguelikeInvestTaskPlugin.cpp
+++ b/src/MaaCore/Task/Roguelike/RoguelikeInvestTaskPlugin.cpp
@@ -5,7 +5,6 @@
 #include "Task/ProcessTask.h"
 #include "Task/Roguelike/RoguelikeControlTaskPlugin.h"
 #include "Utils/Logger.hpp"
-#include "Vision/Matcher.h"
 #include "Vision/RegionOCRer.h"
 
 bool asst::RoguelikeInvestTaskPlugin::verify(AsstMsg msg, const json::value& details) const
@@ -40,11 +39,10 @@ bool asst::RoguelikeInvestTaskPlugin::_run()
     LogTraceFunction;
 
     auto image = ctrler()->get_image();
-
-    int count = 0;                                                          // 当次已投资的个数
-    int retry = 0;                                                          // 重试次数
-    auto deposit = ocr_count(image, "Roguelike@StageTraderInvest-Deposit"); // 当前的存款
-    int count_limit = m_maximum - m_invest_count;                           // 可用投资次数
+    int count = 0;                                // 当次已投资的个数
+    int retry = 0;                                // 重试次数
+    auto deposit = get_deposit(image);            // 当前的存款
+    int count_limit = m_maximum - m_invest_count; // 可用投资次数
     // 投资确认按钮
     const auto& click_rect = Task.get("Roguelike@StageTraderInvest-Confirm")->specific_rect;
     LogInfo << __FUNCTION__ << "开始投资, 存款" << deposit.value_or(-1) << ", 可投资次数" << count_limit;
@@ -60,14 +58,13 @@ bool asst::RoguelikeInvestTaskPlugin::_run()
         }
         image = ctrler()->get_image();
         if (is_investment_available(image)) { // 检查是否处于可投资状态
-            if (auto ocr = ocr_count(image, "Roguelike@StageTraderInvest-Deposit"); ocr) {
+            if (auto ocr = get_deposit(image); ocr) {
                 if (*ocr >= 0 && *ocr <= 999 && *ocr != *deposit) {
                     count += *ocr - *deposit;
                     deposit = *ocr;
                     retry = 0;
                 }
-                else if (auto wallet = ocr_count(image, "Roguelike@StageTraderInvest-Wallet");
-                         *wallet && *wallet == 0) {
+                else if (auto wallet = get_wallet(image); *wallet && *wallet == 0) {
                     Log.info(__FUNCTION__, "钱包为0, 退出投资");
                     break;
                 }
@@ -86,7 +83,7 @@ bool asst::RoguelikeInvestTaskPlugin::_run()
             Log.info(__FUNCTION__, "投资系统错误, 退出投资");
 
             sleep(300); // 此处UI有一个从左往右的移动，等待后重新截图，防止UI错位
-            auto ocr = ocr_count(ctrler()->get_image(), "Roguelike@StageTraderInvestError-Count");
+            auto ocr = get_deposit_when_error(ctrler()->get_image());
             if (ocr) {
                 // 可继续投资 / 到达投资上限999
                 count += *ocr - deposit.value_or(0);
@@ -143,7 +140,7 @@ std::optional<int> asst::RoguelikeInvestTaskPlugin::ocr_count(const auto& img, c
     ocr.set_use_raw(false);
     ocr.set_replace(merge_map);
     if (!ocr.analyze()) {
-        Log.error(__FUNCTION__, "unable to analyze current investment count.");
+        Log.error(__FUNCTION__, "unable to analyze current investment count. task:", task_name);
         return std::nullopt;
     }
     int count = 0;
@@ -172,6 +169,21 @@ bool asst::RoguelikeInvestTaskPlugin::is_investment_error(const cv::Mat& image)
     return task.run();
 }
 
+std::optional<int> asst::RoguelikeInvestTaskPlugin::get_deposit(const cv::Mat& image) const
+{
+    return ocr_count(image, "Roguelike@StageTraderInvest-Deposit");
+}
+
+std::optional<int> asst::RoguelikeInvestTaskPlugin::get_deposit_when_error(const cv::Mat& image) const
+{
+    return ocr_count(image, "Roguelike@StageTraderInvestError-Count");
+}
+
+std::optional<int> asst::RoguelikeInvestTaskPlugin::get_wallet(const cv::Mat& image) const
+{
+    return ocr_count(image, "Roguelike@StageTraderInvest-Wallet");
+}
+
 void asst::RoguelikeInvestTaskPlugin::stop_roguelike() const
 {
     m_control_ptr->exit_then_stop(true);
diff --git a/src/MaaCore/Task/Roguelike/RoguelikeInvestTaskPlugin.h b/src/MaaCore/Task/Roguelike/RoguelikeInvestTaskPlugin.h
index 11caf283fc..f1b8ec640c 100644
--- a/src/MaaCore/Task/Roguelike/RoguelikeInvestTaskPlugin.h
+++ b/src/MaaCore/Task/Roguelike/RoguelikeInvestTaskPlugin.h
@@ -21,6 +21,12 @@ private:
     std::optional<int> ocr_count(const auto& img, const auto& task_name) const;
     bool is_investment_available(const cv::Mat& image) const;
     bool is_investment_error(const cv::Mat& image) const;
+    // 获取存款
+    std::optional<int> get_deposit(const cv::Mat& image) const;
+    // 获取错误状态下的存款
+    std::optional<int> get_deposit_when_error(const cv::Mat& image) const;
+    // 获取钱包余额
+    std::optional<int> get_wallet(const cv::Mat& image) const;
     void stop_roguelike() const;
 
     int m_invest_count = 0;