From 3ceaa1ecd8a0c5c419860587992b4005b13e3672 Mon Sep 17 00:00:00 2001 From: MistEO Date: Sun, 25 Dec 2022 23:01:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=88=98=E6=96=97=E4=B8=8D=E4=BC=9A=E5=BC=80=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Task/BattleHelper.cpp | 3 --- src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp | 9 +++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/MaaCore/Task/BattleHelper.cpp b/src/MaaCore/Task/BattleHelper.cpp index 2b0d0c64cf..6ef7d6ea7a 100644 --- a/src/MaaCore/Task/BattleHelper.cpp +++ b/src/MaaCore/Task/BattleHelper.cpp @@ -157,9 +157,6 @@ bool asst::BattleHelper::update_deployment(bool init) // 把环去掉 avatar_analyzer.set_mask_range(0, 50, true); } - else { - avatar_analyzer.set_mask_range(0, 0); - } avatar_analyzer.set_image(oper.avatar); double max_socre = 0; diff --git a/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp index 9562c5aeaa..dcc0a4cc15 100644 --- a/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp @@ -107,6 +107,15 @@ bool asst::BattleProcessTask::to_group() } m_oper_in_group.merge(ungrouped); + for (const auto& [group_name, oper_name] : m_oper_in_group) { + auto& this_group = m_combat_data.groups[group_name]; + auto iter = ranges::find_if(this_group, [&](const auto& oper) { return oper.name == oper_name; }); + if (iter == this_group.end()) { + continue; + } + m_skill_usage.emplace(oper_name, iter->skill_usage); + } + return true; }