From 42d414206e2000bdfabbfcc1ffe78ff752ed8ce5 Mon Sep 17 00:00:00 2001 From: status102 <102887808+status102@users.noreply.github.com> Date: Tue, 6 Feb 2024 17:09:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=82=89=E9=B8=BD?= =?UTF-8?q?=E5=AD=98=E6=AC=BE=E4=BD=99=E9=A2=9Docr=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix #8261 --- resource/tasks.json | 6 ++++++ src/MaaCore/Task/Roguelike/RoguelikeInvestTaskPlugin.cpp | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/resource/tasks.json b/resource/tasks.json index cee0580c39..5054de8a59 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -12752,6 +12752,12 @@ 335, 150, 60 + ], + "ocrReplace": [ + [ + ">", + "" + ] ] }, "Roguelike@StageTraderInvest-Count-Error": { diff --git a/src/MaaCore/Task/Roguelike/RoguelikeInvestTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeInvestTaskPlugin.cpp index 65a7413551..e15dc2d2fe 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeInvestTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeInvestTaskPlugin.cpp @@ -113,6 +113,13 @@ std::optional asst::RoguelikeInvestTaskPlugin::ocr_current_count(const auto { RegionOCRer ocr(img); ocr.set_task_info(task_name); + + const auto& number_replace = Task.get("NumberOcrReplace")->replace_map; + auto task_replace = Task.get(task_name)->replace_map; + + auto merge_map = std::vector(number_replace); + ranges::copy(task_replace, std::back_inserter(merge_map)); + ocr.set_replace(merge_map); if (!ocr.analyze()) { Log.error(__FUNCTION__, "unable to analyze current investment count."); return std::nullopt;