From e3a21d50ba219ed150d6edcf28fa357d5e5d76e8 Mon Sep 17 00:00:00 2001
From: status102 <102887808+status102@users.noreply.github.com>
Date: Fri, 14 Feb 2025 12:32:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E5=8A=A8=E6=88=98=E6=96=97?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=8A=80=E8=83=BDkeep=5Fwaiting=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E4=B8=8B=E5=9C=A8=E7=A6=BB=E5=BC=80=E6=88=98=E6=96=97?=
 =?UTF-8?q?=E3=80=81=E4=B8=AD=E6=AD=A2=E4=BB=BB=E5=8A=A1=E6=97=B6=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E4=B8=AD=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaCore/Task/BattleHelper.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/MaaCore/Task/BattleHelper.cpp b/src/MaaCore/Task/BattleHelper.cpp
index 87022987d8..35e34740ba 100644
--- a/src/MaaCore/Task/BattleHelper.cpp
+++ b/src/MaaCore/Task/BattleHelper.cpp
@@ -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 });