sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-30 09:43:51 +08:00
Code Activity

Merge branch 'master' into map_overview

Browse Source
This commit is contained in:
LmeSzinc
2021-04-13 19:48:49 +08:00
committed by GitHub
parent c2268a5b0b 498681f616
commit 9b7a8c1997
3 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/cn/os/MAP_OVERVIEW.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 21 KiB

15
module/os_ash/ash.py
View File

@@ -78,7 +78,16 @@ class OSAsh(UI):
return self.appear(IN_MAP, offset=(200, 5)) return self.appear(IN_MAP, offset=(200, 5))
def _ash_beacon_enter_from_map(self, offset=(200, 5), skip_first_screenshot=True): def _ash_beacon_enter_from_map(self, offset=(200, 5), skip_first_screenshot=True):
confirm_timer = Timer(1.5, count=3).start() """
Args:
offset:
skip_first_screenshot:
Pages:
in: IN_MAP
out: is_in_ash
"""
confirm_timer = Timer(1, count=2).start()
while 1: while 1:
if skip_first_screenshot: if skip_first_screenshot:
skip_first_screenshot = False skip_first_screenshot = False
@@ -88,10 +97,12 @@ class OSAsh(UI):
if self.appear_then_click(MAP_OVERVIEW, offset=offset, interval=3): if self.appear_then_click(MAP_OVERVIEW, offset=offset, interval=3):
confirm_timer.reset() confirm_timer.reset()
continue continue
if self.appear_then_click(ASH_ENTRANCE, offset=offset, interval=3): if self.appear_then_click(ASH_ENTRANCE, offset=offset, interval=3):
confirm_timer.reset() confirm_timer.reset()
continue continue
if self._handle_ash_beacon_reward():
confirm_timer.reset()
continue
# End # End
if self.is_in_ash(): if self.is_in_ash():