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

fix: 修复保全派驻不下工具人的问题

Browse Source
This commit is contained in:
MistEO
2023-01-16 02:03:34 +08:00
parent 51df29db64
commit de5bdcf418
1 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/MaaCore/Task/SSS/SSSBattleProcessTask.cpp
View File

@@ -67,19 +67,15 @@ bool asst::SSSBattleProcessTask::do_strategic_action(const cv::Mat& reusable)
}
std::unordered_map<std::string, DeploymentOper> exist_core;
std::unordered_map<Role, DeploymentOper> available_tool_men;
std::vector<DeploymentOper> tool_men;
for (const auto& [name, oper] : m_cur_deployment_opers) {
if (m_all_cores.contains(name)) {
exist_core.emplace(name, oper);
}
else {
if (oper.available) {
available_tool_men.emplace(oper.role, oper);
}
if (m_skill_usage.find(name) == m_skill_usage.cend()) {
// 工具人的技能一概好了就用
m_skill_usage.emplace(name, SkillUsage::Possibly);
}
else if (!m_all_action_opers.contains(oper.name)) {
tool_men.emplace_back(oper);
// 工具人的技能一概好了就用
m_skill_usage.try_emplace(name, SkillUsage::Possibly);
}
}
@@ -103,24 +99,23 @@ bool asst::SSSBattleProcessTask::do_strategic_action(const cv::Mat& reusable)
}
// for apple-clang build error
Role role_for_lambda = role;
// 如果有可用的干员，直接使用
auto available_iter = ranges::find_if(available_tool_men, [&](const auto& pair) {
return pair.first == role_for_lambda && !m_all_action_opers.contains(pair.second.name);
});
if (available_iter != available_tool_men.end()) {
auto available_iter = ranges::find_if(
tool_men, [&](const DeploymentOper& oper) { return oper.available && oper.role == role_for_lambda; });
if (available_iter != tool_men.cend()) {
--quantity;
// 部署完，画面会发生变化，所以直接返回，后续逻辑交给下次循环处理
return deploy_oper(available_iter->second.name, strategy.location, strategy.direction);
return deploy_oper(available_iter->name, strategy.location, strategy.direction);
}
// 如果有对应职业干员，但费用没转好，就等他转好，而不是部署下一个策略中的 tool_men
auto deployment_iter = ranges::find_if(m_cur_deployment_opers, [&](const auto& pair) {
return pair.second.role == role_for_lambda && !m_all_action_opers.contains(pair.second.name);
});
if (deployment_iter == m_cur_deployment_opers.end()) {
auto not_available_iter =
ranges::find_if(tool_men, [&](const DeploymentOper& oper) { return oper.role == role_for_lambda; });
if (not_available_iter == tool_men.cend()) {
continue;
}
// 如果有对应职业干员，但费用没转好，就等他转好，而不是部署下一个策略中的 tool_men
// 直接返回出去，后续逻辑交给下次循环处理
skip = true;
break;
}