Browse Source

Merge pull request #288 from runhey/WantedQuests

Wanted quests
huangrunheng 2 năm trước cách đây
mục cha
commit
d8dc3ba856

+ 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": "判断是否点中好友了"

+ 5 - 5
tasks/WantedQuests/assets.py

@@ -65,15 +65,15 @@ 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")
 
 
 	# Image Rule Assets

+ 10 - 10
tasks/WantedQuests/invite/image.json

@@ -29,8 +29,8 @@
   {
     "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"
@@ -38,8 +38,8 @@
   {
     "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"
@@ -47,8 +47,8 @@
   {
     "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"
@@ -56,8 +56,8 @@
   {
     "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"
@@ -65,8 +65,8 @@
   {
     "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"

+ 2 - 1
tasks/WantedQuests/script_task.py

@@ -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))