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

Fix: Use normal asset instead of template

Browse Source
This commit is contained in:
nEEtdo0d
2021-04-09 10:46:42 -04:00
parent 8571c0e8f9
commit 244dbcefe1
11 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/os_ash/ash.py
View File

@@ -4,8 +4,8 @@ from module.combat.combat import Combat, BATTLE_PREPARATION, GET_ITEMS_1
from module.logger import logger
from module.ocr.ocr import Digit, DigitCounter
from module.os_ash.assets import *
from module.os.assets import MAP_OVERVIEW
from module.os_handler.assets import IN_MAP
from module.template.assets import TEMPLATE_OS_Overview
from module.ui.assets import BACK_ARROW
from module.ui.page import page_os
from module.ui.switch import Switch
@@ -89,18 +89,13 @@ class OSAsh(UI):
def _ash_beacon_enter_from_map(self, offset=(200, 5), skip_first_screenshot=True):
confirm_timer = Timer(1.5, count=3).start()
in_map_interval = Timer(3, count=1)
while 1:
if skip_first_screenshot:
skip_first_screenshot = False
else:
self.device.screenshot()
if self.is_in_map() and in_map_interval.reached():
entrance = self.get_overview_entrance()
if entrance is not None:
self.device.click(entrance)
in_map_interval.reset()
if self.appear_then_click(MAP_OVERVIEW, offset=offset, interval=3):
confirm_timer.reset()
continue