Эх сурвалжийг харах

fix(RichMan): Update OCR resource positions and add new resource

Migs 10 сар өмнө
parent
commit
1524b417d2

+ 11 - 9
tasks/RichMan/assets.py

@@ -198,17 +198,19 @@ class RichManAssets:
 
 	# Ocr Rule Assets
 	# 左数第一个 
-	O_MALL_RESOURCE_1 = RuleOcr(roi=(144,7,100,43), area=(144,7,100,43), mode="Quantity", method="Default", keyword="", name="mall_resource_1")
-	# 左数第二个 
-	O_MALL_RESOURCE_2 = RuleOcr(roi=(326,8,124,39), area=(326,8,124,39), mode="Quantity", method="Default", keyword="", name="mall_resource_2")
-	# 左数第二个 
-	O_MALL_RESOURCE_3 = RuleOcr(roi=(533,9,107,38), area=(533,9,107,38), mode="Quantity", method="Default", keyword="", name="mall_resource_3")
-	# 左数第二个 
-	O_MALL_RESOURCE_4 = RuleOcr(roi=(739,8,100,39), area=(739,8,100,39), mode="Quantity", method="Default", keyword="", name="mall_resource_4")
-	# 左数第二个 
-	O_MALL_RESOURCE_5 = RuleOcr(roi=(935,11,100,37), area=(935,11,100,37), mode="Quantity", method="Default", keyword="", name="mall_resource_5")
+	O_MALL_RESOURCE_1 = RuleOcr(roi=(260,8,100,43), area=(261,8,100,43), mode="Quantity", method="Default", keyword="", name="mall_resource_1")
 	# 左数第二个 
+	O_MALL_RESOURCE_2 = RuleOcr(roi=(415,8,124,39), area=(415,7,124,39), mode="Quantity", method="Default", keyword="", name="mall_resource_2")
+	# 左数第三个 
+	O_MALL_RESOURCE_3 = RuleOcr(roi=(596,10,107,38), area=(597,10,107,38), mode="Quantity", method="Default", keyword="", name="mall_resource_3")
+	# 左数第四个 
+	O_MALL_RESOURCE_4 = RuleOcr(roi=(783,9,100,39), area=(782,8,100,39), mode="Quantity", method="Default", keyword="", name="mall_resource_4")
+	# 左数第五个 
+	O_MALL_RESOURCE_5 = RuleOcr(roi=(958,9,100,37), area=(957,9,100,37), mode="Quantity", method="Default", keyword="", name="mall_resource_5")
+	# 左数第六个 
 	O_MALL_RESOURCE_6 = RuleOcr(roi=(1129,6,100,41), area=(1129,6,100,41), mode="Quantity", method="Default", keyword="", name="mall_resource_6")
+	# 左数第二排第一个 
+	O_MALL_RESOURCE_7 = RuleOcr(roi=(1100,53,150,38), area=(1103,54,146,35), mode="Single", method="Default", keyword="", name="mall_resource_7")
 
 
 	# Click Rule Assets

+ 1 - 1
tasks/RichMan/mall/medal.py

@@ -38,7 +38,7 @@ class Medal(FriendshipPoints):
         # 随机御魂
         if con.random_soul:
             self.buy_mall_one(buy_button=self.I_ME_SOULS, buy_check=self.I_ME_CHECK_SOULS,
-                              money_ocr=self.O_MALL_RESOURCE_5, buy_money=320)
+                              money_ocr=self.O_MALL_RESOURCE_3, buy_money=320)
         # 两颗白蛋
         if con.white_daruma:
             self.buy_mall_more(buy_button=self.I_ME_WHITE, remain_number=True, money_ocr=self.O_MALL_RESOURCE_3,

+ 1 - 0
tasks/RichMan/mall/navbar.py

@@ -104,6 +104,7 @@ class MallNavbar(GameUi, RichManAssets):
             4: self.O_MALL_RESOURCE_4,
             5: self.O_MALL_RESOURCE_5,
             6: self.O_MALL_RESOURCE_6,
+            7: self.O_MALL_RESOURCE_7,
         }
         self.screenshot()
         result = match[index].ocr(self.device.image)

+ 23 - 14
tasks/RichMan/mall/navbar/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "mall_resource_1",
-    "roiFront": "144,7,100,43",
-    "roiBack": "144,7,100,43",
+    "roiFront": "260,8,100,43",
+    "roiBack": "261,8,100,43",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
@@ -10,8 +10,8 @@
   },
   {
     "itemName": "mall_resource_2",
-    "roiFront": "326,8,124,39",
-    "roiBack": "326,8,124,39",
+    "roiFront": "415,8,124,39",
+    "roiBack": "415,7,124,39",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
@@ -19,30 +19,30 @@
   },
   {
     "itemName": "mall_resource_3",
-    "roiFront": "533,9,107,38",
-    "roiBack": "533,9,107,38",
+    "roiFront": "596,10,107,38",
+    "roiBack": "597,10,107,38",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
-    "description": "左数第二个"
+    "description": "左数第三个"
   },
   {
     "itemName": "mall_resource_4",
-    "roiFront": "739,8,100,39",
-    "roiBack": "739,8,100,39",
+    "roiFront": "783,9,100,39",
+    "roiBack": "782,8,100,39",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
-    "description": "左数第二个"
+    "description": "左数第四个"
   },
   {
     "itemName": "mall_resource_5",
-    "roiFront": "935,11,100,37",
-    "roiBack": "935,11,100,37",
+    "roiFront": "958,9,100,37",
+    "roiBack": "957,9,100,37",
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
-    "description": "左数第二个"
+    "description": "左数第五个"
   },
   {
     "itemName": "mall_resource_6",
@@ -51,6 +51,15 @@
     "mode": "Quantity",
     "method": "Default",
     "keyword": "",
-    "description": "左数第二个"
+    "description": "左数第六个"
+  },
+  {
+    "itemName": "mall_resource_7",
+    "roiFront": "1100,53,150,38",
+    "roiBack": "1103,54,146,35",
+    "mode": "Quantity",
+    "method": "Default",
+    "keyword": "",
+    "description": "左数第二排第一个"
   }
 ]