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

Fix: Handle AUTO_SEARCH_REWARD in zone_init()

Browse Source
This commit is contained in:
LmeSzinc
2023-04-09 00:12:54 +08:00
parent b352fb5928
commit 942f8f54cf
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module/os/map_operation.py
View File

@@ -177,6 +177,9 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle
if self.handle_map_event(): if self.handle_map_event():
timeout.reset() timeout.reset()
continue continue
# A game bug that AUTO_SEARCH_REWARD from the last cleared zone popups
if self.appear_then_click(AUTO_SEARCH_REWARD, offset=(50, 50), interval=3):
continue
# EXCHANGE_CHECK popups after monthly reset # EXCHANGE_CHECK popups after monthly reset
if self.is_in_globe(): if self.is_in_globe():
self.os_globe_goto_map() self.os_globe_goto_map()

7
module/os_handler/enemy_searching.py
View File

@@ -3,7 +3,7 @@ from module.handler.enemy_searching import \
EnemySearchingHandler as EnemySearchingHandler_ EnemySearchingHandler as EnemySearchingHandler_
from module.logger import logger from module.logger import logger
from module.os.assets import MAP_GOTO_GLOBE_FOG from module.os.assets import MAP_GOTO_GLOBE_FOG
from module.os_handler.assets import IN_MAP, ORDER_ENTER from module.os_handler.assets import AUTO_SEARCH_REWARD, IN_MAP, ORDER_ENTER
class EnemySearchingHandler(EnemySearchingHandler_): class EnemySearchingHandler(EnemySearchingHandler_):
@@ -27,8 +27,13 @@ class EnemySearchingHandler(EnemySearchingHandler_):
else: else:
self.device.screenshot() self.device.screenshot()
# End
if timeout.reached(): if timeout.reached():
logger.warning('wait_os_map_buttons timeout, assume waited') logger.warning('wait_os_map_buttons timeout, assume waited')
break break
if self.appear(ORDER_ENTER, offset=(20, 20)): if self.appear(ORDER_ENTER, offset=(20, 20)):
break break
# A game bug that AUTO_SEARCH_REWARD from the last cleared zone popups
if self.appear_then_click(AUTO_SEARCH_REWARD, offset=(50, 50), interval=3):
continue