fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 17:57:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf: 缓存待部署区识别，减少CPU占用 (#8275)

Browse Source 
perf: 优化待部署区识别，减少CPU占用
This commit is contained in:
status102
2024-02-08 15:57:23 +08:00
committed by GitHub
parent 40292de864 aef2fc0d14
commit de9fdccde1
1 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/MaaCore/Task/BattleHelper.cpp
View File

@@ -111,7 +111,9 @@ bool asst::BattleHelper::update_deployment(bool init, const cv::Mat& reusable)
check_in_battle(image);
return false;
}
m_cur_deployment_opers.clear();
auto old_deployment_opers = std::move(m_cur_deployment_opers);
m_cur_deployment_opers = std::vector<battle::DeploymentOper>();
m_cur_deployment_opers.reserve(oper_result_opt->deployment.size());
// 从场上干员和已占用格子中移除冷却中的干员
auto remove_cooling_from_battlefield = [&](const DeploymentOper& oper) {
@@ -153,18 +155,37 @@ bool asst::BattleHelper::update_deployment(bool init, const cv::Mat& reusable)
avatar_analyzer.set_threshold(oper.role == Role::Drone ? drone_threshold : threshold);
}
auto& avatar_cache = AvatarCache.get_avatars(oper.role);
for (const auto& [name, avatar] : avatar_cache) {
avatar_analyzer.append_templ(name, avatar);
bool is_analyzed = false;
if (!init) {
for (const auto& old_oper :
old_deployment_opers | views::filter([&](const battle::DeploymentOper& temp_oper) {
return temp_oper.role == oper.role;
})) {
avatar_analyzer.append_templ(old_oper.name, old_oper.avatar);
}
if (avatar_analyzer.analyze()) {
set_oper_name(oper, avatar_analyzer.get_result().templ_info.name);
remove_cooling_from_battlefield(oper);
is_analyzed = true;
}
}
if (avatar_analyzer.analyze()) {
set_oper_name(oper, avatar_analyzer.get_result().templ_info.name);
remove_cooling_from_battlefield(oper);
}
else {
Log.info("unknown oper", oper.index);
unknown_opers.emplace_back(oper);
if (!is_analyzed) {
// 之前的干员都没匹配上，那就把所有的干员都加进去
// 可能的优化: 移除之前添加的模板
auto& avatar_cache = AvatarCache.get_avatars(oper.role);
for (const auto& [name, avatar] : avatar_cache) {
avatar_analyzer.append_templ(name, avatar);
}
if (avatar_analyzer.analyze()) {
set_oper_name(oper, avatar_analyzer.get_result().templ_info.name);
remove_cooling_from_battlefield(oper);
}
else {
Log.info("unknown oper", oper.index);
unknown_opers.emplace_back(oper);
}
}
m_cur_deployment_opers.emplace_back(oper);
if (oper.cooling) {