diff --git a/config.py b/config.py index a2241a2..a6f3d67 100644 --- a/config.py +++ b/config.py @@ -52,7 +52,7 @@ def calculate_pc_exe_path(running_path):
GitHub https://github.com/ok-oldking/ok-wuthering-waves>
-QQ Group:970523295
+QQ群:970523295
""", 'supported_screen_ratio': '16:9', 'screenshots_folder': "screenshots", diff --git a/src/task/FarmWorldBossTask.py b/src/task/FarmWorldBossTask.py index 50d7fd8..d728f2f 100644 --- a/src/task/FarmWorldBossTask.py +++ b/src/task/FarmWorldBossTask.py @@ -53,7 +53,7 @@ def teleport(self, boss_name): self.log_info(f'click {gray_book_boss}') self.click_box(gray_book_boss) self.sleep(1.5) - + if index >= (len(self.boss_names) - self.weekly_boss_count - 1): # weekly turtle logger.info('click weekly boss') index = self.weekly_boss_index[boss_name] @@ -82,7 +82,7 @@ def teleport(self, boss_name): # self.click_relative(self.crownless_pos[0], self.crownless_pos[1]) # self.wait_click_feature('gray_teleport', raise_if_not_found=True, use_gray_scale=True) self.wait_feature('gray_teleport', raise_if_not_found=True, use_gray_scale=True, time_out=120, - pre_action=lambda: self.click_box(proceeds[index], relative_x=-1) and self.sleep(3)) + pre_action=lambda: self.click_box(proceeds[index], relative_x=-1), wait_until_before_delay=5) self.sleep(1) teleport = self.wait_click_feature('custom_teleport', box=self.box_of_screen(0.48, 0.45, 0.54, 0.58), raise_if_not_found=False, threshold=0.8, time_out=2)