悬赏封印邀请好友新界面

957057 · Jun 25, 2024 · 1295232 · 1295232
1 parent eaf2952
commit 1295232
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 17 deletions.
diff --git a/tasks/WantedQuests/assets.py b/tasks/WantedQuests/assets.py
@@ -65,15 +65,17 @@ class WantedQuestsAssets:
 	# description 
 	I_WQ_INVITE_3 = RuleImage(roi_front=(754,366,39,42), roi_back=(728,339,100,100), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_invite_3.png")
 	# description 
-	I_WQ_FIREND_1 = RuleImage(roi_front=(449,191,172,70), roi_back=(449,191,172,70), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_firend_1.png")
+	I_WQ_FIREND_1 = RuleImage(roi_front=(245,190,175,70), roi_back=(245,190,175,70), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_firend_1.png")
 	# description 
-	I_WQ_FIREND_2 = RuleImage(roi_front=(743,192,172,69), roi_back=(743,192,172,69), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_firend_2.png")
+	I_WQ_FIREND_2 = RuleImage(roi_front=(537,190,175,70), roi_back=(537,190,175,70), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_firend_2.png")
 	# description 
-	I_WQ_FIREND_3 = RuleImage(roi_front=(453,281,175,71), roi_back=(453,281,175,71), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_firend_3.png")
+	I_WQ_FIREND_3 = RuleImage(roi_front=(245,286,175,70), roi_back=(245,286,175,70), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_firend_3.png")
 	# description 
-	I_WQ_FIREND_4 = RuleImage(roi_front=(743,280,171,76), roi_back=(743,280,171,76), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_firend_4.png")
+	I_WQ_FIREND_4 = RuleImage(roi_front=(537,286,175,70), roi_back=(537,286,175,70), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_firend_4.png")
 	# description 
-	I_WQ_FIREND_5 = RuleImage(roi_front=(479,376,148,56), roi_back=(479,376,148,56), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_firend_5.png")
+	I_WQ_FIREND_5 = RuleImage(roi_front=(245,382,175,70), roi_back=(245,382,175,70), threshold=0.8, method="Template matching", file="./tasks/WantedQuests/invite/invite_wq_firend_5.png")
+	# 点击邀请 
+	I_INVITE_WQ = RuleImage(roi_front=(506,544,132,60), roi_back=(506,544,132,60), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_invite_ensure.png")
 
 
 	# Image Rule Assets

diff --git a/tasks/WantedQuests/invite/image.json b/tasks/WantedQuests/invite/image.json
@@ -29,46 +29,55 @@
   {
     "itemName": "wq_firend_1",
     "imageName": "invite_wq_firend_1.png",
-    "roiFront": "449,191,172,70",
-    "roiBack": "449,191,172,70",
+    "roiFront": "245,190,175,70",
+    "roiBack": "245,190,175,70",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
   },
   {
     "itemName": "wq_firend_2",
     "imageName": "invite_wq_firend_2.png",
-    "roiFront": "743,192,172,69",
-    "roiBack": "743,192,172,69",
+    "roiFront": "537,190,175,70",
+    "roiBack": "537,190,175,70",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
   },
   {
     "itemName": "wq_firend_3",
     "imageName": "invite_wq_firend_3.png",
-    "roiFront": "453,281,175,71",
-    "roiBack": "453,281,175,71",
+    "roiFront": "245,286,175,70",
+    "roiBack": "245,286,175,70",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
   },
   {
     "itemName": "wq_firend_4",
     "imageName": "invite_wq_firend_4.png",
-    "roiFront": "743,280,171,76",
-    "roiBack": "743,280,171,76",
+    "roiFront": "537,286,175,70",
+    "roiBack": "537,286,175,70",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
   },
   {
     "itemName": "wq_firend_5",
     "imageName": "invite_wq_firend_5.png",
-    "roiFront": "479,376,148,56",
-    "roiBack": "479,376,148,56",
+    "roiFront": "245,382,175,70",
+    "roiBack": "245,382,175,70",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
+  },
+  {
+    "itemName": "invite_wq",
+    "imageName": "gi_invite_ensure.png",
+    "roiFront": "506,544,132,60",
+    "roiBack": "506,544,132,60",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "点击邀请"
   }
 ]
diff --git a/tasks/WantedQuests/script_task.py b/tasks/WantedQuests/script_task.py
@@ -253,7 +253,7 @@ def invite(add_button):
             self.screenshot()
             if not self.appear(add_button):
                 return False
-            self.ui_click(add_button, self.I_INVITE_ENSURE, interval=2.5)
+            self.ui_click(add_button, self.I_INVITE_WQ, interval=2.5)
             sleep(1)
             self.click(self.I_WQ_FIREND_1)
             sleep(0.4)
@@ -269,7 +269,7 @@ def invite(add_button):
             if not self.appear(self.I_SELECTED):
                 logger.warning('No friend selected')
                 return False
-            self.ui_click_until_disappear(self.I_INVITE_ENSURE)
+            self.ui_click_until_disappear(self.I_INVITE_WQ)
             sleep(0.5)
 
         logger.hr('Invite friends')