From 652a49f47c5bb691137f6418bc14039dae2bea42 Mon Sep 17 00:00:00 2001 From: status102 Date: Thu, 9 Nov 2023 21:23:00 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E8=BF=81=E7=A7=BB=E8=82=89=E9=B8=BD?= =?UTF-8?q?=E6=8B=9B=E5=8B=9F=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Status.h | 2 -- src/MaaCore/Task/Roguelike/RoguelikeConfig.cpp | 2 +- src/MaaCore/Task/Roguelike/RoguelikeConfig.h | 4 ++++ src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/MaaCore/Status.h b/src/MaaCore/Status.h index 813b01ef8f..673eb02e15 100644 --- a/src/MaaCore/Status.h +++ b/src/MaaCore/Status.h @@ -51,9 +51,7 @@ namespace asst static inline const std::string RoguelikeTeamFullWithoutRookie = "RoguelikeTeamFullWithoutRookie"; static inline const std::string RoguelikeRecruitmentStartsComplete = "RoguelikeRecruitmentStartsComplete"; static inline const std::string RoguelikeRecruitmentTeamComplete = "RoguelikeRecruitmentTeamComplete"; - static inline const std::string RoguelikeRecruitmentCount = "RoguelikeRecruitmentCount"; static inline const std::string RoguelikeDifficulty = "RoguelikeDifficulty"; - static inline const std::string RoguelikeFoldartalOverview = "RoguelikeFoldartalOverview"; static inline const std::string RoguelikeFoldartalFloor = "RoguelikeFoldartalFloor"; diff --git a/src/MaaCore/Task/Roguelike/RoguelikeConfig.cpp b/src/MaaCore/Task/Roguelike/RoguelikeConfig.cpp index 3c619abd22..31921f0e4c 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeConfig.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeConfig.cpp @@ -1,5 +1,5 @@ #include "RoguelikeConfig.h" void asst::RoguelikeConfig::clear() { - + m_recruitment_count = 0; } diff --git a/src/MaaCore/Task/Roguelike/RoguelikeConfig.h b/src/MaaCore/Task/Roguelike/RoguelikeConfig.h index 1936b84abf..67d4939f94 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeConfig.h +++ b/src/MaaCore/Task/Roguelike/RoguelikeConfig.h @@ -27,10 +27,14 @@ namespace asst std::string get_theme() { return m_theme; } void set_mode(RoguelikeMode mode) { m_mode = mode; } RoguelikeMode get_mode() { return m_mode; } + void set_recruitment_count(int count) { m_recruitment_count = count; } + int get_recruitment_count() { return m_recruitment_count; } protected: // 肉鸽主题 std::string m_theme; RoguelikeMode m_mode = RoguelikeMode::Exp; + // 肉鸽招募次数 + int m_recruitment_count = 0; }; } diff --git a/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp index 15c902a1f2..32b19b3253 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp @@ -57,8 +57,8 @@ bool asst::RoguelikeRecruitTaskPlugin::_run() LogTraceFunction; // 这是第几次招募 - size_t recruit_count = status()->get_number(Status::RoguelikeRecruitmentCount).value_or(0) + 1; - status()->set_number(Status::RoguelikeRecruitmentCount, recruit_count); + int recruit_count = m_config->get_recruitment_count() + 1; + m_config->set_recruitment_count(recruit_count); // 是否有开局干员，阵容中必须有开局干员，没有前仅招募start干员或预备干员 bool start_complete = status()->get_number(Status::RoguelikeRecruitmentStartsComplete).value_or(0);