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

fix: 先取消暂停再取消选择 (#12369)

Browse Source 
* fix: 先取消暂停再取消选择

* fix: 换个思路

* fix: 重新识别头像位置

* fix: 删除多余的判断

* fix: 保险起见加回来点东西

* fix: 第二遍点击后更新 name_image
This commit is contained in:
Weiyou Wang
2025-04-16 22:51:55 +10:00
committed by GitHub
parent b05a136f81
commit 341f5b4acd
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -197,16 +197,26 @@ bool asst::BattleHelper::update_deployment_(
// 这时候即使名字不合法也只能凑合用了，但是为空还是不行的
if (name.empty()) {
Log.error("name is empty");
continue;
}
set_oper_name(oper, name);
remove_cooling_from_battlefield(oper);
else {
set_oper_name(oper, name);
remove_cooling_from_battlefield(oper);
m_cur_deployment_opers[oper.index] = oper;
AvatarCache.set_avatar(name, oper.role, oper.avatar);
}
if (!unknown_opers.empty()) {
cancel_oper_selection();
m_cur_deployment_opers[oper.index] = oper;
AvatarCache.set_avatar(name, oper.role, oper.avatar);
}
// 再点一下部署栏头像取消选择
// 注意，点完部署区的干员之后，他的头像会放大；干员的位置都被挤开了，不在原来的位置了
// 所以要重新识别一下位置
Matcher re_matcher(name_image);
re_matcher.set_task_info("BattleAvatarReMatch");
re_matcher.set_templ(oper.avatar);
if (re_matcher.analyze()) {
oper_rect = re_matcher.get_result().rect;
}
click_oper_on_deployment(oper_rect);
name_image = m_inst_helper.ctrler()->get_image();
}
}