mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-13 02:06:59 +08:00
Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript
This commit is contained in:
@@ -84,6 +84,8 @@ def raid_name_shorten(name):
|
||||
return 'CHIENWU'
|
||||
elif name == 'raid_20250327':
|
||||
return 'HOSPITAL'
|
||||
elif name == 'raid_20260212':
|
||||
return 'CHANGWU'
|
||||
else:
|
||||
raise ScriptError(f'Unknown raid name: {name}')
|
||||
|
||||
@@ -159,6 +161,11 @@ def raid_ocr(raid, mode):
|
||||
return Digit(button, letter=(247, 223, 222), threshold=128)
|
||||
else:
|
||||
return DigitCounter(button, letter=(0, 0, 0), threshold=128)
|
||||
elif raid == 'CHANGWU':
|
||||
if mode == 'ex':
|
||||
return Digit(button, letter=(255, 239, 215), threshold=128)
|
||||
else:
|
||||
return DigitCounter(button, lang='cnocr', letter=(154, 148, 133), threshold=128)
|
||||
|
||||
|
||||
def pt_ocr(raid):
|
||||
@@ -190,6 +197,8 @@ def pt_ocr(raid):
|
||||
return Digit(button, letter=(255, 231, 231), threshold=128)
|
||||
elif raid == 'HOSPITAL':
|
||||
return Digit(button, letter=(255, 251, 255), threshold=128)
|
||||
elif raid == 'CHANGWU':
|
||||
return Digit(button, letter=(255, 239, 215), threshold=128)
|
||||
|
||||
|
||||
class Raid(MapOperation, RaidCombat, CampaignEvent):
|
||||
@@ -199,9 +208,7 @@ class Raid(MapOperation, RaidCombat, CampaignEvent):
|
||||
Game devs are too asshole to drop oil display for UI design
|
||||
https://github.com/LmeSzinc/AzurLaneAutoScript/issues/5214
|
||||
"""
|
||||
if self.config.Campaign_Event == 'raid_20240328':
|
||||
return False
|
||||
return True
|
||||
return False
|
||||
|
||||
def check_oil(self):
|
||||
limit = max(500, self.config.StopCondition_OilLimit)
|
||||
|
||||
Reference in New Issue
Block a user