1
0
mirror of https://github.com/sui-feng-cb/AzurLaneAutoScript1.git synced 2026-07-30 23:32:28 +08:00

Merge pull request #5848 from LmeSzinc/dev

Bug fix
This commit is contained in:
LmeSzinc
2026-07-28 16:12:08 +08:00
committed by GitHub
4 changed files with 18 additions and 14 deletions

View File

@@ -61,7 +61,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
@@ -192,7 +196,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()

View File

@@ -1356,10 +1356,10 @@
"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": {
"name": "Fleet", "name": "Fleet",

View File

@@ -1356,10 +1356,10 @@
"Mode": { "Mode": {
"name": "难度", "name": "难度",
"help": "SP图需要使用活动每日SP运行", "help": "SP图需要使用活动每日SP运行",
"easy": "easy", "easy": "简单",
"normal": "normal", "normal": "普通",
"hard": "hard", "hard": "困难",
"sp": "sp" "sp": "SP"
}, },
"Fleet": { "Fleet": {
"name": "出击队伍", "name": "出击队伍",

View File

@@ -1356,10 +1356,10 @@
"Mode": { "Mode": {
"name": "難度", "name": "難度",
"help": "SP圖需要使用活動每日SP運行", "help": "SP圖需要使用活動每日SP運行",
"easy": "easy", "easy": "簡單",
"normal": "normal", "normal": "普通",
"hard": "hard", "hard": "困難",
"sp": "sp" "sp": "SP"
}, },
"Fleet": { "Fleet": {
"name": "出擊隊伍", "name": "出擊隊伍",