ryland 2 лет назад
Родитель
Сommit
4c249a7018

+ 1 - 1
tasks/AreaBoss/script_task.py

@@ -68,7 +68,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             self.screenshot()
             if self.appear_then_click(self.I_BACK_BLUE, threshold=0.6, interval=2):
                 continue
-            if self.appear(self.I_EXPLORE, threshold=0.6):
+            if self.appear(self.I_CHECK_MAIN, threshold=0.6):
                 break
 
     def boss(self, battle: RuleImage, collect: bool=False):

+ 5 - 5
tasks/Restart/assets.py

@@ -12,15 +12,15 @@ class RestartAssets:
 
 	# Image Rule Assets
 	# 点击勾玉 
-	I_HARVEST_JADE = RuleImage(roi_front=(732,489,34,33), roi_back=(177,451,963,100), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_jade.png")
+	I_HARVEST_JADE = RuleImage(roi_front=(732,489,34,33), roi_back=(177,451,963,120), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_jade.png")
 	# 签到小图标 
-	I_HARVEST_SIGN = RuleImage(roi_front=(295,496,32,43), roi_back=(70,481,889,71), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_sign.png")
+	I_HARVEST_SIGN = RuleImage(roi_front=(397,500,24,34), roi_back=(70,471,889,89), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_sign.png")
 	# description 
 	I_HARVEST_SIGN_2 = RuleImage(roi_front=(592,135,100,252), roi_back=(592,135,100,252), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_sign_2.png")
 	# 999签到福袋 
-	I_HARVEST_SIGN_999 = RuleImage(roi_front=(345,494,23,29), roi_back=(51,459,888,92), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_sign_999.png")
+	I_HARVEST_SIGN_999 = RuleImage(roi_front=(345,494,23,29), roi_back=(51,459,888,103), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_sign_999.png")
 	# 邮件小图标 
-	I_HARVEST_MAIL = RuleImage(roi_front=(337,505,37,25), roi_back=(38,476,880,78), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_mail.png")
+	I_HARVEST_MAIL = RuleImage(roi_front=(337,505,37,25), roi_back=(38,465,880,89), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_mail.png")
 	# 全部收取 
 	I_HARVEST_MAIL_ALL = RuleImage(roi_front=(80,622,75,64), roi_back=(80,622,75,64), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_mail_all.png")
 	# 有些邮件需要点击一次 
@@ -36,7 +36,7 @@ class RestartAssets:
 	# 打开聊天频道会自动关闭 
 	I_HARVEST_CHAT_CLOSE = RuleImage(roi_front=(639,309,35,100), roi_back=(639,309,35,100), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_chat_close.png")
 	# 签到 
-	I_HARVEST_SIGN_3 = RuleImage(roi_front=(291,495,33,36), roi_back=(100,473,1014,70), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_sign_3.png")
+	I_HARVEST_SIGN_3 = RuleImage(roi_front=(291,495,33,36), roi_back=(100,473,1014,91), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_sign_3.png")
 	# description 
 	I_HARVEST_SIGN_4 = RuleImage(roi_front=(587,151,100,228), roi_back=(547,123,185,281), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_sign_4.png")
 

BIN
tasks/Restart/harvest/harvest_harvest_sign.png


+ 6 - 6
tasks/Restart/harvest/image.json

@@ -3,7 +3,7 @@
     "itemName": "harvest_jade",
     "imageName": "harvest_harvest_jade.png",
     "roiFront": "732,489,34,33",
-    "roiBack": "177,451,963,100",
+    "roiBack": "177,451,963,120",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "点击勾玉"
@@ -11,8 +11,8 @@
   {
     "itemName": "harvest_sign",
     "imageName": "harvest_harvest_sign.png",
-    "roiFront": "295,496,32,43",
-    "roiBack": "70,481,889,71",
+    "roiFront": "397,500,24,34",
+    "roiBack": "70,471,889,89",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "签到小图标"
@@ -30,7 +30,7 @@
     "itemName": "harvest_sign_999",
     "imageName": "harvest_harvest_sign_999.png",
     "roiFront": "345,494,23,29",
-    "roiBack": "51,459,888,92",
+    "roiBack": "51,459,888,103",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "999签到福袋"
@@ -39,7 +39,7 @@
     "itemName": "harvest_mail",
     "imageName": "harvest_harvest_mail.png",
     "roiFront": "337,505,37,25",
-    "roiBack": "38,476,880,78",
+    "roiBack": "38,465,880,89",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "邮件小图标"
@@ -111,7 +111,7 @@
     "itemName": "harvest_sign_3",
     "imageName": "harvest_harvest_sign_3.png",
     "roiFront": "291,495,33,36",
-    "roiBack": "100,473,1014,70",
+    "roiBack": "100,473,1014,91",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "签到"

+ 1 - 1
tasks/Restart/script_task.py

@@ -53,7 +53,7 @@ if __name__ == '__main__':
     config = Config('oas1')
     device = Device(config)
     task = ScriptTask(config, device)
-    task.app_restart()
+    task.harvest()
     # task.screenshot()
     # print(task.appear_then_click(task.I_LOGIN_SCROOLL_CLOSE, threshold=0.9))