sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-25 19:25:01 +08:00
Code Activity

Fix: Handle SOS chapters not fully unlocked

Browse Source
This commit is contained in:
LmeSzinc
2022-04-04 13:31:32 +08:00
parent 32c7184bb7
commit f23c95c06d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module/sos/sos.py
View File

@@ -66,6 +66,8 @@ class CampaignSos(CampaignRun, CampaignBase):
chapter_buttons = [button.crop(self._sos_chapter_crop) for button in all_buttons] chapter_buttons = [button.crop(self._sos_chapter_crop) for button in all_buttons]
ocr_chapters = Digit(chapter_buttons, letter=[132, 230, 115], threshold=136, name='OCR_SOS_CHAPTER') ocr_chapters = Digit(chapter_buttons, letter=[132, 230, 115], threshold=136, name='OCR_SOS_CHAPTER')
chapter_list = ocr_chapters.ocr(self.device.image) chapter_list = ocr_chapters.ocr(self.device.image)
if not isinstance(chapter_list, list):
chapter_list = [chapter_list]
if chapter in chapter_list: if chapter in chapter_list:
logger.info('Target SOS chapter found') logger.info('Target SOS chapter found')
return all_buttons[chapter_list.index(chapter)] return all_buttons[chapter_list.index(chapter)]
@@ -137,7 +139,10 @@ class CampaignSos(CampaignRun, CampaignBase):
positions = [0.0, 0.5, 1.0] positions = [0.0, 0.5, 1.0]
for scroll_position in positions: for scroll_position in positions:
self._sos_scroll.set(scroll_position, main=self) if self._sos_scroll.appear(main=self):
self._sos_scroll.set(scroll_position, main=self)
else:
logger.info('SOS signal scroll not appear, skip setting scroll position')
target_button = self._find_target_chapter(chapter) target_button = self._find_target_chapter(chapter)
if target_button is not None: if target_button is not None:
self._sos_signal_confirm(entrance=target_button) self._sos_signal_confirm(entrance=target_button)