fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 10:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 使用理智药时恢复理智Ocr包含意外字符

Browse Source 
fix #13316

180 o成 1.80 了
This commit is contained in:
status102
2025-07-21 10:54:56 +08:00
parent ffbcbe4c44
commit 3c9a5f8510
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/MaaCore/Task/Fight/MedicineCounterTaskPlugin.cpp
View File

@@ -111,6 +111,7 @@ bool asst::MedicineCounterTaskPlugin::_run()
Log.error(__FUNCTION__, "unable to analyze sanity");
}
else if (*sanity_target >= *sanity_max) [[unlikely]] {
Log.info(__FUNCTION__, "sanity target >= sanity max, reduce count");
if (m_dr_grandet) { // 博朗台: 如果溢出则等待
auto waitTime = DrGrandetTaskPlugin::analyze_time_left(image);
if (waitTime > 0) {
@@ -258,9 +259,16 @@ void asst::MedicineCounterTaskPlugin::reduce_excess(const MedicineResult& using_
std::optional<int> asst::MedicineCounterTaskPlugin::get_target_of_sanity(const cv::Mat& image)
{
const auto& ocr_task = Task.get<OcrTaskInfo>("UsingMedicine-Target");
const auto& number_replace = Task.get<OcrTaskInfo>("NumberOcrReplace")->replace_map;
const auto& task_replace = ocr_task->replace_map;
auto merge_map = std::vector(number_replace);
ranges::copy(task_replace, std::back_inserter(merge_map));
RegionOCRer ocr(image);
ocr.set_bin_threshold(100, 255);
ocr.set_task_info("UsingMedicine-Target");
ocr.set_task_info(ocr_task);
ocr.set_replace(merge_map);
if (!ocr.analyze()) [[unlikely]] {
Log.error(__FUNCTION__, "unable to ocr");
return std::nullopt;
@@ -275,9 +283,16 @@ std::optional<int> asst::MedicineCounterTaskPlugin::get_target_of_sanity(const c
std::optional<int> asst::MedicineCounterTaskPlugin::get_maximun_of_sanity(const cv::Mat& image)
{
const auto& ocr_task = Task.get<OcrTaskInfo>("UsingMedicine-SanityMax");
const auto& number_replace = Task.get<OcrTaskInfo>("NumberOcrReplace")->replace_map;
const auto& task_replace = ocr_task->replace_map;
auto merge_map = std::vector(number_replace);
ranges::copy(task_replace, std::back_inserter(merge_map));
RegionOCRer ocr(image);
ocr.set_bin_threshold(100, 255);
ocr.set_task_info("UsingMedicine-SanityMax");
ocr.set_task_info(ocr_task);
ocr.set_replace(merge_map);
if (!ocr.analyze()) [[unlikely]] {
Log.error(__FUNCTION__, "unable to ocr");
return std::nullopt;