From 2ecb2b7206a76e2097989491b7deba6ce5dcf8a8 Mon Sep 17 00:00:00 2001 From: status102 <102887808+status102@users.noreply.github.com> Date: Thu, 1 Jan 2026 14:18:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E8=87=AA=E5=8A=A8=E6=88=98=E6=96=97?= =?UTF-8?q?=E5=87=BB=E6=9D=80=E6=95=B0=E8=AF=86=E5=88=AB=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp b/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp index a3732cad76..e958e47cf5 100644 --- a/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp +++ b/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp @@ -279,7 +279,7 @@ BattlefieldMatcher::MatchResult> BattlefieldMatcher::kills_a TemplDetOCRer kills_analyzer(m_image); kills_analyzer.set_task_info("BattleKillsFlag", "BattleKills"); kills_analyzer.set_replace(Task.get("NumberOcrReplace")->replace_map); - kills_analyzer.set_ocr_use_raw(true); + kills_analyzer.set_ocr_use_raw(false); auto kills_opt = kills_analyzer.analyze(); if (!kills_opt) { return {}; From d85291a97acae97d1f9b4593e551d9bf9c725c16 Mon Sep 17 00:00:00 2001 From: status102 <102887808+status102@users.noreply.github.com> Date: Thu, 1 Jan 2026 23:17:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20useRaw=20=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp | 1 - src/MaaCore/Vision/Config/OCRerConfig.cpp | 5 +++++ src/MaaCore/Vision/Config/OCRerConfig.h | 1 + src/MaaCore/Vision/TemplDetOCRer.cpp | 1 - src/MaaCore/Vision/TemplDetOCRer.h | 3 --- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp b/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp index e958e47cf5..394388aef5 100644 --- a/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp +++ b/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp @@ -279,7 +279,6 @@ BattlefieldMatcher::MatchResult> BattlefieldMatcher::kills_a TemplDetOCRer kills_analyzer(m_image); kills_analyzer.set_task_info("BattleKillsFlag", "BattleKills"); kills_analyzer.set_replace(Task.get("NumberOcrReplace")->replace_map); - kills_analyzer.set_ocr_use_raw(false); auto kills_opt = kills_analyzer.analyze(); if (!kills_opt) { return {}; diff --git a/src/MaaCore/Vision/Config/OCRerConfig.cpp b/src/MaaCore/Vision/Config/OCRerConfig.cpp index 8be1bfa643..21c6b0a133 100644 --- a/src/MaaCore/Vision/Config/OCRerConfig.cpp +++ b/src/MaaCore/Vision/Config/OCRerConfig.cpp @@ -74,6 +74,11 @@ void OCRerConfig::set_use_char_model(bool enable) noexcept m_params.use_char_model = enable; } +void asst::OCRerConfig::set_use_raw(bool value) noexcept +{ + m_params.use_raw = value; +} + void OCRerConfig::set_bin_threshold(int lower, int upper) { m_params.bin_threshold_lower = lower; diff --git a/src/MaaCore/Vision/Config/OCRerConfig.h b/src/MaaCore/Vision/Config/OCRerConfig.h index e8d3abc095..aa7da136cf 100644 --- a/src/MaaCore/Vision/Config/OCRerConfig.h +++ b/src/MaaCore/Vision/Config/OCRerConfig.h @@ -43,6 +43,7 @@ public: void set_without_det(bool without_det) noexcept; void set_use_char_model(bool enable) noexcept; + void set_use_raw(bool value) noexcept; void set_bin_threshold(int lower, int upper = 255); void set_bin_expansion(int expansion); diff --git a/src/MaaCore/Vision/TemplDetOCRer.cpp b/src/MaaCore/Vision/TemplDetOCRer.cpp index a560b569f9..20f0e103b8 100644 --- a/src/MaaCore/Vision/TemplDetOCRer.cpp +++ b/src/MaaCore/Vision/TemplDetOCRer.cpp @@ -23,7 +23,6 @@ TemplDetOCRer::ResultsVecOpt TemplDetOCRer::analyze() const RegionOCRer ocr_analyzer(m_image, roi); ocr_analyzer.set_params(OCRerConfig::m_params); - ocr_analyzer.set_use_raw(m_use_raw); auto ocr_opt = ocr_analyzer.analyze(); if (!ocr_opt) { continue; diff --git a/src/MaaCore/Vision/TemplDetOCRer.h b/src/MaaCore/Vision/TemplDetOCRer.h index 66813ae1bb..1b5800425f 100644 --- a/src/MaaCore/Vision/TemplDetOCRer.h +++ b/src/MaaCore/Vision/TemplDetOCRer.h @@ -33,8 +33,6 @@ public: void set_task_info(const std::string& templ_task_name, const std::string& ocr_task_name); void set_flag_rect_move(Rect flag_rect_move); - void set_ocr_use_raw(bool use_raw) { m_use_raw = use_raw; } - ResultsVecOpt analyze() const; // FIXME: 老接口太难重构了，先弄个这玩意兼容下，后续慢慢全删掉 @@ -51,7 +49,6 @@ protected: private: Rect m_flag_rect_move; - bool m_use_raw = true; private: // FIXME: 老接口太难重构了，先弄个这玩意兼容下，后续慢慢全删掉 From 292624166ff55aa12ee1361edb010e1a958a14a7 Mon Sep 17 00:00:00 2001 From: status102 <102887808+status102@users.noreply.github.com> Date: Thu, 1 Jan 2026 23:17:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E8=87=AA=E5=8A=A8=E6=88=98=E6=96=97?= =?UTF-8?q?=20=E5=87=BB=E6=9D=80=E6=95=B0=E3=80=81=E8=B4=B9=E7=94=A8?= =?UTF-8?q?=E8=AF=86=E5=88=AB=20useRaw=20=3D=20false?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks/tasks.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resource/tasks/tasks.json b/resource/tasks/tasks.json index 1ece6aefe9..e8e58be460 100644 --- a/resource/tasks/tasks.json +++ b/resource/tasks/tasks.json @@ -3892,12 +3892,14 @@ "isAscii": true, "text": [], "roi": [50, 0, 100, 40], + "useRaw": false, "specialParams_doc": "Kill区域变化阈值, 模板匹配, 100=1.0; 正常在 0.997-1 之间波动, 少有0.995; _5->_6 的分数最高, 可达0.94", "specialParams": [98] }, "BattleCostData": { "baseTask": "NumberOcrReplace", "roi": [1199, 494, 80, 44], + "useRaw": false, "specialParams_doc": "Cost数字变化阈值, 模板匹配, 100=1.0; 正常在 0.997-1 之间波动, 少有0.995; _5->_6 的分数最高, 0.85上下", "specialParams": [98] },