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

feat: 抄作业自动编队支持含有不同职业的组

Browse Source
This commit is contained in:
MistEO
2023-08-12 15:17:10 +08:00
parent 11222a1055
commit 9db54db1a4
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -254,7 +254,7 @@ 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::Tank, "Tank" }, { battle::Role::Warrior, "Warrior" }, { battle::Role::Unknown, "All" },
};
m_the_right_name.clear();
@@ -284,8 +284,13 @@ bool asst::BattleFormationTask::parse_formation()
}
formation.array_emplace(name);
bool same_role = true;
battle::Role role = BattleData.get_role(opers_vec.front().name);
m_formation[role].emplace_back(opers_vec);
for (const auto& oper : opers_vec) {
same_role &= BattleData.get_role(oper.name) == role;
}
m_formation[same_role ? role : battle::Role::Unknown].emplace_back(opers_vec);
}
callback(AsstMsg::SubTaskExtraInfo, info);