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

Fix: CampaignNameError in _sos_is_appear_at_chapter()

Browse Source
This commit is contained in:
LmeSzinc
2020-12-11 21:17:52 +08:00
parent f099666539
commit 1f6948d121
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
campaign/campaign_sos/campaign_base.py
View File

@@ -17,6 +17,9 @@ class CampaignBase(CampaignBase_):
Returns: Returns:
Button: Button:
""" """
if '-5' not in name:
return super().campaign_get_entrance(name)
sim, point = TEMPLATE_STAGE_SOS.match_result(self.device.image) sim, point = TEMPLATE_STAGE_SOS.match_result(self.device.image)
if sim < 0.85: if sim < 0.85:
raise CampaignNameError raise CampaignNameError

4
module/sos/sos.py
View File

@@ -106,9 +106,7 @@ class CampaignSos(CampaignRun, CampaignBase):
in: page_campaign in: page_campaign
out: page_campaign, may in different chapter. out: page_campaign, may in different chapter.
""" """
self.campaign_ensure_mode(mode='normal') self.ensure_campaign_ui(name=f'{chapter}-4', mode='normal')
self.campaign_ensure_chapter(chapter)
self.device.sleep(STAGE_SHOWN_WAIT)
confirm_timer = Timer(1.5, count=3).start() confirm_timer = Timer(1.5, count=3).start()
while 1: while 1: