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

Fix: ensure management page after each option run

Browse Source
This commit is contained in:
sui-feng-cb
2025-10-13 03:38:43 +08:00
parent 2426c6895c
commit 6c92aeb92d
3 changed files with 69 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
module/island/ui.py
View File

@@ -1,6 +1,6 @@
from datetime import timedelta
from module.base.timer import Timer
from module.island.assets import *
from module.logger import logger
from module.ocr.ocr import Duration
from module.ui.assets import SHOP_BACK_ARROW
from module.ui.page import page_island_phone
@@ -36,6 +36,7 @@ class IslandUI(UI):
in: page_island_phone
out: ISLAND_MANAGEMENT_CHECK
"""
logger.info('Island management enter')
self.interval_clear(ISLAND_MANAGEMENT_CHECK)
self.ui_click(
click_button=ISLAND_MANAGEMENT,
@@ -51,6 +52,7 @@ class IslandUI(UI):
in: ISLAND_MANAGEMENT_CHECK
out: page_island_phone
"""
logger.info('Island management quit')
self.ui_click(
click_button=SHOP_BACK_ARROW,
check_button=page_island_phone.check_button,
@@ -63,6 +65,7 @@ class IslandUI(UI):
"""
Execute quit product page
"""
logger.info('Island product quit')
self.interval_clear(ISLAND_MANAGEMENT_CHECK)
self.ui_click(
click_button=SHOP_BACK_ARROW,
@@ -71,3 +74,31 @@ class IslandUI(UI):
retry_wait=2,
skip_first_screenshot=True
)
def ui_ensure_management_page(self, skip_first_screenshot=True):
"""
Pages:
in: page_island_phone or product page
out: ISLAND_MANAGEMENT_CHECK
"""
logger.info('UI ensure management page')
self.interval_clear(ISLAND_MANAGEMENT_CHECK)
confirm_timer = Timer(1, count=2).start()
while 1:
if skip_first_screenshot:
skip_first_screenshot = False
else:
self.device.screenshot()
if self.island_in_management():
if confirm_timer.reached():
break
continue
else:
confirm_timer.reset()
if self.appear_then_click(SHOP_BACK_ARROW, offset=(20, 20), interval=2):
continue
if self.appear_then_click(ISLAND_MANAGEMENT, offset=(20, 20), interval=2):
continue