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; }