Ver código fonte

fix(task): WantedQuests #85

runhey 3 anos atrás
pai
commit
90c3b5e9f7

+ 5 - 0
tasks/WantedQuests/assets.py

@@ -10,6 +10,11 @@ from module.atom.list import RuleList
 class WantedQuestsAssets: 
 
 
+	# Click Rule Assets
+	# 秘闻的挑战对话 
+	C_SECRET_CHAT = RuleClick(roi_front=(597,296,59,100), roi_back=(597,296,59,100), name="secret_chat")
+
+
 	# Ocr Rule Assets
 	# 挑战券的数量 
 	O_WQ_NUMBER = RuleOcr(roi=(569,13,50,32), area=(569,13,50,32), mode="Digit", method="Default", keyword="", name="wq_number")

+ 8 - 0
tasks/WantedQuests/click.json

@@ -0,0 +1,8 @@
+[
+  {
+    "itemName": "secret_chat",
+    "roiFront": "597,296,59,100",
+    "roiBack": "597,296,59,100",
+    "description": "秘闻的挑战对话"
+  }
+]

+ 10 - 1
tasks/WantedQuests/script_task.py

@@ -202,7 +202,16 @@ class ScriptTask(SecretScriptTask, GeneralInvite, WantedQuestsAssets):
         self.ui_click(goto, self.I_WQSE_FIRE)
         for i in range(num):
             self.wait_until_appear(self.I_WQSE_FIRE)
-            self.ui_click_until_disappear(self.I_WQSE_FIRE)
+            # self.ui_click_until_disappear(self.I_WQSE_FIRE)
+            while 1:
+                self.screenshot()
+                if not self.appear(self.I_UI_BACK_RED, threshold=0.7):
+                    break
+                if self.appear_then_click(self.I_WQSE_FIRE, interval=1):
+                    continue
+                if self.appear(self.I_UI_BACK_RED, threshold=0.7) and not self.appear(self.I_WQSE_FIRE):
+                    self.click(self.C_SECRET_CHAT, interval=0.6)
+                    continue
             success = self.run_general_battle(self.battle_config)
         while 1:
             self.screenshot()