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

Opt: Adjusted logic of strategic search (#1986)

Browse Source
This commit is contained in:
SarContDeli
2022-12-11 22:31:19 +08:00
committed by GitHub
parent 704e049675
commit 495915eae7
1 changed files with 4 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
module/os_handler/strategic.py
View File

@@ -1,5 +1,4 @@
from module.base.utils import get_color
from module.exception import GameStuckError
from module.logger import logger
from module.os_handler.assets import *
from module.os_handler.enemy_searching import EnemySearchingHandler
@@ -30,8 +29,6 @@ class StrategicSearchHandler(EnemySearchingHandler):
skip_first_screenshot = False
else:
self.device.screenshot()
if not self.appear(STRATEGIC_SEARCH_POPUP_CHECK, offset=(20, 20)):
return False
if get_color(self.device.image, STRATEGIC_SEARCH_TAB_SECURED.area)[2] <= 150:
self.device.click(STRATEGIC_SEARCH_TAB_SECURED)
@@ -45,8 +42,6 @@ class StrategicSearchHandler(EnemySearchingHandler):
skip_first_screenshot = False
else:
self.device.screenshot()
if not self.appear(STRATEGIC_SEARCH_POPUP_CHECK, offset=(20, 20)):
return False
if self.appear(STRATEGIC_SEARCH_ZONEMODE_RANDOM):
logger.attr('zone_mode', 'random')
@@ -69,8 +64,6 @@ class StrategicSearchHandler(EnemySearchingHandler):
skip_first_screenshot = False
else:
self.device.screenshot()
if not self.appear(STRATEGIC_SEARCH_POPUP_CHECK, offset=(20, 20)):
return False
self.appear(STRATEGIC_SEARCH_DEVICE_CHECK, offset=(20, 200), threshold=0.7)
STRATEGIC_SEARCH_DEVICE_STOP.load_offset(STRATEGIC_SEARCH_DEVICE_CHECK)
@@ -93,8 +86,6 @@ class StrategicSearchHandler(EnemySearchingHandler):
skip_first_screenshot = False
else:
self.device.screenshot()
if not self.appear(STRATEGIC_SEARCH_POPUP_CHECK, offset=(20, 20)):
return False
self.appear(STRATEGIC_SEARCH_SUBMIT_CHECK, offset=(20, 20), threshold=0.7)
STRATEGIC_SEARCH_SUBMIT_OFF.load_offset(STRATEGIC_SEARCH_SUBMIT_CHECK)
@@ -108,8 +99,6 @@ class StrategicSearchHandler(EnemySearchingHandler):
logger.attr('auto_submit', 'on')
break
return True
def strategic_search_confirm(self, skip_first_screenshot=False):
logger.info('Strategic search confirm')
while 1:
@@ -122,12 +111,8 @@ class StrategicSearchHandler(EnemySearchingHandler):
and self.handle_popup_confirm(offset=(30, 30), name='STRATEGIC_SEARCH'):
continue
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):
if self.is_in_map():
return True
if self.appear(AUTO_SEARCH_OS_MAP_OPTION_OFF, offset=(5, 120), interval=3) \
and AUTO_SEARCH_OS_MAP_OPTION_OFF.match_appear_on(self.device.image):
return False
def strategic_search_start(self, skip_first_screenshot=False):
"""
@@ -136,16 +121,6 @@ class StrategicSearchHandler(EnemySearchingHandler):
out: IN_MAP, with strategic search running
"""
logger.hr('Strategic search start')
while 1:
flag = True
flag &= self.strategy_search_enter(skip_first_screenshot=skip_first_screenshot)
flag &= self.strategic_search_set_option(skip_first_screenshot=True)
if flag:
flag = self.strategic_search_confirm(skip_first_screenshot=True)
if flag:
return True
if self.appear(STRATEGIC_SEARCH_POPUP_CHECK, offset=(20, 20)) or self.is_in_map():
skip_first_screenshot = True
else:
raise GameStuckError
self.strategy_search_enter(skip_first_screenshot=skip_first_screenshot)
self.strategic_search_set_option(skip_first_screenshot=True)
self.strategic_search_confirm(skip_first_screenshot=True)