From 27edfbbdfdb6e0768eff37b6775009cde028794d Mon Sep 17 00:00:00 2001 From: MistEO Date: Sun, 9 Apr 2023 20:50:38 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=AE=80=E5=8D=95=E6=95=B4?= =?UTF-8?q?=E7=90=86=E4=BA=86=E4=B8=8B=E8=82=89=E9=B8=BD=E6=8B=9B=E5=8B=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Status.h | 3 ++ .../Roguelike/RoguelikeRecruitTaskPlugin.cpp | 40 ++++++++++--------- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/MaaCore/Status.h b/src/MaaCore/Status.h index e26ccfb171..968376fa06 100644 --- a/src/MaaCore/Status.h +++ b/src/MaaCore/Status.h @@ -48,6 +48,9 @@ namespace asst static inline const std::string RoguelikeSkillUsagePrefix = "RoguelikeSkillUsage-"; static inline const std::string RoguelikeTeamFullWithoutRookie = "RoguelikeTeamFullWithoutRookie"; static inline const std::string RoguelikeTheme = "RoguelikeTheme"; + 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 ProcessTaskLastTimePrefix = "#LastTime#"; diff --git a/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp index 031c0fa29c..650421cdfb 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeRecruitTaskPlugin.cpp @@ -56,10 +56,8 @@ bool asst::RoguelikeRecruitTaskPlugin::_run() { LogTraceFunction; - static bool start_complete = false; // 阵容中必须有开局干员，没有前仅招募start干员或预备干员 - static bool team_complete = false; // 阵容完备前，仅招募key干员或预备干员 - static int recruit_count = 0; // 这是第几次招募 - recruit_count++; + size_t recruit_count = status()->get_number(Status::RoguelikeRecruitmentCount).value_or(0) + 1; // 这是第几次招募 + status()->set_number(Status::RoguelikeRecruitmentCount, recruit_count); // 这是第几次招募 // 开局干员 bool use_support = get_status_bool(Status::RoguelikeUseSupport); @@ -74,13 +72,6 @@ bool asst::RoguelikeRecruitTaskPlugin::_run() } } - bool recruited = false; - - auto recruit_oper = [&](const battle::roguelike::Recruitment& info) { - select_oper(info); - recruited = true; - }; - bool team_full_without_rookie = status()->get_number(Status::RoguelikeTeamFullWithoutRookie).value_or(0); // Log.info("team_full_without_rookie", team_full_without_rookie); @@ -89,11 +80,6 @@ bool asst::RoguelikeRecruitTaskPlugin::_run() std::string str_chars_info = status()->get_str(Status::RoguelikeCharOverview).value_or(json::value().to_string()); json::value json_chars_info = json::parse(str_chars_info).value_or(json::value()); const auto& chars_map = json_chars_info.as_object(); - if (chars_map.empty()) { // 新的一次探索，重新初始化静态变量 - start_complete = false; - team_complete = false; - recruit_count = 1; - } // __________________will-be-removed-begin__________________ std::unordered_map team_roles; @@ -112,6 +98,13 @@ 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); @@ -130,7 +123,7 @@ bool asst::RoguelikeRecruitTaskPlugin::_run() for (const std::string& group_name : condition.groups) { count += group_count[group_name]; complete_count += group_count[group_name]; - } + } if (count < condition.threshold) { complete = false; } @@ -142,12 +135,17 @@ bool asst::RoguelikeRecruitTaskPlugin::_run() } } - if (recruit_count >= 3 && !start_complete) { + if (recruit_count >= 3 && !start_complete) { // 如果第3次招募还没拿到start干员，说明账号练度低且阵容不齐，放开招募限制，有啥用啥吧 start_complete = true; team_complete = true; } + status()->set_number(Status::RoguelikeRecruitmentStartsComplete, + start_complete); // 阵容中必须有开局干员，没有前仅招募start干员或预备干员 + status()->set_number(Status::RoguelikeRecruitmentTeamComplete, + team_complete); // 阵容完备前，仅招募key干员或预备干员 + // 候选干员 std::vector recruit_list; @@ -334,6 +332,12 @@ bool asst::RoguelikeRecruitTaskPlugin::_run() sleep(Task.get("RoguelikeCustom-HijackCoChar")->post_delay); } + bool recruited = false; + auto recruit_oper = [&](const battle::roguelike::Recruitment& info) { + select_oper(info); + recruited = true; + }; + // 没有候选干员，进入后备逻辑 if (recruit_list.empty()) { Log.trace(__FUNCTION__, "| No oper in recruit list.");