fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-18 02:10:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 自动战斗开始时移除召唤物类头像缓存，以避免跨局错误识别相似技能的召唤物 (#9649)

Browse Source 
* fix: 自动战斗开始时移除召唤物类头像缓存，以避免跨局错误识别相似技能的召唤物

* chore: description
This commit is contained in:
status102
2024-07-13 22:53:04 +08:00
committed by GitHub
parent f16a1e8707
commit 1be6265bbb
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/MaaCore/Config/Miscellaneous/AvatarCacheManager.cpp
View File

@@ -44,6 +44,11 @@ const asst::AvatarCacheManager::AvatarsMap& asst::AvatarCacheManager::get_avatar
return m_avatars[role];
}
void asst::AvatarCacheManager::remove_avatars(battle::Role role)
{
m_avatars.erase(role);
}
void asst::AvatarCacheManager::set_avatar(const std::string& name, battle::Role role, const cv::Mat& avatar,
bool overlay)
{

1
src/MaaCore/Config/Miscellaneous/AvatarCacheManager.h
View File

@@ -25,6 +25,7 @@ namespace asst
virtual bool load(const std::filesystem::path& path) override;
const AvatarsMap& get_avatars(battle::Role role);
void remove_avatars(battle::Role role);
void set_avatar(const std::string& name, battle::Role role, const cv::Mat& avatar, bool overlay = true);
private:

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

@@ -99,6 +99,7 @@ bool asst::BattleHelper::update_deployment(bool init, const cv::Mat& reusable)
LogTraceFunction;
if (init) {
AvatarCache.remove_avatars(Role::Drone);// 移除小龙等不同技能很像的召唤物，防止错误识别
wait_until_start(false);
}
@@ -153,7 +154,7 @@ bool asst::BattleHelper::update_deployment(bool init, const cv::Mat& reusable)
BestMatcher avatar_analyzer(oper.avatar);
if (oper.cooling) {
Log.trace("start matching cooling", oper.index);
static const double cooling_threshold =
static const auto cooling_threshold =
Task.get<MatchTaskInfo>("BattleAvatarCoolingData")->templ_thresholds.front();
static const auto cooling_mask_range =
Task.get<MatchTaskInfo>("BattleAvatarCoolingData")->mask_range;
@@ -162,9 +163,9 @@ bool asst::BattleHelper::update_deployment(bool init, const cv::Mat& reusable)
.set_mask_range(cooling_mask_range.first, cooling_mask_range.second, true, true);
}
else {
static const double threshold =
static const auto threshold =
Task.get<MatchTaskInfo>("BattleAvatarData")->templ_thresholds.front();
static const double drone_threshold =
static const auto drone_threshold =
Task.get<MatchTaskInfo>("BattleDroneAvatarData")->templ_thresholds.front();
avatar_analyzer.set_threshold(oper.role == Role::Drone ? drone_threshold : threshold);
}