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

Fix: [EN] campaign name ocr

Browse Source
This commit is contained in:
LmeSzinc
2020-05-27 21:29:32 +08:00
parent 56992b1d7f
commit e885665181
2 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module/campaign/campaign_ui.py
View File

@@ -10,9 +10,7 @@ from module.exception import CampaignNameError
STAGE_SHOWN_WAIT = (1, 1.2)
class CampaignUI(UI):
campaign_ocr = CampaignOcr()
class CampaignUI(UI, CampaignOcr):
def campaign_ensure_chapter(self, index):
"""
Args:
@@ -21,7 +19,7 @@ class CampaignUI(UI):
index = ensure_chapter_index(index)
# A tricky way to use ui_ensure_index.
self.ui_ensure_index(index, letter=self.campaign_ocr.get_chapter_index,
self.ui_ensure_index(index, letter=self.get_chapter_index,
prev_button=CHAPTER_PREV, next_button=CHAPTER_NEXT,
fast=True, skip_first_screenshot=True, step_sleep=STAGE_SHOWN_WAIT, finish_sleep=0)
@@ -65,10 +63,10 @@ class CampaignUI(UI):
Returns:
Button:
"""
if name not in self.campaign_ocr.stage:
if name not in self.stage_entrance:
logger.warning(f'Stage not found: {name}')
raise CampaignNameError
return self.campaign_ocr.stage[name]
return self.stage_entrance[name]
def ensure_campaign_ui(self, name, mode='normal'):
"""