Forráskód Böngészése

feat(RichMan): Update images

huangrunheng 2 éve
szülő
commit
e6d95af4b3

+ 11 - 11
tasks/RichMan/assets.py

@@ -171,25 +171,25 @@ class RichManAssets:
 
 	# Image Rule Assets
 	# 特殊 
-	I_SIDE_SURE_SPECIAL = RuleImage(roi_front=(1172,91,70,74), roi_back=(1172,91,70,74), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_special.png")
+	I_SIDE_SURE_SPECIAL = RuleImage(roi_front=(1172,91,70,74), roi_back=(1172,91,70,74), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_special.png")
 	# 特殊 
-	I_SIDE_CHECK_SPECIAL = RuleImage(roi_front=(102,7,42,42), roi_back=(102,7,42,42), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_special.png")
+	I_SIDE_CHECK_SPECIAL = RuleImage(roi_front=(102,7,42,42), roi_back=(102,7,42,42), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_special.png")
 	# 荣誉 
-	I_SIDE_SUER_HONOR = RuleImage(roi_front=(1171,185,72,74), roi_back=(1171,185,72,74), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_suer_honor.png")
+	I_SIDE_SUER_HONOR = RuleImage(roi_front=(1180,191,59,60), roi_back=(1150,159,103,132), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_suer_honor.png")
 	# 荣誉 
-	I_SIDE_CHECK_HONOR = RuleImage(roi_front=(694,12,41,42), roi_back=(694,12,41,42), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_honor.png")
+	I_SIDE_CHECK_HONOR = RuleImage(roi_front=(694,12,41,42), roi_back=(694,12,41,42), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_honor.png")
 	# 友情点 
-	I_SIDE_SURE_FRIENDS = RuleImage(roi_front=(1174,279,68,70), roi_back=(1174,279,68,70), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_friends.png")
+	I_SIDE_SURE_FRIENDS = RuleImage(roi_front=(1174,277,68,70), roi_back=(1163,258,93,109), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_friends.png")
 	# 友情点 
-	I_SIDE_CHECK_FRIENDS = RuleImage(roi_front=(890,8,39,43), roi_back=(890,8,39,43), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_friends.png")
+	I_SIDE_CHECK_FRIENDS = RuleImage(roi_front=(890,8,39,43), roi_back=(890,8,39,43), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_friends.png")
 	# 勋章 
-	I_SIDE_SURE_MEDAL = RuleImage(roi_front=(1175,370,72,73), roi_back=(1175,370,72,73), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_medal.png")
+	I_SIDE_SURE_MEDAL = RuleImage(roi_front=(1190,375,39,62), roi_back=(1156,352,99,113), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_medal.png")
 	# 勋章 
-	I_SIDE_CHECK_MEDAL = RuleImage(roi_front=(889,11,40,44), roi_back=(889,11,40,44), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_medal.png")
+	I_SIDE_CHECK_MEDAL = RuleImage(roi_front=(889,11,40,44), roi_back=(889,11,40,44), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_medal.png")
 	# 魅力值 
-	I_SIDE_SURE_CHARISMA = RuleImage(roi_front=(1175,464,72,74), roi_back=(1175,464,72,74), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_charisma.png")
+	I_SIDE_SURE_CHARISMA = RuleImage(roi_front=(1181,467,59,58), roi_back=(1158,445,101,106), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_charisma.png")
 	# 魅力值 
-	I_SIDE_CHECK_CHARISMA = RuleImage(roi_front=(886,4,48,46), roi_back=(886,4,48,46), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_charisma.png")
+	I_SIDE_CHECK_CHARISMA = RuleImage(roi_front=(886,4,48,46), roi_back=(886,4,48,46), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_charisma.png")
 
 
 	# Ocr Rule Assets
@@ -284,7 +284,7 @@ class RichManAssets:
 	# 购买低级盘 
 	I_SP_BUY_LOW = RuleImage(roi_front=(176,148,144,108), roi_back=(128,142,902,449), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/special/special_sp_buy_low.png")
 	# 判断是否滑动到底 
-	I_SP_SWIPE_CHECK = RuleImage(roi_front=(866,439,170,102), roi_back=(759,374,341,193), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/special/special_sp_swipe_check.png")
+	I_SP_SWIPE_CHECK = RuleImage(roi_front=(847,461,170,82), roi_back=(759,374,341,193), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/special/special_sp_swipe_check.png")
 
 
 	# Ocr Rule Assets

+ 18 - 18
tasks/RichMan/mall/navbar/image_side.json

@@ -5,7 +5,7 @@
     "roiFront": "1172,91,70,74",
     "roiBack": "1172,91,70,74",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "特殊"
   },
   {
@@ -14,16 +14,16 @@
     "roiFront": "102,7,42,42",
     "roiBack": "102,7,42,42",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "特殊"
   },
   {
     "itemName": "side_suer_honor",
     "imageName": "navbar_side_suer_honor.png",
-    "roiFront": "1171,185,72,74",
-    "roiBack": "1171,185,72,74",
+    "roiFront": "1180,191,59,60",
+    "roiBack": "1150,159,103,132",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "荣誉"
   },
   {
@@ -32,16 +32,16 @@
     "roiFront": "694,12,41,42",
     "roiBack": "694,12,41,42",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "荣誉"
   },
   {
     "itemName": "side_sure_friends",
     "imageName": "navbar_side_sure_friends.png",
-    "roiFront": "1174,279,68,70",
-    "roiBack": "1174,279,68,70",
+    "roiFront": "1174,277,68,70",
+    "roiBack": "1163,258,93,109",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "友情点"
   },
   {
@@ -50,16 +50,16 @@
     "roiFront": "890,8,39,43",
     "roiBack": "890,8,39,43",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "友情点"
   },
   {
     "itemName": "side_sure_medal",
     "imageName": "navbar_side_sure_medal.png",
-    "roiFront": "1175,370,72,73",
-    "roiBack": "1175,370,72,73",
+    "roiFront": "1190,375,39,62",
+    "roiBack": "1156,352,99,113",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "勋章"
   },
   {
@@ -68,16 +68,16 @@
     "roiFront": "889,11,40,44",
     "roiBack": "889,11,40,44",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "勋章"
   },
   {
     "itemName": "side_sure_charisma",
     "imageName": "navbar_side_sure_charisma.png",
-    "roiFront": "1175,464,72,74",
-    "roiBack": "1175,464,72,74",
+    "roiFront": "1181,467,59,58",
+    "roiBack": "1158,445,101,106",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "魅力值"
   },
   {
@@ -86,7 +86,7 @@
     "roiFront": "886,4,48,46",
     "roiBack": "886,4,48,46",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "魅力值"
   }
 ]

BIN
tasks/RichMan/mall/navbar/navbar_side_suer_honor.png


BIN
tasks/RichMan/mall/navbar/navbar_side_sure_charisma.png


BIN
tasks/RichMan/mall/navbar/navbar_side_sure_friends.png


BIN
tasks/RichMan/mall/navbar/navbar_side_sure_medal.png


+ 1 - 1
tasks/RichMan/mall/special/image.json

@@ -29,7 +29,7 @@
   {
     "itemName": "sp_swipe_check",
     "imageName": "special_sp_swipe_check.png",
-    "roiFront": "866,439,170,102",
+    "roiFront": "847,461,170,82",
     "roiBack": "759,374,341,193",
     "method": "Template matching",
     "threshold": 0.8,

BIN
tasks/RichMan/mall/special/special_sp_swipe_check.png


+ 2 - 1
tasks/RichMan/script_task.py

@@ -49,7 +49,8 @@ if __name__ == '__main__':
     d = Device(c)
     t = ScriptTask(c, d)
 
-    t.run()
+    # t.run()
+    t.execute_mall()