瀏覽代碼

fix(task): WeeklyTrifles #86

runhey 3 年之前
父節點
當前提交
fdec191d79

+ 3 - 1
tasks/Delegation/assets.py

@@ -61,7 +61,9 @@ class DelegationAssets:
 	# 差强人意 
 	I_REWARDS_FALSE = RuleImage(roi_front=(430,72,100,100), roi_back=(430,72,100,100), threshold=0.8, method="Template matching", file="./tasks/Delegation/rewards/rewards_rewards_false.png")
 	# description 
-	I_CHAT_1 = RuleImage(roi_front=(716,380,318,100), roi_back=(716,380,318,100), threshold=0.8, method="Template matching", file="./tasks/Delegation/rewards/rewards_chat_1.png")
+	I_CHAT_1 = RuleImage(roi_front=(735,350,318,100), roi_back=(651,161,601,391), threshold=0.8, method="Template matching", file="./tasks/Delegation/rewards/rewards_chat_1.png")
+	# description 
+	I_CHAT_2 = RuleImage(roi_front=(721,384,325,100), roi_back=(721,384,325,100), threshold=0.8, method="Template matching", file="./tasks/Delegation/rewards/rewards_chat_2.png")
 
 
 	# Ocr Rule Assets

+ 2 - 2
tasks/WeeklyTrifles/assets.py

@@ -57,9 +57,9 @@ class WeeklyTriflesAssets:
 	# 点击分享 
 	I_WT_COLLECT = RuleImage(roi_front=(1170,606,78,83), roi_back=(1170,606,78,83), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/collect/collect_wt_collect.png")
 	# 百鬼夜行图 
-	I_WT_SCROLL_1 = RuleImage(roi_front=(1186,28,28,121), roi_back=(1186,28,28,121), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/collect/collect_wt_scroll_1.png")
+	I_WT_SCROLL_1 = RuleImage(roi_front=(1180,27,28,121), roi_back=(1159,12,65,152), threshold=0.7, method="Template matching", file="./tasks/WeeklyTrifles/collect/collect_wt_scroll_1.png")
 	# 百妖风物鉴 
-	I_WT_SCROLL_2 = RuleImage(roi_front=(1186,26,24,122), roi_back=(1186,26,24,122), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/collect/collect_wt_scroll_2.png")
+	I_WT_SCROLL_2 = RuleImage(roi_front=(1182,24,24,122), roi_back=(1163,12,63,155), threshold=0.7, method="Template matching", file="./tasks/WeeklyTrifles/collect/collect_wt_scroll_2.png")
 	# 微信分享 
 	I_WT_COLLECT_WECHAT = RuleImage(roi_front=(640,617,70,63), roi_back=(640,617,70,63), threshold=0.8, method="Template matching", file="./tasks/WeeklyTrifles/collect/collect_wt_collect_wechat.png")
 	# 二维码 

+ 6 - 6
tasks/WeeklyTrifles/collect/image.json

@@ -29,19 +29,19 @@
   {
     "itemName": "wt_scroll_1",
     "imageName": "collect_wt_scroll_1.png",
-    "roiFront": "1186,28,28,121",
-    "roiBack": "1186,28,28,121",
+    "roiFront": "1180,27,28,121",
+    "roiBack": "1159,12,65,152",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "百鬼夜行图"
   },
   {
     "itemName": "wt_scroll_2",
     "imageName": "collect_wt_scroll_2.png",
-    "roiFront": "1186,26,24,122",
-    "roiBack": "1186,26,24,122",
+    "roiFront": "1182,24,24,122",
+    "roiBack": "1163,12,63,155",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "百妖风物鉴"
   },
   {

+ 1 - 1
tasks/WeeklyTrifles/script_task.py

@@ -267,6 +267,6 @@ if __name__ == '__main__':
     t = ScriptTask(c, d)
     t.screenshot()
 
-    t._broken_amulet(30)
+    t._share_collect()