From f19df0c85a06c5a0a650a591f7275fa5d2087cbe Mon Sep 17 00:00:00 2001 From: "firedcto@gmail.com" Date: Sun, 28 Jul 2024 23:24:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/combat/CombatCheck.py | 2 +- src/task/BaseCombatTask.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/combat/CombatCheck.py b/src/combat/CombatCheck.py index df562e9..4361262 100644 --- a/src/combat/CombatCheck.py +++ b/src/combat/CombatCheck.py @@ -170,7 +170,7 @@ class CombatCheck: else: in_combat = self.target_enemy() if in_combat: - if not self.boss_lv_template: + if self.boss_lv_template is None: self.find_boss_lv_text() logger.info( f'enter combat cost {(time.time() - start):2f} boss_lv_template:{self.boss_lv_template is not None} boss_health_box:{self.boss_health_box} has_count_down:{self.has_count_down}') diff --git a/src/task/BaseCombatTask.py b/src/task/BaseCombatTask.py index fa7426a..5b1f3e7 100644 --- a/src/task/BaseCombatTask.py +++ b/src/task/BaseCombatTask.py @@ -57,8 +57,8 @@ class BaseCombatTask(BaseWWTask, FindFeature, OCR, CombatCheck): def combat_once(self, wait_combat_time=180, wait_before=3): self.wait_until(lambda: self.in_combat(), time_out=wait_combat_time, raise_if_not_found=True) - self.sleep(wait_before) - self.wait_until(lambda: self.in_combat(), time_out=10, raise_if_not_found=True) + # self.sleep(wait_before) + # self.wait_until(lambda: self.in_combat(), time_out=10, raise_if_not_found=True) self.load_chars() self.info['Combat Count'] = self.info.get('Combat Count', 0) + 1 while self.in_combat():