Explorar el Código

fix(ActivityShikigami): Improve activity battle result handling
- switch activity stamina and pass counters to digit OCR mode
- handle multi-digit all-zero OCR results as a valid remaining count
- continue reward processing after closing accidental item detail popups

neptine hace 2 meses
padre
commit
9e0e0ae151

+ 6 - 0
module/ocr/sub_ocr.py

@@ -110,6 +110,12 @@ class Digit(Single):
         result = [char for char in result if char.isdigit()]
         result = ''.join(result)
 
+        # 如果结果全部是 '0' 且长度 >= 2,视为 OCR 错误(例如 900 → 00),强制设为 "1"
+        if result and all(ch == '0' for ch in result) and len(result) >= 2:
+            logger.warning(f'OCR [{self.name} {result}] all-zero with length>=2, force set to "1"')
+            result = '1'
+
+
         prev = result
         result = int(result) if result else 0
         if str(result) != prev:

+ 2 - 2
tasks/ActivityShikigami/assets.py

@@ -94,9 +94,9 @@ class ActivityShikigamiAssets:
 	# 挑战 
 	O_FIRE = RuleOcr(roi=(1135,599,85,49), area=(1123,570,106,100), mode="Single", method="Default", keyword="挑战", name="fire")
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(584,17,63,27), area=(583,16,63,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(584,17,63,27), area=(583,16,63,30), mode="Digit", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
-	O_REMAIN_PASS = RuleOcr(roi=(791,18,50,29), area=(791,18,49,28), mode="DigitCounter", method="Default", keyword="", name="remain_pass")
+	O_REMAIN_PASS = RuleOcr(roi=(791,18,50,29), area=(791,18,49,28), mode="Digit", method="Default", keyword="", name="remain_pass")
 	# 还有多少次购买体力的机会 
 	O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
 	# 活动票数(没有百分比) 

+ 2 - 2
tasks/ActivityShikigami/fire/ocr.json

@@ -12,7 +12,7 @@
     "itemName": "remain_ap",
     "roiFront": "584,17,63,27",
     "roiBack": "583,16,63,30",
-    "mode": "DigitCounter",
+    "mode": "Digit",
     "method": "Default",
     "keyword": "",
     "description": "体力的数量检测"
@@ -21,7 +21,7 @@
     "itemName": "remain_pass",
     "roiFront": "791,18,50,29",
     "roiBack": "791,18,49,28",
-    "mode": "DigitCounter",
+    "mode": "Digit",
     "method": "Default",
     "keyword": "",
     "description": "活动体力的剩余检测"

+ 1 - 0
tasks/Component/GeneralBattle/battle_wait.py

@@ -522,6 +522,7 @@ class BattleWait(BaseTask, GeneralBattleAssets):
             # 不小心点到了具体的奖励,他会弹出这个物品的详细描述 里面必定包含有“获取途径”
             if self.appear(self.I_END_FIX_1) or self.appear(self.I_END_FIX_2):
                 self.click(self.C_REWARD_2, interval=1.5)
+                continue
 
             if self.appear(self.I_UI_REWARD):
                 if random.random() < 0.02: