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

Upd: wait for current ship loading in equipmentcode page

Browse Source
This commit is contained in:
sui-feng-cb
2024-10-22 18:23:38 +08:00
parent 8e5f2c678e
commit 5b3312faa4
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
module/campaign/gems_farming.py
View File

@@ -112,7 +112,7 @@ class GemsEquipmentHandler(EquipmentCodeHandler):
key="GemsFarming.GemsFarming.EquipmentCode", key="GemsFarming.GemsFarming.EquipmentCode",
ships=['DD', 'bogue', 'hermes', 'langley', 'ranger']) ships=['DD', 'bogue', 'hermes', 'langley', 'ranger'])
def current_ship(self): def current_ship(self, skip_first_screenshot=True):
""" """
Reuse templates in module.retire.assets, Reuse templates in module.retire.assets,
which needs different rescaling to match each current flagship. which needs different rescaling to match each current flagship.
@@ -120,6 +120,18 @@ class GemsEquipmentHandler(EquipmentCodeHandler):
Pages: Pages:
in: gear_code in: gear_code
""" """
while 1:
if skip_first_screenshot:
skip_first_screenshot = False
else:
self.device.screenshot()
# End
if not self.appear(EMPTY_SHIP_R):
break
else:
logger.info('Waiting ship icon loading.')
if TEMPLATE_BOGUE.match(self.device.image, scaling=1.46): # image has rotation if TEMPLATE_BOGUE.match(self.device.image, scaling=1.46): # image has rotation
return 'bogue' return 'bogue'
if TEMPLATE_HERMES.match(self.device.image, scaling=124/89): if TEMPLATE_HERMES.match(self.device.image, scaling=124/89):