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

fix: 自动战斗使用技能keep_waiting情况下在离开战斗、中止任务时无法中断

Browse Source
This commit is contained in:
status102
2025-02-14 12:32:50 +08:00
parent 6cf98066ac
commit e3a21d50ba
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -788,8 +788,16 @@ bool asst::BattleHelper::click_skill(bool keep_waiting)
}
cv::Mat top_view;
cv::Mat image;
for (int retry = 0; retry < (keep_waiting ? 1000 : 5); ++retry) {
top_view = get_top_view(m_inst_helper.ctrler()->get_image(), true);
if (m_inst_helper.need_exit()) {
return false;
}
image = m_inst_helper.ctrler()->get_image();
if (keep_waiting && retry > 0 && (retry % 10 == 0) && !check_in_battle(image)) {
return false;
}
top_view = get_top_view(image, true);
Matcher skill_analyzer { top_view };
skill_analyzer.set_task_info("BattleSkillReadyOnClick-TopView");
skill_analyzer.set_roi({ 250, 250, 250, 250 });