Переглянути джерело

修复星重聚召回活动对百鬼夜行坐标的影响

yEs1do 1 рік тому
батько
коміт
9e506fc69d

+ 30 - 10
tasks/Hyakkiyakou/assets.py

@@ -18,17 +18,29 @@ class HyakkiyakouAssets:
 	# description 
 	# description 
 	C_HSELECT_3 = RuleClick(roi_front=(934,298,115,306), roi_back=(934,298,115,306), name="hselect_3")
 	C_HSELECT_3 = RuleClick(roi_front=(934,298,115,306), roi_back=(934,298,115,306), name="hselect_3")
 	# description 
 	# description 
-	C_FRIEND_1 = RuleClick(roi_front=(254,223,161,67), roi_back=(254,223,161,67), name="friend_1")
+	C_FRIEND_1 = RuleClick(roi_front=(466,227,161,67), roi_back=(466,227,161,67), name="friend_1")
 	# description 
 	# description 
-	C_FRIEND_2 = RuleClick(roi_front=(532,226,158,64), roi_back=(532,226,158,64), name="friend_2")
+	C_FRIEND_2 = RuleClick(roi_front=(738,229,158,64), roi_back=(738,229,158,64), name="friend_2")
 	# description 
 	# description 
-	C_FRIEND_3 = RuleClick(roi_front=(240,310,183,66), roi_back=(240,310,183,66), name="friend_3")
+	C_FRIEND_3 = RuleClick(roi_front=(445,310,183,66), roi_back=(445,310,183,66), name="friend_3")
 	# description 
 	# description 
-	C_FRIEND_4 = RuleClick(roi_front=(504,311,184,62), roi_back=(504,311,184,62), name="friend_4")
+	C_FRIEND_4 = RuleClick(roi_front=(712,311,184,62), roi_back=(712,311,184,62), name="friend_4")
 	# description 
 	# description 
-	C_FRIEND_5 = RuleClick(roi_front=(241,395,178,61), roi_back=(241,395,178,61), name="friend_5")
+	C_FRIEND_5 = RuleClick(roi_front=(449,394,178,61), roi_back=(449,394,178,61), name="friend_5")
 	# description 
 	# description 
-	C_FRIEND_6 = RuleClick(roi_front=(508,394,182,62), roi_back=(508,394,182,62), name="friend_6")
+	C_FRIEND_6 = RuleClick(roi_front=(714,397,182,62), roi_back=(714,397,182,62), name="friend_6")
+	# 回归活动使用
+	C_FRIEND_1_RECALL = RuleClick(roi_front=(254,223,161,67), roi_back=(254,223,161,67), name="friend_1_recall")
+	# 回归活动使用
+	C_FRIEND_2_RECALL = RuleClick(roi_front=(532,226,158,64), roi_back=(532,226,158,64), name="friend_2_recall")
+	# 回归活动使用
+	C_FRIEND_3_RECALL = RuleClick(roi_front=(240,310,183,66), roi_back=(240,310,183,66), name="friend_3_recall")
+	# 回归活动使用
+	C_FRIEND_4_RECALL = RuleClick(roi_front=(504,311,184,62), roi_back=(504,311,184,62), name="friend_4_recall")
+	# 回归活动使用
+	C_FRIEND_5_RECALL = RuleClick(roi_front=(241,395,178,61), roi_back=(241,395,178,61), name="friend_5_recall")
+	# 回归活动使用
+	C_FRIEND_6_RECALL = RuleClick(roi_front=(508,394,182,62), roi_back=(508,394,182,62), name="friend_6_recall")
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets
@@ -135,13 +147,21 @@ class HyakkiyakouAssets:
 
 
 	# Image Rule Assets
 	# Image Rule Assets
 	# description 
 	# description 
-	I_FRIEND_SAME_1 = RuleImage(roi_front=(167,123,106,62), roi_back=(154,105,132,94), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_same_1.png")
+	I_FRIEND_SAME_1 = RuleImage(roi_front=(375,122,106,62), roi_back=(375,122,106,62), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_same_1.png")
 	# description 
 	# description 
-	I_FRIEND_REMOTE_1 = RuleImage(roi_front=(288,123,106,56), roi_back=(269,106,159,91), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_remote_1.png")
+	I_FRIEND_REMOTE_1 = RuleImage(roi_front=(498,125,106,56), roi_back=(498,125,106,56), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_remote_1.png")
 	# description 
 	# description 
-	I_FRIEND_SAME_2 = 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_SAME_2 = RuleImage(roi_front=(377,126,100,60), roi_back=(377,126,100,60), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_same_2.png")
 	# description 
 	# description 
-	I_FRIEND_REMOTE_2 = 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")
+	I_FRIEND_REMOTE_2 = RuleImage(roi_front=(504,127,100,56), roi_back=(504,127,100,56), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_remote_2.png")
+	# 回归活动使用
+	I_FRIEND_SAME_1_RECALL = RuleImage(roi_front=(167,123,106,62), roi_back=(154,105,132,94), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_same_1.png")
+	# 回归活动使用
+	I_FRIEND_REMOTE_1_RECALL = RuleImage(roi_front=(288,123,106,56), roi_back=(269,106,159,91), threshold=0.8, method="Template matching", file="./tasks/Hyakkiyakou/hya/hya_friend_remote_1.png")
+	# 回归活动使用
+	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")
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets

+ 1 - 0
tasks/Hyakkiyakou/config.py

@@ -26,6 +26,7 @@ class HyakkiyakouConfig(ConfigBase):
     hya_limit_time: Time = Field(default=Time(minute=20), description='hya_limit_time_help')
     hya_limit_time: Time = Field(default=Time(minute=20), description='hya_limit_time_help')
     hya_limit_count: int = Field(default=10, description='hya_limit_count_help')
     hya_limit_count: int = Field(default=10, description='hya_limit_count_help')
     hya_invite_friend: bool = Field(default=False, description='hya_invite_friend_help')
     hya_invite_friend: bool = Field(default=False, description='hya_invite_friend_help')
+    hya_recall_activity: bool = Field(default=False, description='星重聚召回活动')
     # 自动调整豆子数量
     # 自动调整豆子数量
     hya_auto_bean: bool = Field(default=False, description='hya_auto_bean_help')
     hya_auto_bean: bool = Field(default=False, description='hya_auto_bean_help')
     hya_priorities: str = Field(default='', description='hya_priorities_help')
     hya_priorities: str = Field(default='', description='hya_priorities_help')

+ 47 - 11
tasks/Hyakkiyakou/hya/click.json

@@ -19,38 +19,74 @@
   },
   },
   {
   {
     "itemName": "friend_1",
     "itemName": "friend_1",
-    "roiFront": "254,223,161,67",
-    "roiBack": "254,223,161,67",
+    "roiFront": "466,227,161,67",
+    "roiBack": "466,227,161,67",
     "description": "description"
     "description": "description"
   },
   },
   {
   {
     "itemName": "friend_2",
     "itemName": "friend_2",
-    "roiFront": "532,226,158,64",
-    "roiBack": "532,226,158,64",
+    "roiFront": "738,229,158,64",
+    "roiBack": "738,229,158,64",
     "description": "description"
     "description": "description"
   },
   },
   {
   {
     "itemName": "friend_3",
     "itemName": "friend_3",
-    "roiFront": "240,310,183,66",
-    "roiBack": "240,310,183,66",
+    "roiFront": "445,310,183,66",
+    "roiBack": "445,310,183,66",
     "description": "description"
     "description": "description"
   },
   },
   {
   {
     "itemName": "friend_4",
     "itemName": "friend_4",
-    "roiFront": "504,311,184,62",
-    "roiBack": "504,311,184,62",
+    "roiFront": "712,311,184,62",
+    "roiBack": "712,311,184,62",
     "description": "description"
     "description": "description"
   },
   },
   {
   {
     "itemName": "friend_5",
     "itemName": "friend_5",
-    "roiFront": "241,395,178,61",
-    "roiBack": "241,395,178,61",
+    "roiFront": "449,394,178,61",
+    "roiBack": "449,394,178,61",
     "description": "description"
     "description": "description"
   },
   },
   {
   {
     "itemName": "friend_6",
     "itemName": "friend_6",
+    "roiFront": "714,397,182,62",
+    "roiBack": "714,397,182,62",
+    "description": "description"
+  },
+  {
+    "itemName": "friend_1_recall",
+    "roiFront": "254,223,161,67",
+    "roiBack": "254,223,161,67",
+    "description": "回归活动使用"
+  },
+  {
+    "itemName": "friend_2_recall",
+    "roiFront": "532,226,158,64",
+    "roiBack": "532,226,158,64",
+    "description": "回归活动使用"
+  },
+  {
+    "itemName": "friend_3_recall",
+    "roiFront": "240,310,183,66",
+    "roiBack": "240,310,183,66",
+    "description": "回归活动使用"
+  },
+  {
+    "itemName": "friend_4_recall",
+    "roiFront": "504,311,184,62",
+    "roiBack": "504,311,184,62",
+    "description": "回归活动使用"
+  },
+  {
+    "itemName": "friend_5_recall",
+    "roiFront": "241,395,178,61",
+    "roiBack": "241,395,178,61",
+    "description": "回归活动使用"
+  },
+  {
+    "itemName": "friend_6_recall",
     "roiFront": "508,394,182,62",
     "roiFront": "508,394,182,62",
     "roiBack": "508,394,182,62",
     "roiBack": "508,394,182,62",
-    "description": "description"
+    "description": "回归活动使用"
   }
   }
 ]
 ]

+ 43 - 7
tasks/Hyakkiyakou/hya/image5.json

@@ -2,8 +2,8 @@
   {
   {
     "itemName": "friend_same_1",
     "itemName": "friend_same_1",
     "imageName": "hya_friend_same_1.png",
     "imageName": "hya_friend_same_1.png",
-    "roiFront": "167,123,106,62",
-    "roiBack": "154,105,132,94",
+    "roiFront": "375,122,106,62",
+    "roiBack": "375,122,106,62",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "description"
     "description": "description"
@@ -11,8 +11,8 @@
   {
   {
     "itemName": "friend_remote_1",
     "itemName": "friend_remote_1",
     "imageName": "hya_friend_remote_1.png",
     "imageName": "hya_friend_remote_1.png",
-    "roiFront": "288,123,106,56",
-    "roiBack": "269,106,159,91",
+    "roiFront": "498,125,106,56",
+    "roiBack": "498,125,106,56",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "description"
     "description": "description"
@@ -20,8 +20,8 @@
   {
   {
     "itemName": "friend_same_2",
     "itemName": "friend_same_2",
     "imageName": "hya_friend_same_2.png",
     "imageName": "hya_friend_same_2.png",
-    "roiFront": "168,126,100,60",
-    "roiBack": "152,112,133,80",
+    "roiFront": "377,126,100,60",
+    "roiBack": "377,126,100,60",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "description"
     "description": "description"
@@ -29,10 +29,46 @@
   {
   {
     "itemName": "friend_remote_2",
     "itemName": "friend_remote_2",
     "imageName": "hya_friend_remote_2.png",
     "imageName": "hya_friend_remote_2.png",
+    "roiFront": "504,127,100,56",
+    "roiBack": "504,127,100,56",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "friend_same_1_recall",
+    "imageName": "hya_friend_same_1.png",
+    "roiFront": "167,123,106,62",
+    "roiBack": "154,105,132,94",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "回归活动使用"
+  },
+  {
+    "itemName": "friend_remote_1_recall",
+    "imageName": "hya_friend_remote_1.png",
+    "roiFront": "288,123,106,56",
+    "roiBack": "269,106,159,91",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "回归活动使用"
+  },
+  {
+    "itemName": "friend_same_2_recall",
+    "imageName": "hya_friend_same_2.png",
+    "roiFront": "168,126,100,60",
+    "roiBack": "152,112,133,80",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "回归活动使用"
+  },
+  {
+    "itemName": "friend_remote_2_recall",
+    "imageName": "hya_friend_remote_2.png",
     "roiFront": "296,122,100,56",
     "roiFront": "296,122,100,56",
     "roiBack": "278,115,131,81",
     "roiBack": "278,115,131,81",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
-    "description": "description"
+    "description": "回归活动使用"
   }
   }
 ]
 ]

+ 1 - 0
tasks/Hyakkiyakou/script_task.py

@@ -102,6 +102,7 @@ class ScriptTask(GameUi, HyaSlave):
             'weights': weights,
             'weights': weights,
             'priorities': priorities,
             'priorities': priorities,
             'invite_friend': hya_config.hya_invite_friend,
             'invite_friend': hya_config.hya_invite_friend,
+            'recall_activity': hya_config.hya_recall_activity,
             'auto_bean': hya_config.hya_auto_bean
             'auto_bean': hya_config.hya_auto_bean
         }
         }
         return Agent(strategy=strategy)
         return Agent(strategy=strategy)

+ 23 - 7
tasks/Hyakkiyakou/slave/hya_slave.py

@@ -218,8 +218,13 @@ class HyaSlave(HyaDevice, HyaColor, HyakkiyakouAssets):
         logger.hr('Invite friend', 2)
         logger.hr('Invite friend', 2)
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
-            if self.appear(self.I_FRIEND_SAME_1) or self.appear(self.I_FRIEND_SAME_2):
-                break
+            # 是否有召回活动
+            if self.config.hyakkiyakou.hyakkiyakou_config.hya_recall_activity:
+                if self.appear(self.I_FRIEND_SAME_1_RECALL) or self.appear(self.I_FRIEND_SAME_2_RECALL):
+                    break
+            else:
+                if self.appear(self.I_FRIEND_SAME_1) or self.appear(self.I_FRIEND_SAME_2):
+                    break
             if self.appear_then_click(self.I_HINVITE, interval=4):
             if self.appear_then_click(self.I_HINVITE, interval=4):
                 continue
                 continue
         if not self._invite_friend(True):
         if not self._invite_friend(True):
@@ -229,17 +234,28 @@ class HyaSlave(HyaDevice, HyaColor, HyakkiyakouAssets):
     def _invite_friend(self, same: bool = True) -> bool:
     def _invite_friend(self, same: bool = True) -> bool:
         if not same:
         if not same:
             logger.info('Invite different server friend')
             logger.info('Invite different server friend')
-            self.ui_click(self.I_FRIEND_REMOTE_1, self.I_FRIEND_REMOTE_2)
+            # 是否有召回活动
+            if self.config.hyakkiyakou.hyakkiyakou_config.hya_recall_activity:
+                self.ui_click(self.I_FRIEND_REMOTE_1_RECALL, self.I_FRIEND_REMOTE_2_RECALL)
+            else:
+                self.ui_click(self.I_FRIEND_REMOTE_1, self.I_FRIEND_REMOTE_2)
         invite_timer = Timer(8)
         invite_timer = Timer(8)
         invite_timer.start()
         invite_timer.start()
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
             if not self.appear(self.I_HINVITE):
             if not self.appear(self.I_HINVITE):
                 break
                 break
-            if self.click(self.C_FRIEND_1, interval=2):
-                continue
-            if self.click(self.C_FRIEND_2, interval=3):
-                continue
+            # 是否有召回活动
+            if self.config.hyakkiyakou.hyakkiyakou_config.hya_recall_activity:
+                if self.click(self.C_FRIEND_1_RECALL, interval=2):
+                    continue
+                if self.click(self.C_FRIEND_2_RECALL, interval=3):
+                    continue
+            else:
+                if self.click(self.C_FRIEND_1, interval=2):
+                    continue
+                if self.click(self.C_FRIEND_2, interval=3):
+                    continue
             if invite_timer.reached():
             if invite_timer.reached():
                 logger.warning('Invite friend timeout, It may be no friend available')
                 logger.warning('Invite friend timeout, It may be no friend available')
                 return False
                 return False