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

Fix: Retry selecting auto search options if it's not loaded that fast

Browse Source
This commit is contained in:
LmeSzinc
2021-10-14 21:56:57 +08:00
parent e3b9761043
commit 21c25ebf3e
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
module/handler/auto_search.py
View File

@@ -103,7 +103,7 @@ class AutoSearchHandler(EnemySearchingHandler):
setting (str):
Returns:
bool: If clicked
bool: If selected to the correct option.
"""
active = None
for index, button in enumerate(AUTO_SEARCH_SETTINGS):
@@ -112,18 +112,19 @@ class AutoSearchHandler(EnemySearchingHandler):
if active is None:
logger.warning('No active auto search setting found')
active = 0
return False
logger.attr('Auto_Search_Setting', dic_setting_index_to_name[active])
if setting not in dic_setting_name_to_index:
logger.warning(f'Unknown auto search setting: {setting}')
target_index = dic_setting_name_to_index[setting]
if active == target_index:
logger.info('Selected to the correct auto search setting')
return True
else:
self.device.click(AUTO_SEARCH_SETTINGS[target_index])
return False
self.device.click(AUTO_SEARCH_SETTINGS[target_index])
return True
def auto_search_setting_ensure(self, setting, skip_first_screenshot=True):
"""
Args:
@@ -144,14 +145,14 @@ class AutoSearchHandler(EnemySearchingHandler):
self.device.screenshot()
if self._auto_search_set_click(setting):
if counter >= 2:
return True
else:
if counter >= 5:
logger.warning('Auto search setting could not be ensured')
return False
counter += 1
self.device.sleep((0.3, 0.5))
continue
else:
return True
_auto_search_offset = (5, 5)
_auto_search_menu_offset = (200, 20)