mirrors/ok-wuthering-waves
0
0
Fork 0
mirror of https://github.com/ok-oldking/ok-wuthering-waves.git synced 2025-06-07 09:25:34 +00:00
Code

fix boss scrolling, change to click to scroll

Browse Source
This commit is contained in:
firedcto@gmail.com 2024-07-13 18:34:54 +08:00
parent 0874e40721
commit 661dcda8e7
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/char/Encore.py
View File

@ -68,7 +68,7 @@ class Encore(BaseChar):
elif self.still_in_liberation() or self.can_resonance_step2():
self.logger.info(
f'switch priority MIN because still in liberation')
return Priority.MAX
return Priority.MAX + 1
else:
return super().do_get_switch_priority(current_char, has_intro)

16
src/task/FarmWorldBossTask.py
View File

@ -74,9 +74,12 @@ class FarmWorldBossTask(BaseCombatTask):
# self.wait_click_feature('gray_book_forgery', raise_if_not_found=True, use_gray_scale=True, threshold=0.7)
# self.wait_click_feature('gray_book_boss', raise_if_not_found=True, use_gray_scale=True, threshold=0.7)
self.sleep(1)
while index > 4: # first page
self.log_info(f'index {index} greater than 4, swipe')
self.scroll_down_a_page()
# while index > 4: # first page
if index > 4:
self.log_info(f'click scroll bar')
self.click_relative(3760 / 3840, 1852 / 2160)
self.sleep(0.5)
# self.scroll_down_a_page()
index -= 4
# y = y + (index - 1) * distance
self.log_info(f'index after scrolling down {index}')
@ -91,8 +94,11 @@ class FarmWorldBossTask(BaseCombatTask):
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(1.5))
self.sleep(1)
self.wait_click_feature('custom_teleport', box=self.box_of_screen(0.48, 0.45, 0.54, 0.58),
raise_if_not_found=True, threshold=0.8, time_out=2)
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)
if not teleport:
self.click_relative(0.5, 0.5)
self.sleep(0.5)
self.wait_click_feature('gray_custom_way_point', box=self.box_of_screen(0.62, 0.48, 0.70, 0.66),
raise_if_not_found=True,
use_gray_scale=True, threshold=0.75, time_out=2)