From ff57d52f2a9605348e7bb621fa2ee3ffb90a4ca5 Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Thu, 8 Feb 2024 11:53:35 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Task/Miscellaneous/BattleFormationTask.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp index 7231050b02..233a565113 100644 --- a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp @@ -58,19 +58,19 @@ bool asst::BattleFormationTask::_run() if (m_select_formation_index > 0 && !select_formation(m_select_formation_index)) { return false; } - + if (!enter_selection_page()) { save_img(utils::path("debug") / utils::path("other")); return false; } - + for (auto& [role, oper_groups] : m_formation) { - if (!add_formation(role,oper_groups)) { + if (!add_formation(role, oper_groups)) { report_missing_operators(oper_groups); return false; } } - + if (m_add_user_additional) { for (const auto& [name, skill] : m_user_additional) { if (m_operators_in_formation.contains(name)) { @@ -137,9 +137,9 @@ bool asst::BattleFormationTask::add_formation(battle::Role role, std::vector& groups) { +void asst::BattleFormationTask::report_missing_operators(std::vector& groups) +{ auto info = basic_info(); std::vector oper_names;