Bläddra i källkod

Merge remote-tracking branch 'origin/dev' into dev

huangrunheng 2 år sedan
förälder
incheckning
ee22e8ab20

+ 2 - 2
tasks/RichMan/assets.py

@@ -179,7 +179,7 @@ class RichManAssets:
 	# 荣誉 
 	# 荣誉 
 	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_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,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_SURE_FRIENDS = RuleImage(roi_front=(1190,287,43,52), 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.7, 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")
 	# 勋章 
 	# 勋章 
@@ -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_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=(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")
+	I_SP_SWIPE_CHECK = RuleImage(roi_front=(900,164,42,61), roi_back=(173,144,840,379), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/special/special_sp_swipe_check.png")
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets

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

@@ -38,7 +38,7 @@
   {
   {
     "itemName": "side_sure_friends",
     "itemName": "side_sure_friends",
     "imageName": "navbar_side_sure_friends.png",
     "imageName": "navbar_side_sure_friends.png",
-    "roiFront": "1174,277,68,70",
+    "roiFront": "1190,287,43,52",
     "roiBack": "1163,258,93,109",
     "roiBack": "1163,258,93,109",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,

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


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

@@ -29,8 +29,8 @@
   {
   {
     "itemName": "sp_swipe_check",
     "itemName": "sp_swipe_check",
     "imageName": "special_sp_swipe_check.png",
     "imageName": "special_sp_swipe_check.png",
-    "roiFront": "847,461,170,82",
-    "roiBack": "759,374,341,193",
+    "roiFront": "900,164,42,61",
+    "roiBack": "173,144,840,379",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "判断是否滑动到底"
     "description": "判断是否滑动到底"

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


+ 0 - 1
tasks/RichMan/script_task.py

@@ -44,7 +44,6 @@ class ScriptTask(Mall, Guild, ThousandThings, Shrine):
 if __name__ == '__main__':
 if __name__ == '__main__':
     from module.config.config import Config
     from module.config.config import Config
     from module.device.device import Device
     from module.device.device import Device
-    from memory_profiler import profile
     c = Config('oas1')
     c = Config('oas1')
     d = Device(c)
     d = Device(c)
     t = ScriptTask(c, d)
     t = ScriptTask(c, d)