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

fix: 修复部署战斗中部署区识别错误

Browse Source 
fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4197
This commit is contained in:
MistEO
2023-04-09 19:02:48 +08:00
parent 8ecddf7f0b
commit 2cbe1088d7
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resource/tasks.json
View File

@@ -6420,7 +6420,7 @@
]
},
"BattleOpersFlag": {
"templThreshold": 0.8,
"templThreshold": 0.65,
"roi": [
0,
588,
@@ -6499,7 +6499,7 @@
},
"BattleOperRole": {
"template": "empty.png",
"templThreshold": 0.6
"templThreshold": 0.65
},
"BattleOperRoleCaster": {},
"BattleOperRoleMedic": {},

3
src/MaaCore/Task/Experiment/CombatRecordRecognitionTask.cpp
View File

@@ -714,6 +714,9 @@ bool asst::CombatRecordRecognitionTask::process_changes(ClipInfo& clip, ClipInfo
continue;
}
std::string name = deployed_iter == deployed.end() ? pre_clip_ptr->ends_oper_name : *(deployed_iter++);
if (name.empty()) {
name = "Unknown_EndsEmpty";
}
static const std::unordered_map<battle::DeployDirection, std::string> DirectionNames = {
{ battle::DeployDirection::Right, "Right" }, { battle::DeployDirection::Down, "Down" },

22
src/MaaCore/Vision/Battle/BattleImageAnalyzer.cpp
View File

@@ -124,20 +124,17 @@ bool asst::BattleImageAnalyzer::opers_analyze()
MultiMatchImageAnalyzer flags_analyzer(m_image);
const auto& flag_task_ptr = Task.get("BattleOpersFlag");
flags_analyzer.set_task_info(flag_task_ptr);
#ifndef ASST_DEBUG
flags_analyzer.set_log_tracing(false);
#endif
// if (m_target & Target::OperSeleted) {
// // 更大的范围，能把被点击的升起来的干员也识别出来
// // 但是可能造成误识别
// flags_analyzer.set_roi(flag_task_ptr->rect_move);
// }
if (!flags_analyzer.analyze()) {
return false;
}
flags_analyzer.sort_result_horizontal();
const auto& flags = flags_analyzer.get_result();
auto flags = flags_analyzer.get_result();
if (flags.empty()) {
return false;
}
const auto click_move = Task.get("BattleOperClickRange")->rect_move;
const auto role_move = Task.get("BattleOperRoleRange")->rect_move;
@@ -151,6 +148,14 @@ bool asst::BattleImageAnalyzer::opers_analyze()
for (const MatchRect& flag_mrect : flags) {
battle::DeploymentOper oper;
oper.rect = flag_mrect.rect.move(click_move);
Rect role_rect = flag_mrect.rect.move(role_move);
oper.role = oper_role_analyze(role_rect);
if (oper.role == battle::Role::Unknown) {
Log.warn("Unknown role");
continue;
}
if (oper.rect.x + oper.rect.width >= m_image.cols) {
oper.rect.width = m_image.cols - oper.rect.x;
}
@@ -181,9 +186,6 @@ bool asst::BattleImageAnalyzer::opers_analyze()
Log.error("oper is available, but with cooling");
}
Rect role_rect = flag_mrect.rect.move(role_move);
oper.role = oper_role_analyze(role_rect);
// 干员费用识别的不太准，暂时也没用上，先注释掉，TODO：优化费用识别
// Rect cost_rect = flag_mrect.rect.move(cost_move);
// oper.cost = oper_cost_analyze(cost_rect);