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

fix: 修复自动战斗中待部署区干员匹配标志rect后处理越界

Browse Source
This commit is contained in:
status102
2026-02-26 15:37:38 +08:00
parent 489d94df7c
commit 21aef56331
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resource/tasks/tasks.json
View File

@@ -3816,7 +3816,7 @@
},
"BattleOpersFlag": {
"templThreshold": 0.65,
"roi": [0, 588, 1280, 18],
"roi": [35, 588, 1210, 18],
"maskRange": [1, 255]
},
"BattleAvatarReMatch": {

6
src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp
View File

@@ -103,7 +103,7 @@ std::vector<battle::DeploymentOper> BattlefieldMatcher::deployment_analyze() con
battle::DeploymentOper oper;
oper.rect = flag_res.rect.move(click_move);
Rect role_rect = flag_res.rect.move(role_move);
Rect role_rect = correct_rect(flag_res.rect.move(role_move), m_image);
oper.role = oper_role_analyze(role_rect);
if (oper.role == battle::Role::Unknown) {
Log.warn("Unknown role");
@@ -113,10 +113,10 @@ std::vector<battle::DeploymentOper> BattlefieldMatcher::deployment_analyze() con
if (oper.rect.x + oper.rect.width >= m_image.cols) {
oper.rect.width = m_image.cols - oper.rect.x;
}
Rect avatar_rect = oper.rect.move(avatar_move);
Rect avatar_rect = correct_rect(oper.rect.move(avatar_move), m_image);
oper.avatar = m_image(make_rect<cv::Rect>(avatar_rect));
Rect available_rect = flag_res.rect.move(avlb_move);
Rect available_rect = correct_rect(flag_res.rect.move(avlb_move), m_image);
oper.available = oper_available_analyze(available_rect);
#ifdef ASST_DEBUG