sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-22 15:13:45 +08:00
Code Activity

Upd: transport commission detect retry

Browse Source
This commit is contained in:
sui-feng-cb
2025-10-19 01:24:02 +08:00
parent 1c1ea82b31
commit ce8d029ef0
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
module/island/transport.py
View File

@@ -19,6 +19,8 @@ class IslandTransport:
index: int index: int
# If success to parse transport commission # If success to parse transport commission
valid: bool valid: bool
# If the commission is locked
locked: bool
# Duration to run this transport commission # Duration to run this transport commission
duration: timedelta duration: timedelta
# Status of transport commission # Status of transport commission
@@ -40,6 +42,7 @@ class IslandTransport:
self.blacklist = blacklist self.blacklist = blacklist
self.image = main.device.image self.image = main.device.image
self.valid = True self.valid = True
self.locked = False
self.duration = None self.duration = None
self.start = True self.start = True
self.refresh = False self.refresh = False
@@ -57,7 +60,7 @@ class IslandTransport:
# commission locked # commission locked
lock_offset = area_offset(offset, (0, delta * (self.index - 1))) lock_offset = area_offset(offset, (0, delta * (self.index - 1)))
if self.index >= 1 and main.appear(TRANSPORT_LOCKED, lock_offset): if self.index >= 1 and main.appear(TRANSPORT_LOCKED, lock_offset):
self.valid = False self.locked = True
return return
self.status = self.get_transport_status(main) self.status = self.get_transport_status(main)
@@ -141,6 +144,8 @@ class IslandTransport:
def __str__(self): def __str__(self):
if not self.valid: if not self.valid:
return f'Index: {self.index} (Invalid)' return f'Index: {self.index} (Invalid)'
if self.locked:
return f'Index: {self.index} (Locked)'
info = {'Index': self.index, 'Status': self.status} info = {'Index': self.index, 'Status': self.status}
if self.duration: if self.duration:
info['Duration'] = self.duration info['Duration'] = self.duration
@@ -257,8 +262,11 @@ class IslandTransportRun(IslandUI):
self.device.screenshot() self.device.screenshot()
commissions = self._transport_detect() commissions = self._transport_detect()
if commissions.count >= 2 and commissions.select(valid=False).count == 1: if not commissions.count:
logger.warning('Found 1 invalid commission, retry commission detect') logger.warning('No commission detected, retry commission detect')
continue
elif commissions.select(valid=False).count:
logger.warning('Found 1 invalid commission at least, retry commission detect')
continue continue
else: else:
return commissions.select(valid=True) return commissions.select(valid=True)
@@ -409,7 +417,7 @@ class IslandTransportRun(IslandUI):
logger.hr('Island Transport Run', level=1) logger.hr('Island Transport Run', level=1)
future_finish = [] future_finish = []
self.transport_receive() self.transport_receive()
commissions = self.transport_detect(trial=2) commissions = self.transport_detect(trial=5)
comm_refresh = commissions.select(status='pending', refresh=True) comm_refresh = commissions.select(status='pending', refresh=True)
comm_choose = commissions.select(status='pending', start=True) comm_choose = commissions.select(status='pending', start=True)