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

refactor: 重构BattleHelper的m_cur_deployment_opers为vector

Browse Source
This commit is contained in:
status102
2023-11-27 16:22:44 +08:00
parent 781e808658
commit cc3ac7ef1b
5 changed files with 48 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp
View File

@@ -94,7 +94,7 @@ bool asst::BattleProcessTask::to_group()
}
std::unordered_set<std::string> char_set;
for (const auto& oper : m_cur_deployment_opers | views::values) {
for (const auto& oper : m_cur_deployment_opers) {
char_set.emplace(oper.name);
}
@@ -323,8 +323,8 @@ bool asst::BattleProcessTask::wait_condition(const Action& action)
if (!update_deployment(false, image)) {
return false;
}
size_t cooling_count = ranges::count_if(m_cur_deployment_opers | views::values,
[](const auto& oper) -> bool { return oper.cooling; });
size_t cooling_count =
ranges::count_if(m_cur_deployment_opers, [](const auto& oper) -> bool { return oper.cooling; });
if (cooling_count == static_cast<size_t>(action.cooling)) {
break;
}
@@ -342,9 +342,10 @@ bool asst::BattleProcessTask::wait_condition(const Action& action)
}
else if (!update_deployment(false, image)) {
return false;
}
if (auto iter = m_cur_deployment_opers.find(name);
iter != m_cur_deployment_opers.cend() && iter->second.available) {
};
if (auto iter =
ranges::find_if(m_cur_deployment_opers, [&](const auto& oper) { return oper.name == name; });
iter != m_cur_deployment_opers.end() && iter->available) {
break;
}
do_strategy_and_update_image();