From 9c3813a8e778728fe10d35db57763ec52c83bd37 Mon Sep 17 00:00:00 2001 From: "firedcto@gmail.com" Date: Mon, 22 Jul 2024 16:03:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=A1=E5=8D=A1=E7=BD=97?= =?UTF-8?q?=E5=85=A5=E5=9C=BA=E6=8A=80=E8=B7=B3=E5=87=BA=E6=88=98=E6=96=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/char/Calcharo.py | 7 ++++++- src/task/BaseCombatTask.py | 8 -------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/char/Calcharo.py b/src/char/Calcharo.py index 8c4c26a..e1d66c3 100644 --- a/src/char/Calcharo.py +++ b/src/char/Calcharo.py @@ -2,4 +2,9 @@ from src.char.BaseChar import BaseChar class Calcharo(BaseChar): - pass + def do_perform(self): + if self.has_intro: + self.sleep(1) + self.task.wait_in_team_and_world(time_out=3, raise_if_not_found=False) + self.check_combat() + super().do_perform() diff --git a/src/task/BaseCombatTask.py b/src/task/BaseCombatTask.py index 5ce09ff..b01a72f 100644 --- a/src/task/BaseCombatTask.py +++ b/src/task/BaseCombatTask.py @@ -12,7 +12,6 @@ from ok.task.TaskExecutor import CannotFindException from ok.util.list import safe_get from src.char import BaseChar from src.char.BaseChar import Priority -from src.char.Calcharo import Calcharo from src.char.CharFactory import get_char_by_pos from src.combat.CombatCheck import CombatCheck @@ -132,13 +131,6 @@ class BaseCombatTask(BaseTask, FindFeature, OCR, CombatCheck): if not in_team: if self.debug: self.screenshot(f'not in team while switching chars_{current_char}_to_{switch_to} {now - start}') - if isinstance(switch_to, Calcharo) and has_intro: # Calcharo - result = self.wait_in_team_and_world(time_out=4) - if not result: - self.raise_not_in_combat( - f'Calcharo intro animation wait failed not in team while switching chars_{current_char}_to_{switch_to}') - else: - in_team, current_index, size = result confirm = self.wait_feature('revive_confirm', threshold=0.8, time_out=3) if confirm: self.log_info(f'char dead')