mirror of
https://github.com/sui-feng-cb/AzurLaneAutoScript1.git
synced 2026-07-30 23:32:28 +08:00
Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript
This commit is contained in:
@@ -64,7 +64,11 @@ class Coalition(CoalitionCombat, CampaignEvent):
|
||||
elif event == 'coalition_20260122':
|
||||
ocr = Digit(FASHION_PT_OCR, name='OCR_PT', letter=(41, 40, 40), threshold=128)
|
||||
elif event == 'coalition_20260723':
|
||||
ocr = Digit(HORROR_PT_OCR, name='OCR_PT', lang='cnocr', letter=(228, 230, 237), threshold=256)
|
||||
if self.config.SERVER == 'en':
|
||||
ocr = Digit(HORROR_PT_OCR, name='OCR_PT', lang='cnocr', letter=(228, 230, 237), threshold=256)
|
||||
else:
|
||||
# thin font
|
||||
ocr = Digit(HORROR_PT_OCR, name='OCR_PT', lang='cnocr', letter=(228, 230, 237), threshold=221)
|
||||
else:
|
||||
logger.error(f'ocr object is not defined in event {event}')
|
||||
raise ScriptError
|
||||
@@ -214,7 +218,7 @@ class Coalition(CoalitionCombat, CampaignEvent):
|
||||
|
||||
# UI switches
|
||||
if not self._coalition_has_oil_icon:
|
||||
self.ui_goto(page_campaign_menu)
|
||||
self.ui_ensure(page_campaign_menu)
|
||||
if self.triggered_stop_condition(oil_check=True):
|
||||
break
|
||||
self.device.stuck_record_clear()
|
||||
|
||||
@@ -1517,9 +1517,9 @@
|
||||
"Mode": {
|
||||
"name": "Mode",
|
||||
"help": "SP needs to use event daily SP to run",
|
||||
"easy": "Easy",
|
||||
"normal": "Normal",
|
||||
"hard": "Hard",
|
||||
"easy": "EASY",
|
||||
"normal": "NORMAL",
|
||||
"hard": "HARD",
|
||||
"sp": "SP"
|
||||
},
|
||||
"Fleet": {
|
||||
|
||||
Reference in New Issue
Block a user