From 6487c713d88ba613c9b47644d39fc386494bb742 Mon Sep 17 00:00:00 2001 From: "firedcto@gmail.com" Date: Tue, 23 Jul 2024 21:21:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=95=BF=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/char/Changli.py | 4 +--- src/char/Encore.py | 6 +----- src/task/AutoPickTask.py | 4 ++-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/char/Changli.py b/src/char/Changli.py index 6275a3e..925f30b 100644 --- a/src/char/Changli.py +++ b/src/char/Changli.py @@ -23,9 +23,7 @@ def do_get_switch_priority(self, current_char: BaseChar, has_intro=False): def do_perform(self): if self.has_intro or self.enhanced_normal: - self.sleep(0.05) - self.normal_attack() - self.sleep(0.5) + self.continues_normal_attack(0.5) self.enhanced_normal = False if self.is_forte_full(): self.logger.debug('Changli click heavy attack without ult') diff --git a/src/char/Encore.py b/src/char/Encore.py index 6d2eedf..75102d4 100644 --- a/src/char/Encore.py +++ b/src/char/Encore.py @@ -17,7 +17,7 @@ def still_in_liberation(self): def do_perform(self): target_low_con = False if self.has_intro: - self.sleep(0.7) + self.continues_normal_attack(.7) self.wait_down() elif self.can_resonance_step2(4): if self.click_resonance()[0]: @@ -29,10 +29,6 @@ def do_perform(self): self.logger.info(f'try Encore resonance_step2 wait_success:{wait_success}') if self.still_in_liberation(): - # if time.time() - self.liberation_time > 7.5 and self.is_forte_full(): - # self.heavy_attack() - # self.last_heavy = time.time() - # else: target_low_con = True self.n4() elif self.click_resonance()[0]: diff --git a/src/task/AutoPickTask.py b/src/task/AutoPickTask.py index 408ed1d..00a941e 100644 --- a/src/task/AutoPickTask.py +++ b/src/task/AutoPickTask.py @@ -24,8 +24,8 @@ def trigger(self): f_search_box = self.get_box_by_name('pick_up_f') f_search_box = f_search_box.copy(x_offset=-f_search_box.width / 2, width_offset=f_search_box.width, - height_offset=f_search_box.height * 4, - y_offset=-f_search_box.height / 2, + height_offset=f_search_box.height * 9, + y_offset=-f_search_box.height * 5, name='search_dialog') if f := self.find_one('pick_up_f', box=f_search_box, threshold=0.8):