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

fix: 增加肉鸽分队存储及判断，避免蓝图队影响其他肉鸽存钱

Browse Source
This commit is contained in:
Lancarus
2024-07-23 12:12:29 +08:00
committed by status102
parent 478c493589
commit e9fdeaf476
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/MaaCore/Task/Roguelike/RoguelikeConfig.cpp
View File

@@ -5,6 +5,7 @@ void asst::RoguelikeConfig::clear()
// ------------------ 通用参数 ------------------
m_trader_no_longer_buy = false;
m_core_char = std::string();
m_squad = std::string();
m_team_full_without_rookie = false;
m_use_support = false;
m_oper = std::unordered_map<std::string, RoguelikeOper>();

3
src/MaaCore/Task/Roguelike/RoguelikeConfig.h
View File

@@ -119,6 +119,8 @@ namespace asst
bool get_trader_no_longer_buy() const { return m_trader_no_longer_buy; }
// ------------------ 开局 ------------------
void set_squad(std::string squad) { m_squad = std::move(squad); }
const std::string& get_squad() const { return m_squad; }
void set_core_char(std::string core_char) { m_core_char = std::move(core_char); }
const auto& get_core_char() const { return m_core_char; }
void set_use_support(bool use_support) { m_use_support = use_support; }
@@ -136,6 +138,7 @@ namespace asst
bool m_trader_no_longer_buy = false; // 不再购买藏品
// ------------------ 开局 ------------------
std::string m_squad; // 分队，默认分队为空
std::string m_core_char; // 开局干员名
bool m_use_support = false; // 开局干员是否为助战干员
bool m_use_nonfriend_support = false; // 是否可以是非好友助战干员

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

@@ -143,5 +143,6 @@ bool asst::RoguelikeCustomStartTaskPlugin::hijack_core_char()
m_config->set_use_support(m_customs[RoguelikeCustomType::UseSupport] == "1");
m_config->set_use_nonfriend_support(m_customs[RoguelikeCustomType::UseNonfriendSupport] == "1");
m_config->set_core_char(char_name);
m_config->set_squad(m_customs[RoguelikeCustomType::Squad]);
return true;
}

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

@@ -57,7 +57,8 @@ bool asst::RoguelikeRecruitTaskPlugin::_run()
LogTraceFunction;
++m_recruit_count;
if (m_config->get_mode() == RoguelikeMode::Investment && m_recruit_count > 1) {
if (m_config->get_mode() == RoguelikeMode::Investment && m_recruit_count > 1 &&
m_config->get_squad() == "蓝图测绘分队") {
// 如果是投资模式，直接招募第一个干员
lazy_recruit();
return true;