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

fix: 修复水月、傀影肉鸽无法正确识别结算内容

Browse Source
This commit is contained in:
status102
2023-11-13 22:17:31 +08:00
parent b1c3f3a2ff
commit ecfd5ea8de
2 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
resource/tasks.json
View File

@@ -11090,63 +11090,63 @@
"RoguelikeSettlementOcr-Floor": {
"baseTask": "NumberOcrReplace",
"roi": [
132,
102,
170,
70,
100,
40
]
},
"RoguelikeSettlementOcr-Step": {
"baseTask": "NumberOcrReplace",
"roi": [
132,
102,
238,
70,
100,
40
]
},
"RoguelikeSettlementOcr-Combat": {
"baseTask": "NumberOcrReplace",
"roi": [
132,
102,
304,
70,
100,
40
]
},
"RoguelikeSettlementOcr-Recruit": {
"baseTask": "NumberOcrReplace",
"roi": [
132,
102,
374,
70,
100,
40
]
},
"RoguelikeSettlementOcr-Object": {
"baseTask": "NumberOcrReplace",
"roi": [
705,
680,
170,
70,
95,
40
]
},
"RoguelikeSettlementOcr-BOSS": {
"baseTask": "NumberOcrReplace",
"roi": [
705,
680,
238,
70,
95,
40
]
},
"RoguelikeSettlementOcr-Emergency": {
"baseTask": "NumberOcrReplace",
"roi": [
705,
680,
304,
70,
95,
40
]
},
@@ -11155,9 +11155,9 @@
"isAscii": false,
"roi": [
750,
370,
372,
120,
35
31
]
},
"RoguelikeSettlementOcr-Score": {
@@ -11172,18 +11172,34 @@
"RoguelikeSettlementOcr-Exp": {
"baseTask": "NumberOcrReplace",
"roi": [
667,
643,
525,
140,
160,
40
]
},
"RoguelikeSettlementOcr-Skill": {
"baseTask": "NumberOcrReplace",
"roi": [
950,
920,
530,
60,
100,
40
]
},
"Phantom@RoguelikeSettlementOcr-Score": {
"roi": [
460,
525,
160,
55
]
},
"Phantom@RoguelikeSettlementOcr-Exp": {
"roi": [
760,
525,
160,
40
]
},

8
src/MaaCore/Task/Roguelike/RoguelikeSettlementTaskPlugin.cpp
View File

@@ -77,7 +77,8 @@ bool asst::RoguelikeSettlementTaskPlugin::get_settlement_info(json::value& info,
auto analyze_text_data = [&](const std::string& task_name) {
RegionOCRer ocr(image);
ocr.set_task_info(task_name);
ocr.set_task_info(m_config->get_theme() + "@" + task_name);
ocr.set_bin_threshold(50, 255);
if (!ocr.analyze()) {
Log.error(__FUNCTION__, "analyze battle data failed, task:", task_name);
return;
@@ -92,9 +93,12 @@ bool asst::RoguelikeSettlementTaskPlugin::get_settlement_info(json::value& info,
"RoguelikeSettlementOcr-Combat", "RoguelikeSettlementOcr-Recruit",
"RoguelikeSettlementOcr-Object", "RoguelikeSettlementOcr-BOSS",
"RoguelikeSettlementOcr-Emergency" };
static const auto text_task_name =
static auto text_task_name =
std::vector<std::string> { "RoguelikeSettlementOcr-Difficulty", "RoguelikeSettlementOcr-Score",
"RoguelikeSettlementOcr-Exp", "RoguelikeSettlementOcr-Skill" };
if (m_config->get_theme() == "Phantom") {
text_task_name.pop_back();
}
ranges::for_each(battle_task_name, analyze_battle_data);
ranges::for_each(text_task_name, analyze_text_data);