From 69f4f6a836f3a41b99f2aa72f64915a57b662b81 Mon Sep 17 00:00:00 2001 From: "firedcto@gmail.com" Date: Tue, 1 Oct 2024 19:26:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=B7=E4=B8=96=E7=95=8Cbo?= =?UTF-8?q?ss=E5=A3=B0=E9=AA=B8=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/task/DiscardEchoTask.py | 12 ++++-------- src/task/FarmWorldBossTask.py | 1 - 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/task/DiscardEchoTask.py b/src/task/DiscardEchoTask.py index cbd02d1..5fd8367 100644 --- a/src/task/DiscardEchoTask.py +++ b/src/task/DiscardEchoTask.py @@ -77,6 +77,7 @@ class DiscardEchoTask(BaseCombatTask): self.set_names.append(f'set_name_{i}') def run(self): + return self.scroll_down_a_page() self.check_main() row = 0 col = 0 @@ -134,18 +135,13 @@ class DiscardEchoTask(BaseCombatTask): def scroll_down_a_page(self): set_icon = self.find_best_match_in_box(self.box_of_screen(0.36, 0.67, 0.39, 0.86), self.set_names, 0.3) - # last_box.x -= self.height_of_screen(0.04) - # last_box.width += self.width_of_screen(0.03) - # last_box.y -= self.height_of_screen(0.05) - # last_box.height += self.width_of_screen(0.04) source_template = Feature(set_icon.crop_frame(self.frame), set_icon.x, set_icon.y) steps = 0.08 target_box = set_icon.copy(y_offset=-self.height_of_screen(steps), height_offset=self.height_of_screen(steps)) + self.click_relative(0.5, 0.5, after_sleep=1) while True: - self.click_relative(0.5, 0.5) - self.sleep(0.05) - self.scroll_relative(0.5, 0.5, -2) - self.sleep(0.2) + self.scroll_relative(0.5, 0.5, -1) + self.sleep(0.5) target = self.find_one('target_box', box=target_box, template=source_template, threshold=0.9) if not target: self.sleep(1) diff --git a/src/task/FarmWorldBossTask.py b/src/task/FarmWorldBossTask.py index b43534c..29717f1 100644 --- a/src/task/FarmWorldBossTask.py +++ b/src/task/FarmWorldBossTask.py @@ -67,7 +67,6 @@ class FarmWorldBossTask(BaseCombatTask): def run(self): self.set_check_monthly_card() self.check_main() - self.handler.post(self.mouse_reset, 0.01) count = 0 while True: for i in range(1, 4):