From cfc34faf4b5e8fcf8aa5ce4b3fa6e9a15fe13ea8 Mon Sep 17 00:00:00 2001 From: "firedcto@gmail.com" Date: Fri, 15 Nov 2024 09:30:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8B=BE=E5=8F=96,=20?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=88=98=E6=96=97,=20=E8=B7=B3=E5=89=A7?= =?UTF-8?q?=E6=83=85=E6=94=AF=E6=8C=81=E8=82=89=E9=B8=BD=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/task/BaseCombatTask.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/task/BaseCombatTask.py b/src/task/BaseCombatTask.py index df89925..f8cc087 100644 --- a/src/task/BaseCombatTask.py +++ b/src/task/BaseCombatTask.py @@ -49,17 +49,19 @@ class BaseCombatTask(CombatCheck, FindFeature, OCR): self.char_texts = ['char_1_text', 'char_2_text', 'char_3_text'] - def send_key_and_wait_animation(self, key, check_function, total_wait=10, animation_wait=5): + def send_key_and_wait_animation(self, key, check_function, total_wait=7, enter_animation_wait=0.7): start = time.time() animation_start = 0 - while time.time() - start < total_wait and ( - animation_start == 0 or time.time() - animation_start < animation_wait): + while time.time() - start < total_wait: if check_function(): if animation_start > 0: self._in_liberation = False logger.debug(f'animation ended') return else: + if time.time() - start > enter_animation_wait: + logger.info(f'send_key_and_wait_animation failed to enter animation') + return logger.debug(f'animation not started send key {key}') self.send_key(key, after_sleep=0.1) else: