From 7b6de7745ddb2d6cd6fd78ea8867afa594cab054 Mon Sep 17 00:00:00 2001 From: "firedcto@gmail.com" Date: Sat, 14 Sep 2024 13:33:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B9=A1=E9=87=8C=E8=A6=81,?= =?UTF-8?q?=20=E4=BB=8A=E6=B1=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/char/Baizhi.py | 4 ---- src/char/Jinhsi.py | 6 +++--- src/char/Xiangliyao.py | 4 +++- src/char/Yuanwu.py | 5 ++--- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/char/Baizhi.py b/src/char/Baizhi.py index 27f2a11..320b0bd 100644 --- a/src/char/Baizhi.py +++ b/src/char/Baizhi.py @@ -15,10 +15,6 @@ class Baizhi(BaseChar): self.continues_normal_attack(1.2, click_resonance_if_ready_and_return=True) self.click_liberation(con_less_than=1) self.click_resonance() - if not self.is_con_full(): - self.logger.debug('continues_normal_attack') - self.continues_normal_attack(1.1 - self.time_elapsed_accounting_for_freeze(self.last_perform), - until_con_full=True) if self.get_current_con() > 0.65: self.click_echo() self.switch_next_char() diff --git a/src/char/Jinhsi.py b/src/char/Jinhsi.py index dc812dd..3f30a23 100644 --- a/src/char/Jinhsi.py +++ b/src/char/Jinhsi.py @@ -20,8 +20,6 @@ class Jinhsi(BaseChar): elif self.has_intro or self.incarnation_cd: self.handle_intro() return self.switch_next_char() - if self.time_elapsed_accounting_for_freeze(self.task.combat_start) < 5 or self.last_fly_e_time == 0: - self.click_liberation() self.click_echo() return self.switch_next_char() @@ -40,8 +38,10 @@ class Jinhsi(BaseChar): self.logger.info( f'switch priority max because has_intro {has_intro} incarnation {self.incarnation} incarnation_cd {self.incarnation_cd}') return Priority.MAX - else: + elif self.echo_available(): return super().do_get_switch_priority(current_char, has_intro) + else: + return Priority.MIN def count_base_priority(self): return -3 diff --git a/src/char/Xiangliyao.py b/src/char/Xiangliyao.py index d2c5a83..45fc588 100644 --- a/src/char/Xiangliyao.py +++ b/src/char/Xiangliyao.py @@ -13,7 +13,9 @@ class Xiangliyao(BaseChar): if self.click_liberation(): self.liberation_time = time.time() if self.still_in_liberation(): - while not self.click_resonance(send_click=True)[0]: + current_resonance = self.current_resonance() + while current_resonance != 0 and not self.has_cd('resonance') and not self.click_resonance(send_click=True)[ + 0]: self.continues_normal_attack(1) elif self.echo_available(): self.logger.debug('click_echo') diff --git a/src/char/Yuanwu.py b/src/char/Yuanwu.py index df7d167..269e7c9 100644 --- a/src/char/Yuanwu.py +++ b/src/char/Yuanwu.py @@ -17,10 +17,9 @@ class Yuanwu(BaseChar): return self.switch_next_char() if self.has_intro: self.continues_normal_attack(1.2) - if self.is_forte_full(): - self.send_resonance_key(down_time=0.7, post_sleep=0.2) return self.switch_next_char() - self.continues_normal_attack(1.1 - self.time_elapsed_accounting_for_freeze(self.last_perform), + self.click_resonance() + self.continues_normal_attack(1 - self.time_elapsed_accounting_for_freeze(self.last_perform), until_con_full=True) if self.get_current_con() > 0.65: self.click_echo()