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

Merge branch 'dev' of https://github.com/LingXii/MaaAssistantArknights into dev

Browse Source
This commit is contained in:
DuKong
2023-04-02 11:05:15 +08:00
parent a192bea9ba 0b32278127
commit 754501db40
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/MaaCore/Task/Roguelike/RoguelikeBattleTaskPlugin.cpp
View File

@@ -491,6 +491,8 @@ void asst::RoguelikeBattleTaskPlugin::postproc_of_deployment_conditions(const ba
}
}
break;
default:
break;
}
if (m_force_air_defense.has_finished_deploy_air_defense && position != OperPosition::AirDefense) {
@@ -577,6 +579,8 @@ std::optional<asst::battle::DeploymentOper> asst::RoguelikeBattleTaskPlugin::cal
case Role::Medic:
has_medic = true;
break;
default:
break;
}
const auto& position = get_role_position(role);
@@ -587,6 +591,8 @@ std::optional<asst::battle::DeploymentOper> asst::RoguelikeBattleTaskPlugin::cal
case OperPosition::AirDefense:
has_air_defense = true;
break;
default:
break;
}
// found all

2
src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp
View File

@@ -118,7 +118,7 @@ bool asst::RoguelikeRecruitTaskPlugin::_run()
const auto& team_complete_condition = RoguelikeRecruit.get_team_complete_info(rogue_theme);
for (const auto& condition : team_complete_condition) {
int count = 0;
for (const std::string group_name : condition.groups)
for (const std::string& group_name : condition.groups)
count += group_count[group_name];
if (count < condition.threshold) {
complete = false;