Просмотр исходного кода

Merge nearaura dev through bb6f2103 for exploration ticket OCR

Runhey returned Repository not found. Integrate ac712acc..bb6f2103
(one commit). Narrow the chapter-panel realm raid ticket OCR crop and
click area to (923,16,74,25), synchronizing the rule and resource JSON
to exclude the extra leading digit.

This crop correction was absent locally. Normal merge adopts the whole
patch and retains local chapter scrolling, chest handling, world/scene
transitions and prior realm raid counting fixes. No PNG changes.

Validation: 583 tests passed across tests/ and both FrogBoss suites,
with three existing deprecation warnings. Verified Python syntax,
two production imports, JSON/rule agreement, and the real OCR crop
method on synthetic pixels at the excluded and included boundaries.
git diff --check passed. No emulator or real screenshot OCR run.
unknown 45 минут назад
Родитель
Сommit
aa2307d365
2 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      tasks/Exploration/assets.py
  2. 2 2
      tasks/Exploration/res/ocr.json

+ 1 - 1
tasks/Exploration/assets.py

@@ -154,7 +154,7 @@ class ExplorationAssets:
 	# 探索右上角 突破卷的数量 
 	# 探索右上角 突破卷的数量 
 	O_REALM_RAID_NUMBER = RuleOcr(roi=(739,11,78,37), area=(739,11,78,37), mode="DigitCounter", method="Default", keyword="", name="realm_raid_number")
 	O_REALM_RAID_NUMBER = RuleOcr(roi=(739,11,78,37), area=(739,11,78,37), mode="DigitCounter", method="Default", keyword="", name="realm_raid_number")
 	# (点出困难28时候)探索右上角 突破卷的数量 
 	# (点出困难28时候)探索右上角 突破卷的数量 
-	O_REALM_RAID_NUMBER1 = RuleOcr(roi=(920,12,78,30), area=(919,12,80,30), mode="DigitCounter", method="Default", keyword="", name="realm_raid_number1")
+	O_REALM_RAID_NUMBER1 = RuleOcr(roi=(923,16,74,25), area=(923,16,74,25), mode="DigitCounter", method="Default", keyword="", name="realm_raid_number1")
 
 
 
 
 	# Swipe Rule Assets
 	# Swipe Rule Assets

+ 2 - 2
tasks/Exploration/res/ocr.json

@@ -28,8 +28,8 @@
   },
   },
   {
   {
     "itemName": "realm_raid_number1",
     "itemName": "realm_raid_number1",
-    "roiFront": "920,12,78,30",
-    "roiBack": "919,12,80,30",
+    "roiFront": "923,16,74,25",
+    "roiBack": "923,16,74,25",
     "mode": "DigitCounter",
     "mode": "DigitCounter",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",