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] }, diff --git a/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp b/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp index a3732cad76..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(true); 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: 老接口太难重构了,先弄个这玩意兼容下,后续慢慢全删掉