From b34fe5db8960201896ff45c07d0004d1dab188f9 Mon Sep 17 00:00:00 2001 From: status102 Date: Sat, 25 Nov 2023 18:30:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=82=80=E5=BD=B1?= =?UTF-8?q?=E8=82=89=E9=B8=BD=E7=BB=93=E7=AE=97=E8=AF=86=E5=88=AB=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E5=AF=BC=E8=87=B4=E5=B4=A9=E6=BA=83=E7=9A=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Roguelike/RoguelikeSettlementTaskPlugin.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/MaaCore/Task/Roguelike/RoguelikeSettlementTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeSettlementTaskPlugin.cpp index bb8cf2c51d..c2610ec742 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeSettlementTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeSettlementTaskPlugin.cpp @@ -100,15 +100,18 @@ bool asst::RoguelikeSettlementTaskPlugin::get_settlement_info(json::value& info, "RoguelikeSettlementOcr-Combat", "RoguelikeSettlementOcr-Recruit", "RoguelikeSettlementOcr-Object", "RoguelikeSettlementOcr-BOSS", "RoguelikeSettlementOcr-Emergency" }; - static auto text_task_name = + static const auto text_task_name = std::vector { "RoguelikeSettlementOcr-Difficulty", "RoguelikeSettlementOcr-Score", "RoguelikeSettlementOcr-Exp", "RoguelikeSettlementOcr-Skill" }; - if (m_config->get_theme() == "Phantom") { - text_task_name.pop_back(); - } ranges::for_each(battle_task_name, analyze_battle_data); - ranges::for_each(text_task_name, analyze_text_data); + + if (m_config->get_theme() == RoguelikeTheme::Phantom) { + ranges::for_each(text_task_name | views::take(3), analyze_text_data); + } + else { + ranges::for_each(text_task_name, analyze_text_data); + } return true; }