From 5d8526abd1afe71229be5e459249fbd606ecc249 Mon Sep 17 00:00:00 2001
From: status102 <status102@outlook.com>
Date: Sun, 12 Nov 2023 14:52:54 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=90=86=E6=99=BA?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E9=A2=84=E5=A4=84=E7=90=86=EF=BC=8C=E5=8F=96=E6=B6=88=E5=86=85?=
 =?UTF-8?q?=E9=83=A8=E9=87=8D=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Task/Fight/SanityBeforeStagePlugin.cpp    | 25 +++----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/MaaCore/Task/Fight/SanityBeforeStagePlugin.cpp b/src/MaaCore/Task/Fight/SanityBeforeStagePlugin.cpp
index 597704d403..bcda162b87 100644
--- a/src/MaaCore/Task/Fight/SanityBeforeStagePlugin.cpp
+++ b/src/MaaCore/Task/Fight/SanityBeforeStagePlugin.cpp
@@ -1,11 +1,7 @@
 #include "SanityBeforeStagePlugin.h"
 
-#include <meojson/json.hpp>
-
-#include "Config/TaskData.h"
 #include "Controller/Controller.h"
 #include "Utils/Logger.hpp"
-#include "Utils/NoWarningCV.h"
 #include "Utils/StringMisc.hpp"
 #include "Vision/RegionOCRer.h"
 
@@ -31,29 +27,16 @@ bool asst::SanityBeforeStagePlugin::verify(AsstMsg msg, const json::value& detai
 
 bool asst::SanityBeforeStagePlugin::_run()
 {
-    int retry = 0;
-    while (!need_exit() && retry < 3) {
-        if (get_sanity_before_stage() || retry >= 3) {
-            break;
-        }
-        ++retry;
-        Log.warn(__FUNCTION__, "Sanity ocr failed, retry:", retry);
-        sleep(Config.get_options().task_delay);
-    }
-
-    return true;
+    return get_sanity_before_stage();
 }
 
 bool asst::SanityBeforeStagePlugin::get_sanity_before_stage()
 {
     LogTraceFunction;
 
-    const static auto task = Task.get<OcrTaskInfo>("SanityMatch");
-    auto img = make_roi(ctrler()->get_image(), task->roi);
-    cv::normalize(img, img, 255.0, 0.0, cv::NormTypes::NORM_MINMAX);
-
-    RegionOCRer analyzer(img);
-    analyzer.set_replace(task->replace_map);
+    RegionOCRer analyzer(ctrler()->get_image());
+    analyzer.set_task_info("SanityMatch");
+    analyzer.set_bin_threshold(0, 255);
     auto res_opt = analyzer.analyze();
 
     json::value sanity_info = basic_info_with_what("SanityBeforeStage");