sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://github.com/sui-feng-cb/AzurLaneAutoScript1.git synced 2026-07-30 15:26:10 +08:00
Code Activity

Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

Browse Source
This commit is contained in:
sui-feng-cb
2026-07-30 05:44:07 +08:00
parent 4f60aecd58 82e195c3a9
commit c8e8ac6fec
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/coalition/coalition.py
View File

@@ -64,7 +64,11 @@ class Coalition(CoalitionCombat, CampaignEvent):
elif event == 'coalition_20260122': elif event == 'coalition_20260122':
ocr = Digit(FASHION_PT_OCR, name='OCR_PT', letter=(41, 40, 40), threshold=128) ocr = Digit(FASHION_PT_OCR, name='OCR_PT', letter=(41, 40, 40), threshold=128)
elif event == 'coalition_20260723': 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: else:
logger.error(f'ocr object is not defined in event {event}') logger.error(f'ocr object is not defined in event {event}')
raise ScriptError raise ScriptError
@@ -214,7 +218,7 @@ class Coalition(CoalitionCombat, CampaignEvent):
# UI switches # UI switches
if not self._coalition_has_oil_icon: 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): if self.triggered_stop_condition(oil_check=True):
break break
self.device.stuck_record_clear() self.device.stuck_record_clear()

6
module/config/i18n/en-US.json
View File

@@ -1517,9 +1517,9 @@
"Mode": { "Mode": {
"name": "Mode", "name": "Mode",
"help": "SP needs to use event daily SP to run", "help": "SP needs to use event daily SP to run",
"easy": "Easy", "easy": "EASY",
"normal": "Normal", "normal": "NORMAL",
"hard": "Hard", "hard": "HARD",
"sp": "SP" "sp": "SP"
}, },
"Fleet": { "Fleet": {