From 95c1128c73fe57d7e2409839df89cb3a44727fd8 Mon Sep 17 00:00:00 2001 From: sui-feng-cb <2518179942@qq.com> Date: Sat, 14 Feb 2026 12:25:33 +0800 Subject: [PATCH] Revert "Fix: use cnocr for CHANGWU_OCR_REMAIN_*" This reverts commit 5fceeddcb1520b569a53c6411f2265d08de2d090. --- module/raid/raid.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/module/raid/raid.py b/module/raid/raid.py index fc41cfe4d..0fae95337 100644 --- a/module/raid/raid.py +++ b/module/raid/raid.py @@ -165,7 +165,7 @@ def raid_ocr(raid, mode): if mode == 'ex': return Digit(button, letter=(255, 239, 215), threshold=128) else: - return DigitCounter(button, lang='cnocr', letter=(154, 148, 133), threshold=128) + return DigitCounter(button, letter=(154, 148, 133), threshold=128) def pt_ocr(raid): @@ -206,7 +206,12 @@ class Raid(MapOperation, RaidCombat, CampaignEvent): Game devs are too asshole to drop oil display for UI design https://github.com/LmeSzinc/AzurLaneAutoScript/issues/5214 """ - return False + if self.config.Campaign_Event in [ + 'raid_20240328', + 'raid_20260212', + ]: + return False + return True def check_oil(self): limit = max(500, self.config.StopCondition_OilLimit)