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

fix: 修复编队时“全部”识别错误

Browse Source 
fix #5962
This commit is contained in:
MistEO
2023-08-20 21:02:08 +08:00
parent bdd74f74d9
commit 66a9bac83c
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resource/tasks.json
View File

@@ -6585,6 +6585,13 @@
133
]
},
"BattleQuickFormationRole-All-OCR": {
"baseTask": "BattleQuickFormationRole-All",
"algorithm": "OcrDetect",
"text": [
"全部"
]
},
"BattleQuickFormationRole-Pioneer": {
"baseTask": "BattleQuickFormationRole"
},

10
src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp
View File

@@ -249,17 +249,20 @@ bool asst::BattleFormationTask::click_role_table(battle::Role role)
static const std::unordered_map<battle::Role, std::string> RoleNameType = {
{ battle::Role::Caster, "Caster" }, { battle::Role::Medic, "Medic" }, { battle::Role::Pioneer, "Pioneer" },
{ battle::Role::Sniper, "Sniper" }, { battle::Role::Special, "Special" }, { battle::Role::Support, "Support" },
{ battle::Role::Tank, "Tank" }, { battle::Role::Warrior, "Warrior" }, { battle::Role::Unknown, "All" },
{ battle::Role::Tank, "Tank" }, { battle::Role::Warrior, "Warrior" },
};
m_last_oper_name.clear();
auto role_iter = RoleNameType.find(role);
std::vector<std::string> tasks;
if (role_iter == RoleNameType.cend()) {
return ProcessTask(*this, { "BattleQuickFormationRole-All" }).set_retry_times(0).run();
tasks = { "BattleQuickFormationRole-All", "BattleQuickFormationRole-All-OCR" };
}
else {
return ProcessTask(*this, { "BattleQuickFormationRole-" + role_iter->second }).set_retry_times(0).run();
tasks = { "BattleQuickFormationRole-" + role_iter->second };
}
return ProcessTask(*this, tasks).set_retry_times(0).run();
}
bool asst::BattleFormationTask::parse_formation()
@@ -285,6 +288,7 @@ bool asst::BattleFormationTask::parse_formation()
same_role &= BattleData.get_role(oper.name) == role;
}
// for unknown, will use { "BattleQuickFormationRole-All", "BattleQuickFormationRole-All-OCR" }
m_formation[same_role ? role : battle::Role::Unknown].emplace_back(opers_vec);
}