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

fix: 修复集成战略萨米主题下凹密闻板相关功能 (#14755)

Browse Source
This commit is contained in:
Weiyou Wang
2025-11-19 21:50:32 +11:00
committed by GitHub
parent 73eeaec928
commit a1ead2bef3
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/MaaCore/Task/Roguelike/RoguelikeCustomStartTaskPlugin.cpp
View File

@@ -179,7 +179,8 @@ bool asst::RoguelikeCustomStartTaskPlugin::hijack_reward()
m_config->set_run_for_collectible(true);
m_control_ptr->exit_then_stop(true);
}
else if (m_config->get_start_with_elite_two()) {
else if (m_config->get_start_with_elite_two() || m_config->get_first_floor_foldartal()) {
// 之后还要凹开局精二或第一层密文板，不停止任务，继续探索
ctrler()->click(ret->rect);
sleep(Config.get_options().task_delay);
}

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

@@ -569,9 +569,16 @@ bool asst::RoguelikeRecruitTaskPlugin::recruit_appointed_char(const std::string&
if (it != chars.cend()) {
// !get_run_for_collectible() 即当前没有在烧开水/水已经烧好了
// 需要凹直升且，要么已经烧好了水，要么只需要凹直升不需要烧水
if (start_with_elite_two && (!m_config->get_run_for_collectible() || only_start_with_elite_two)) {
// 凹直升只对第一位招募的干员生效
if (start_with_elite_two && (!m_config->get_run_for_collectible() || only_start_with_elite_two) &&
m_recruit_count == 1) {
if (it->elite == 2) {
m_task_ptr->set_enable(false);
if (m_config->get_first_floor_foldartal()) {
select_oper(*it); // 放心选择精二，之后还要继续凹密文板
}
else {
m_task_ptr->set_enable(false); // 仅当之后没有东西要凹了才停止
}
}
else {
// 非只凹直升时，重新烧水