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

Fix: [CN][JP] Handle bugged AUTO_SEARCH_OS_MAP_OPTION_OFF button

Browse Source 
- TODO: [EN][TW] Update AUTO_SEARCH_OS_MAP_OPTION_OFF_DISABLED
This commit is contained in:
LmeSzinc
2024-03-21 18:35:48 +08:00
parent c59bddfc7e
commit ceca042afc
5 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
module/os_handler/map_event.py
View File

@@ -213,6 +213,7 @@ class MapEventHandler(EnemySearchingHandler):
AUTO_SEARCH_REWARD,
AUTO_SEARCH_OS_MAP_OPTION_ON,
AUTO_SEARCH_OS_MAP_OPTION_OFF,
AUTO_SEARCH_OS_MAP_OPTION_OFF_DISABLED,
])
confirm_timer.reset()
continue
@@ -244,11 +245,17 @@ class MapEventHandler(EnemySearchingHandler):
bool: If clicked.
"""
if self.appear(AUTO_SEARCH_OS_MAP_OPTION_OFF, offset=(5, 120)) \
and AUTO_SEARCH_OS_MAP_OPTION_OFF.match_appear_on(self.device.image) \
and self.info_bar_count() >= 2:
self.device.screenshot_interval_set()
self.os_auto_search_quit(drop=drop)
raise CampaignEnd
and AUTO_SEARCH_OS_MAP_OPTION_OFF.match_appear_on(self.device.image):
if self.info_bar_count() >= 2:
self.device.screenshot_interval_set()
self.os_auto_search_quit(drop=drop)
raise CampaignEnd
if self.appear(AUTO_SEARCH_OS_MAP_OPTION_OFF_DISABLED, offset=(5, 120)) \
and AUTO_SEARCH_OS_MAP_OPTION_OFF_DISABLED.match_appear_on(self.device.image):
if self.info_bar_count() >= 2:
self.device.screenshot_interval_set()
self.os_auto_search_quit(drop=drop)
raise CampaignEnd
if self.appear(AUTO_SEARCH_REWARD, offset=(50, 50)):
self.device.screenshot_interval_set()
if self.os_auto_search_quit(drop=drop):
@@ -265,6 +272,11 @@ class MapEventHandler(EnemySearchingHandler):
and AUTO_SEARCH_OS_MAP_OPTION_OFF.match_appear_on(self.device.image):
self.device.click(AUTO_SEARCH_OS_MAP_OPTION_OFF)
return True
# Game client bugged sometimes, AUTO_SEARCH_OS_MAP_OPTION_OFF grayed out but still functional
if self.appear(AUTO_SEARCH_OS_MAP_OPTION_OFF_DISABLED, offset=(5, 120), interval=3) \
and AUTO_SEARCH_OS_MAP_OPTION_OFF_DISABLED.match_appear_on(self.device.image):
self.device.click(AUTO_SEARCH_OS_MAP_OPTION_OFF_DISABLED)
return True
else:
if self.appear(AUTO_SEARCH_OS_MAP_OPTION_ON, offset=(5, 120), interval=3) \
and AUTO_SEARCH_OS_MAP_OPTION_ON.match_appear_on(self.device.image):