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

Fix: Handle exchange shop popup after OpSi reset

Browse Source
This commit is contained in:
LmeSzinc
2022-07-02 16:37:53 +08:00
parent c58e7a8359
commit 0f48589c98
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
module/os/map_operation.py
View File

@@ -7,11 +7,12 @@ from module.ocr.ocr import Ocr
from module.os.assets import * from module.os.assets import *
from module.os.globe_zone import Zone from module.os.globe_zone import Zone
from module.os.map_fleet_selector import OSFleetSelector from module.os.map_fleet_selector import OSFleetSelector
from module.os_handler.assets import AUTO_SEARCH_REWARD from module.os_handler.assets import AUTO_SEARCH_REWARD, EXCHANGE_CHECK
from module.os_handler.map_order import MapOrderHandler from module.os_handler.map_order import MapOrderHandler
from module.os_handler.mission import MissionHandler from module.os_handler.mission import MissionHandler
from module.os_handler.port import PortHandler from module.os_handler.port import PortHandler
from module.os_handler.storage import StorageHandler from module.os_handler.storage import StorageHandler
from module.ui.assets import BACK_ARROW
class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandler, OSFleetSelector): class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandler, OSFleetSelector):
@@ -157,10 +158,6 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle
if timeout.reached(): if timeout.reached():
logger.warning('Zone init timeout') logger.warning('Zone init timeout')
break break
if self.handle_map_event():
timeout.reset()
continue
if self.is_in_map(): if self.is_in_map():
try: try:
return self.get_current_zone() return self.get_current_zone()
@@ -169,6 +166,20 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle
else: else:
timeout.reset() timeout.reset()
# Handle popups
if self.handle_map_event():
timeout.reset()
continue
# EXCHANGE_CHECK popups after monthly reset
if self.is_in_globe():
self.os_globe_goto_map()
timeout.reset()
continue
if self.appear(EXCHANGE_CHECK, offset=(30, 30), interval=3):
self.device.click(BACK_ARROW)
timeout.reset()
continue
logger.warning('Unable to get zone name, get current zone from globe map instead') logger.warning('Unable to get zone name, get current zone from globe map instead')
if hasattr(self, 'get_current_zone_from_globe'): if hasattr(self, 'get_current_zone_from_globe'):
return self.get_current_zone_from_globe() return self.get_current_zone_from_globe()