Przeglądaj źródła

Merge nearaura dev through ac712acc for demon entrance recognition

Runhey returned Repository not found. Integrate f73072c8..ac712acc
(two commits including one merge). Use both upstream entrance PNGs
directly, with their new crop dimensions and matching regions in
assets.py and image_2025.json.

Resolve the right-enter conflicts using the new 32x22 image and rule.
The previous local 46x34 metadata correction applied to the replaced
PNG, so its exact numbers are obsolete. Both new definitions match
their PNGs. All upstream changes are adopted, with other local fixes
retained through the normal merge.

Validation: 583 tests passed across tests/ and both FrogBoss suites,
with three existing deprecation warnings. Verified both PNGs against
upstream bytes, both rule/JSON/dimension sets, twelve synthetic positive,
blank and out-of-region matches with desktop/emulator ROI padding,
Python syntax, two production imports and git diff --check.
No emulator run.
unknown 1 dzień temu
rodzic
commit
a4c0fc6056

+ 2 - 2
tasks/MetaDemon/assets.py

@@ -19,9 +19,9 @@ class MetaDemonAssets:
 
 
 	# Image Rule Assets
 	# Image Rule Assets
 	# 右侧进去 
 	# 右侧进去 
-	I_RIGHT_ENTER = RuleImage(roi_front=(1188,220,46,34), roi_back=(1150,131,100,360), threshold=0.75, method="Template matching", file="./tasks/MetaDemon/md/md_right_enter.png")
+	I_RIGHT_ENTER = RuleImage(roi_front=(1193,229,32,22), roi_back=(1167,131,87,382), threshold=0.75, method="Template matching", file="./tasks/MetaDemon/md/md_right_enter.png")
 	# description 
 	# description 
-	I_ENTER2 = RuleImage(roi_front=(933,150,73,125), roi_back=(893,47,130,259), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_enter2.png")
+	I_ENTER2 = RuleImage(roi_front=(933,150,61,126), roi_back=(893,47,130,259), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_enter2.png")
 	# 寻找鬼王 
 	# 寻找鬼王 
 	I_FIND_DEMON = RuleImage(roi_front=(1140,582,86,81), roi_back=(1102,546,132,133), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_find_demon.png")
 	I_FIND_DEMON = RuleImage(roi_front=(1140,582,86,81), roi_back=(1102,546,132,133), threshold=0.8, method="Template matching", file="./tasks/MetaDemon/md/md_find_demon.png")
 	# 点击战斗 
 	# 点击战斗 

+ 3 - 3
tasks/MetaDemon/md/image_2025.json

@@ -2,8 +2,8 @@
   {
   {
     "itemName": "right_enter",
     "itemName": "right_enter",
     "imageName": "md_right_enter.png",
     "imageName": "md_right_enter.png",
-    "roiFront": "1188,220,46,34",
-    "roiBack": "1150,131,100,360",
+    "roiFront": "1193,229,32,22",
+    "roiBack": "1167,131,87,382",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.75,
     "threshold": 0.75,
     "description": "右侧进去"
     "description": "右侧进去"
@@ -11,7 +11,7 @@
   {
   {
     "itemName": "enter2",
     "itemName": "enter2",
     "imageName": "md_enter2.png",
     "imageName": "md_enter2.png",
-    "roiFront": "933,150,73,125",
+    "roiFront": "933,150,61,126",
     "roiBack": "893,47,130,259",
     "roiBack": "893,47,130,259",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,

BIN
tasks/MetaDemon/md/md_enter2.png


BIN
tasks/MetaDemon/md/md_right_enter.png