sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-04 23:14:51 +08:00
Code Activity

Fix: OpSi auto search interrupted by retirement

Browse Source
This commit is contained in:
LmeSzinc
2022-04-26 00:21:22 +08:00
parent 516e2d1f7e
commit 7558b12b91
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/os/map.py
View File

@@ -210,7 +210,7 @@ class OSMap(OSFleet, Map, GlobeCamera):
save=self.config.DropRecord_SaveOpsi, save=self.config.DropRecord_SaveOpsi,
upload=self.config.DropRecord_UploadOpsi upload=self.config.DropRecord_UploadOpsi
) as drop: ) as drop:
for _ in range(3): for _ in range(5):
backup = self.config.temporary(Campaign_UseAutoSearch=True) backup = self.config.temporary(Campaign_UseAutoSearch=True)
try: try:
self.os_auto_search_daemon(drop=drop) self.os_auto_search_daemon(drop=drop)

10
module/os_handler/map_event.py
View File

@@ -224,8 +224,14 @@ class MapEventHandler(EnemySearchingHandler):
raise CampaignEnd raise CampaignEnd
if self.appear(AUTO_SEARCH_REWARD, offset=(50, 50)): if self.appear(AUTO_SEARCH_REWARD, offset=(50, 50)):
self.device.screenshot_interval_set() self.device.screenshot_interval_set()
self.os_auto_search_quit(drop=drop) if self.info_bar_count():
raise CampaignEnd # No more items on current map
self.os_auto_search_quit(drop=drop)
raise CampaignEnd
else:
# Auto search stopped but map hasn't been cleared
self.os_auto_search_quit(drop=drop)
return True
if enable: if enable:
if self.appear(AUTO_SEARCH_OS_MAP_OPTION_OFF, offset=(5, 120), interval=3) \ 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): and AUTO_SEARCH_OS_MAP_OPTION_OFF.match_appear_on(self.device.image):