From d02398a6573ba094ee4f5576ef869827a64a8d11 Mon Sep 17 00:00:00 2001 From: "firedcto@gmail.com" Date: Mon, 29 Jul 2024 11:01:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=9B=E6=88=98=E6=96=97?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=20=E6=B7=BB=E5=8A=A0=E5=BC=80=E5=A7=8B/?= =?UTF-8?q?=E6=9A=82=E5=81=9C=E5=BF=AB=E6=8D=B7=E9=94=AEF9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/combat/CombatCheck.py | 3 --- src/task/BaseCombatTask.py | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/combat/CombatCheck.py b/src/combat/CombatCheck.py index 4361262..82e7154 100644 --- a/src/combat/CombatCheck.py +++ b/src/combat/CombatCheck.py @@ -167,9 +167,6 @@ class CombatCheck: in_combat = self.in_team()[0] and self.check_health_bar() if in_combat: self.target_enemy(wait=False) - else: - in_combat = self.target_enemy() - if in_combat: if self.boss_lv_template is None: self.find_boss_lv_text() logger.info( diff --git a/src/task/BaseCombatTask.py b/src/task/BaseCombatTask.py index 9c143cb..ad30e1a 100644 --- a/src/task/BaseCombatTask.py +++ b/src/task/BaseCombatTask.py @@ -69,7 +69,8 @@ class BaseCombatTask(BaseWWTask, FindFeature, OCR, CombatCheck): raise e except NotInCombatException as e: logger.info(f'combat_once out of combat break {e}') - self.screenshot(f'combat_once out of combat break {self.out_of_combat_reason}') + if self.debug: + self.screenshot(f'combat_once out of combat break {self.out_of_combat_reason}') break self.wait_in_team_and_world(time_out=10) self.sleep(1)