From ce3c338ceed4efc8888ced2b49cd0d91c039e7f5 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Tue, 11 Oct 2022 23:03:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B0=B4=E6=9C=88?=
 =?UTF-8?q?=E8=82=89=E9=B8=BD=E4=B8=AD=EF=BC=8C=E6=8E=92=E5=BC=82=E5=8F=8D?=
 =?UTF-8?q?=E5=BA=94=E5=B9=B2=E5=91=98=E6=97=A0=E6=B3=95=E8=AF=86=E5=88=AB?=
 =?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

fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/2177
---
 resource/tasks.json                           | 22 +++++++++++++++----
 .../RoguelikeRecruitImageAnalyzer.cpp         |  1 +
 .../RoguelikeSkillSelectionImageAnalyzer.cpp  |  1 +
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/resource/tasks.json b/resource/tasks.json
index d2230f2c5e..70a359d16b 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -7097,7 +7097,14 @@
             26,
             120,
             23
-        ]
+        ],
+        "specificRect": [
+            100,
+            0,
+            0,
+            0
+        ],
+        "specificRect_Doc": "x拿来当文字灰度二值化下限用"
     },
     "Roguelike1RecruitElite0": {
         "roi": [
@@ -8118,10 +8125,17 @@
         "text": [],
         "roi": [
             210,
-            10,
+            8,
             120,
-            22
-        ]
+            20
+        ],
+        "specificRect": [
+            100,
+            0,
+            0,
+            0
+        ],
+        "specificRect_Doc": "x拿来当文字灰度二值化下限用"
     },
     "Roguelike1SkillSelectionMove1": {
         "algorithm": "JustReturn",
diff --git a/src/MeoAssistant/ImageAnalyzer/RoguelikeRecruitImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/RoguelikeRecruitImageAnalyzer.cpp
index 717b209716..c0867a4fc2 100644
--- a/src/MeoAssistant/ImageAnalyzer/RoguelikeRecruitImageAnalyzer.cpp
+++ b/src/MeoAssistant/ImageAnalyzer/RoguelikeRecruitImageAnalyzer.cpp
@@ -12,6 +12,7 @@ bool asst::RoguelikeRecruitImageAnalyzer::analyze()
     OcrWithFlagTemplImageAnalyzer analyzer(m_image);
     analyzer.set_task_info("Roguelike1RecruitOcrFlag", "Roguelike1RecruitOcr");
     analyzer.set_replace(Task.get<OcrTaskInfo>("CharsNameOcrReplace")->replace_map);
+    analyzer.set_threshold(Task.get("Roguelike1RecruitOcr")->specific_rect.x);
 
     if (!analyzer.analyze()) {
         return false;
diff --git a/src/MeoAssistant/ImageAnalyzer/RoguelikeSkillSelectionImageAnalyzer.cpp b/src/MeoAssistant/ImageAnalyzer/RoguelikeSkillSelectionImageAnalyzer.cpp
index 03fb308c1d..d6afa10c99 100644
--- a/src/MeoAssistant/ImageAnalyzer/RoguelikeSkillSelectionImageAnalyzer.cpp
+++ b/src/MeoAssistant/ImageAnalyzer/RoguelikeSkillSelectionImageAnalyzer.cpp
@@ -50,6 +50,7 @@ std::string asst::RoguelikeSkillSelectionImageAnalyzer::name_analyze(const Rect&
 {
     OcrWithPreprocessImageAnalyzer analyzer;
     auto name_task_ptr = Task.get<OcrTaskInfo>("Roguelike1SkillSelectionName");
+    analyzer.set_threshold(name_task_ptr->specific_rect.x);
     analyzer.set_task_info(name_task_ptr);
     analyzer.set_image(m_image);
     analyzer.set_roi(roi.move(name_task_ptr->roi));