From 21ecbc7f069041d085aaf20109fe27c0ea524cdc Mon Sep 17 00:00:00 2001 From: MistEO Date: Sat, 18 Jun 2022 23:18:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E6=B7=B1=E5=85=A5=E8=B0=83=E6=9F=A5=E6=A8=A1=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=B8=80=E4=BA=9B=E5=9B=BE=E7=9A=84=20copilo?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/roguelike_copilot.json | 9 +++++++++ resource/tasks.json | 9 ++++++++- src/MeoAssistant/RoguelikeRecruitTaskPlugin.cpp | 9 +++++---- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/resource/roguelike_copilot.json b/resource/roguelike_copilot.json index 8c56b02921..e3e03d416e 100644 --- a/resource/roguelike_copilot.json +++ b/resource/roguelike_copilot.json @@ -16,5 +16,14 @@ 3 ] ] + }, + { + "stage_name": "压轴登场", + "replacement_home": [ + [ + 2, + 3 + ] + ] } ] diff --git a/resource/tasks.json b/resource/tasks.json index 5e7ba54f15..6888a195d7 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -5488,7 +5488,14 @@ "Roguelike1LastRewardRand", "Roguelike1Team3", "Roguelike1CloseCollection", - "Roguelike1DialogSkip" + "Roguelike1DialogSkip", + "Roguelike1StageTrader", + "Roguelike1StageSafeHouse", + "Roguelike1StageEncounter", + "Roguelike1StageBoons", + "Roguelike1StageCambatDps", + "Roguelike1StageEmergencyDps", + "Roguelike1StageDreadfulFoe" ] }, "Roguelike1CloseCollection": { diff --git a/src/MeoAssistant/RoguelikeRecruitTaskPlugin.cpp b/src/MeoAssistant/RoguelikeRecruitTaskPlugin.cpp index a82ab30008..b65136e0f5 100644 --- a/src/MeoAssistant/RoguelikeRecruitTaskPlugin.cpp +++ b/src/MeoAssistant/RoguelikeRecruitTaskPlugin.cpp @@ -39,7 +39,8 @@ bool asst::RoguelikeRecruitTaskPlugin::_run() recruited = true; }; - for (const auto& info : analyzer.get_result()) { + const auto& oper_list = analyzer.get_result(); + for (const auto& info : oper_list) { // 先看看有没有精二的 if (info.elite != 2) { continue; @@ -49,7 +50,7 @@ bool asst::RoguelikeRecruitTaskPlugin::_run() } if (!recruited) { - for (const auto& info : analyzer.get_result()) { + for (const auto& info : oper_list) { // 拿个精一 50 以上的 if (info.elite == 0 || (info.elite == 1 && info.level < 50)) { @@ -63,7 +64,7 @@ bool asst::RoguelikeRecruitTaskPlugin::_run() if (!recruited) { Log.info("All are lower"); // 随便招个精一的 - for (const auto& info : analyzer.get_result()) { + for (const auto& info : oper_list) { if (info.elite == 0) { continue; } @@ -75,7 +76,7 @@ bool asst::RoguelikeRecruitTaskPlugin::_run() if (!recruited) { // 随便招个 Log.info("All are very lower"); - auto info = analyzer.get_result().front(); + auto info = oper_list.front(); recruit_oper(info); }