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

feat: 肉鸽开局助战or自选干员后不再要求选用start属性干员

Browse Source
This commit is contained in:
DuKong
2023-08-04 20:01:55 +08:00
parent e929279cb1
commit 6c01f18fcb
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
#include "RoguelikeRecruitTaskPlugin.h"
#include "RoguelikeRecruitTaskPlugin.h"
#include "Config/Miscellaneous/BattleDataConfig.h"
#include "Config/Roguelike/RoguelikeRecruitConfig.h"
@@ -59,16 +59,24 @@ bool asst::RoguelikeRecruitTaskPlugin::_run()
size_t recruit_count = status()->get_number(Status::RoguelikeRecruitmentCount).value_or(0) + 1; // 这是第几次招募
status()->set_number(Status::RoguelikeRecruitmentCount, recruit_count); // 这是第几次招募
bool start_complete = status()
->get_number(Status::RoguelikeRecruitmentStartsComplete)
.value_or(0); // 阵容中必须有开局干员，没有前仅招募start干员或预备干员
bool team_complete = status()
->get_number(Status::RoguelikeRecruitmentTeamComplete)
.value_or(0); // 阵容完备前，仅招募key干员或预备干员
// 开局干员
bool use_support = get_status_bool(Status::RoguelikeUseSupport);
if (use_support) {
if (check_support_char()) {
start_complete = true;
return true;
}
}
else {
if (check_core_char()) {
start_complete = true;
return true;
}
}
@@ -100,13 +108,6 @@ bool asst::RoguelikeRecruitTaskPlugin::_run()
group_count[group_name]++;
}
bool start_complete = status()
->get_number(Status::RoguelikeRecruitmentStartsComplete)
.value_or(0); // 阵容中必须有开局干员，没有前仅招募start干员或预备干员
bool team_complete = status()
->get_number(Status::RoguelikeRecruitmentTeamComplete)
.value_or(0); // 阵容完备前，仅招募key干员或预备干员
if (!start_complete) {
for (const auto& oper : chars_map) {
auto& recruit_info = RoguelikeRecruit.get_oper_info(rogue_theme, oper.first);