From d8aa349af59cfd5b9956747b41086215facda5dc Mon Sep 17 00:00:00 2001 From: status102 <102887808+status102@users.noreply.github.com> Date: Sat, 9 Mar 2024 11:27:52 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E5=87=8F=E5=B0=91=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E5=8F=98=E9=87=8F=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [skip changelog] --- src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp index 49c89a7ade..0e52e31fec 100644 --- a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp @@ -71,7 +71,7 @@ bool asst::BattleFormationTask::_run() } if (!missing_operators.empty()) { - if (missing_operators.size()==1) { + if (missing_operators.size() == 1) { // TODO: 自动借助战？ } @@ -81,11 +81,12 @@ bool asst::BattleFormationTask::_run() } if (m_add_user_additional) { + auto limit = 12 - m_size_of_operators_in_formation; for (const auto& [name, skill] : m_user_additional) { if (m_operators_in_formation.contains(name)) { continue; } - if (m_size_of_operators_in_formation >= 12) { + if (--limit < 0) { break; } asst::battle::OperUsage oper; @@ -93,9 +94,7 @@ bool asst::BattleFormationTask::_run() oper.skill = skill; std::vector usage { std::move(oper) }; m_user_formation.emplace_back(std::move(usage)); - ++m_size_of_operators_in_formation; } - m_size_of_operators_in_formation -= (int)m_user_formation.size(); add_formation(battle::Role::Unknown, m_user_formation, missing_operators); }