huangrunheng 2 лет назад
Родитель
Сommit
1d480f757d

+ 2 - 2
tasks/Component/GeneralInvite/assets.py

@@ -46,9 +46,9 @@ class GeneralInviteAssets:
 	# 左上角退出 
 	I_BACK_YELLOW = RuleImage(roi_front=(19,13,58,55), roi_back=(19,13,58,55), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_back_yellow.png")
 	# 点击邀请 
-	I_INVITE_ENSURE = RuleImage(roi_front=(712,544,132,60), roi_back=(712,544,132,60), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_invite_ensure.png")
+	I_INVITE_ENSURE = RuleImage(roi_front=(500,541,132,60), roi_back=(478,523,378,92), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_invite_ensure.png")
 	# 判断是否点中好友了 
-	I_SELECTED = RuleImage(roi_front=(895,373,33,32), roi_back=(541,157,407,350), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_selected.png")
+	I_SELECTED = RuleImage(roi_front=(895,373,33,32), roi_back=(380,157,568,350), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_selected.png")
 	# 用来判断当前的列表是哪儿的 
 	I_FLAG_1_ON = RuleImage(roi_front=(354,126,62,21), roi_back=(354,126,62,21), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_flag_1_on.png")
 	# description 

+ 3 - 3
tasks/Component/GeneralInvite/gi/image.json

@@ -155,8 +155,8 @@
   {
     "itemName": "invite_ensure",
     "imageName": "gi_invite_ensure.png",
-    "roiFront": "712,544,132,60",
-    "roiBack": "712,544,132,60",
+    "roiFront": "500,541,132,60",
+    "roiBack": "478,523,378,92",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "点击邀请"
@@ -165,7 +165,7 @@
     "itemName": "selected",
     "imageName": "gi_selected.png",
     "roiFront": "895,373,33,32",
-    "roiBack": "541,157,407,350",
+    "roiBack": "380,157,568,350",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "判断是否点中好友了"

+ 0 - 3
tasks/WantedQuests/assets.py

@@ -4,7 +4,6 @@ from module.atom.long_click import RuleLongClick
 from module.atom.swipe import RuleSwipe
 from module.atom.ocr import RuleOcr
 from module.atom.list import RuleList
-from tasks.Component.GeneralInvite.assets import I_INVITE_ENSURE
 
 # This file was automatically generated by ./dev_tools/assets_extract.py.
 # Don't modify it manually.
@@ -75,8 +74,6 @@ class WantedQuestsAssets:
 	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=(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

+ 0 - 9
tasks/WantedQuests/invite/image.json

@@ -70,14 +70,5 @@
     "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": "点击邀请"
   }
 ]

+ 4 - 3
tasks/WantedQuests/script_task.py

@@ -253,7 +253,7 @@ class ScriptTask(SecretScriptTask, GeneralInvite, WantedQuestsAssets):
             self.screenshot()
             if not self.appear(add_button):
                 return False
-            self.ui_click(add_button, self.I_INVITE_WQ, interval=2.5)
+            self.ui_click(add_button, self.I_INVITE_ENSURE, interval=2.5)
             sleep(1)
             self.click(self.I_WQ_FIREND_1)
             sleep(0.4)
@@ -269,7 +269,7 @@ class ScriptTask(SecretScriptTask, GeneralInvite, WantedQuestsAssets):
             if not self.appear(self.I_SELECTED):
                 logger.warning('No friend selected')
                 return False
-            self.ui_click_until_disappear(self.I_INVITE_WQ)
+            self.ui_click_until_disappear(self.I_INVITE_ENSURE)
             sleep(0.5)
 
         logger.hr('Invite friends')
@@ -294,7 +294,8 @@ if __name__ == '__main__':
     t = ScriptTask(c, d)
     t.screenshot()
 
-    t.run()
+    # t.run()
+    t.invite_five()
     # print(t.appear(t.I_WQ_CHECK_TASK))