ryland 2 лет назад
Родитель
Сommit
5daec33522

+ 2 - 2
tasks/DailyTrifles/assets.py

@@ -29,9 +29,9 @@ class DailyTriflesAssets:
 
 	# Image Rule Assets
 	# 礼包屋 
-	I_ROOM_GIFT = RuleImage(roi_front=(1142,638,62,55), roi_back=(1127,611,103,94), threshold=0.8, method="Template matching", file="./tasks/DailyTrifles/store/store_room_gift.png")
+	I_ROOM_GIFT = RuleImage(roi_front=(1152,644,52,53), roi_back=(1127,611,103,94), threshold=0.8, method="Template matching", file="./tasks/DailyTrifles/store/store_room_gift.png")
 	# description 
-	I_GIFT_RECOMMEND = RuleImage(roi_front=(1186,98,53,64), roi_back=(1172,83,83,214), threshold=0.8, method="Template matching", file="./tasks/DailyTrifles/store/store_gift_recommend.png")
+	I_GIFT_RECOMMEND = RuleImage(roi_front=(1186,98,53,64), roi_back=(1172,83,83,306), threshold=0.8, method="Template matching", file="./tasks/DailyTrifles/store/store_gift_recommend.png")
 	# 免费一抽 
 	I_GIFT_SIGN = RuleImage(roi_front=(236,129,306,218), roi_back=(236,129,306,218), threshold=0.8, method="Template matching", file="./tasks/DailyTrifles/store/store_gift_sign.png")
 

+ 2 - 6
tasks/DailyTrifles/script_task.py

@@ -127,17 +127,13 @@ class ScriptTask(GameUi, Summon, DailyTriflesAssets):
         self.ui_goto(page_main)
 
 
-
-
-
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
 
-    c = Config('du')
+    c = Config('oas1')
     d = Device(c)
     t = ScriptTask(c, d)
 
-    # t.run_one_summon()
-    t.run_luck_msg()
+    t.run_store_sign()
 

+ 2 - 2
tasks/DailyTrifles/store/image.json

@@ -2,7 +2,7 @@
   {
     "itemName": "room_gift",
     "imageName": "store_room_gift.png",
-    "roiFront": "1142,638,62,55",
+    "roiFront": "1152,644,52,53",
     "roiBack": "1127,611,103,94",
     "method": "Template matching",
     "threshold": 0.8,
@@ -12,7 +12,7 @@
     "itemName": "gift_recommend",
     "imageName": "store_gift_recommend.png",
     "roiFront": "1186,98,53,64",
-    "roiBack": "1172,83,83,214",
+    "roiBack": "1172,83,83,306",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"

BIN
tasks/DailyTrifles/store/store_room_gift.png


+ 3 - 3
tasks/RichMan/assets.py

@@ -150,11 +150,11 @@ class RichManAssets:
 
 	# Image Rule Assets
 	# 寄售屋 
-	I_MALL_CONSIGNMENT = RuleImage(roi_front=(200,626,63,72), roi_back=(175,610,120,103), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_consignment.png")
+	I_MALL_CONSIGNMENT = RuleImage(roi_front=(207,639,56,59), roi_back=(175,610,120,103), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_consignment.png")
 	# 寄售屋 
 	I_MALL_CONSIGNMENT_CHECK = RuleImage(roi_front=(12,166,100,390), roi_back=(12,166,100,390), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_consignment_check.png")
 	# 密卷屋 
-	I_MALL_SCCALES = RuleImage(roi_front=(447,634,91,64), roi_back=(427,621,147,92), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_sccales.png")
+	I_MALL_SCCALES = RuleImage(roi_front=(470,649,68,49), roi_back=(427,621,147,92), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_sccales.png")
 	# 密卷屋 
 	I_MALL_SCCALES_CHECK = RuleImage(roi_front=(409,253,100,100), roi_back=(409,253,100,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_sccales_check.png")
 	# description 
@@ -164,7 +164,7 @@ class RichManAssets:
 	# 契灵商店 
 	I_MALL_BONDLINGS_CHECK = RuleImage(roi_front=(355,186,34,104), roi_back=(355,186,34,104), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_bondlings_check.png")
 	# 杂货铺 
-	I_MALL_SUNDRY = RuleImage(roi_front=(856,639,74,61), roi_back=(834,621,116,90), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_sundry.png")
+	I_MALL_SUNDRY = RuleImage(roi_front=(880,646,53,54), roi_back=(834,621,116,90), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_sundry.png")
 	# 杂货铺 
 	I_MALL_SUNDRY_CHECK = RuleImage(roi_front=(1093,10,31,44), roi_back=(1093,10,31,44), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_sundry_check.png")
 

+ 3 - 3
tasks/RichMan/mall/navbar/image_bottom.json

@@ -2,7 +2,7 @@
   {
     "itemName": "mall_consignment",
     "imageName": "navbar_mall_consignment.png",
-    "roiFront": "200,626,63,72",
+    "roiFront": "207,639,56,59",
     "roiBack": "175,610,120,103",
     "method": "Template matching",
     "threshold": 0.8,
@@ -20,7 +20,7 @@
   {
     "itemName": "mall_sccales",
     "imageName": "navbar_mall_sccales.png",
-    "roiFront": "447,634,91,64",
+    "roiFront": "470,649,68,49",
     "roiBack": "427,621,147,92",
     "method": "Template matching",
     "threshold": 0.8,
@@ -65,7 +65,7 @@
   {
     "itemName": "mall_sundry",
     "imageName": "navbar_mall_sundry.png",
-    "roiFront": "856,639,74,61",
+    "roiFront": "880,646,53,54",
     "roiBack": "834,621,116,90",
     "method": "Template matching",
     "threshold": 0.8,

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


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


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


+ 2 - 2
tasks/RichMan/script_task.py

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