Просмотр исходного кода

修复夏日寮烟活动对百鬼界面的影响

yEs1do 1 год назад
Родитель
Сommit
9e6dc12226

+ 4 - 0
tasks/Hyakkiyakou/assets.py

@@ -164,6 +164,10 @@ class HyakkiyakouAssets:
 	I_FRIEND_SAME_2_RECALL = RuleImage(roi_front=(168,126,100,60), roi_back=(152,112,133,80), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_same_2.png")
 	# 回归活动使用 
 	I_FRIEND_REMOTE_2_RECALL = RuleImage(roi_front=(296,122,100,56), roi_back=(278,115,131,81), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_remote_2.png")
+	# description 
+	I_FRIEND_RYOU_1 = RuleImage(roi_front=(328,128,80,45), roi_back=(328,128,80,45), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_ryou_1.png")
+	# description 
+	I_FRIEND_RYOU_2 = RuleImage(roi_front=(328,128,80,45), roi_back=(328,128,80,45), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_ryou_2.png")
 
 
 	# Ocr Rule Assets

BIN
tasks/Hyakkiyakou/hya/hya_friend_ryou_1.png


BIN
tasks/Hyakkiyakou/hya/hya_friend_ryou_2.png


+ 18 - 0
tasks/Hyakkiyakou/hya/image5.json

@@ -70,5 +70,23 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "回归活动使用"
+  },
+  {
+    "itemName": "friend_ryou_1",
+    "imageName": "hya_friend_ryou_1.png",
+    "roiFront": "328,128,80,45",
+    "roiBack": "328,128,80,45",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "friend_ryou_2",
+    "imageName": "hya_friend_ryou_2.png",
+    "roiFront": "328,128,80,45",
+    "roiBack": "328,128,80,45",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
   }
 ]

+ 1 - 1
tasks/Hyakkiyakou/slave/hya_slave.py

@@ -223,7 +223,7 @@ class HyaSlave(HyaDevice, HyaColor, HyakkiyakouAssets):
             if self.appear(self.I_ENSURE_RECALL):
                 hya_recall_activity = True
             if hya_recall_activity:
-                if self.appear(self.I_FRIEND_SAME_1_RECALL) or self.appear(self.I_FRIEND_SAME_2_RECALL):
+                if self.appear(self.I_FRIEND_SAME_1_RECALL) or self.appear(self.I_FRIEND_SAME_2_RECALL) or self.appear(self.I_FRIEND_RYOU_1):
                     break
             else:
                 if self.appear(self.I_FRIEND_SAME_1) or self.appear(self.I_FRIEND_SAME_2):