Jelajahi Sumber

fix(Nian): Safe click during waiting match

ryland 2 tahun lalu
induk
melakukan
6b22904f16
3 mengubah file dengan 20 tambahan dan 0 penghapusan
  1. 5 0
      tasks/Nian/assets.py
  2. 8 0
      tasks/Nian/nian/click.json
  3. 7 0
      tasks/Nian/script_task.py

+ 5 - 0
tasks/Nian/assets.py

@@ -10,6 +10,11 @@ from module.atom.list import RuleList
 class NianAssets: 
 
 
+	# Click Rule Assets
+	# description 
+	C_CLIC_SAFE = RuleClick(roi_front=(242,25,100,65), roi_back=(242,25,100,65), name="clic_safe")
+
+
 	# Image Rule Assets
 	# 自动匹配 
 	I_AUTO_MATCHING = RuleImage(roi_front=(698,598,180,64), roi_back=(698,598,180,64), threshold=0.8, method="Template matching", file="./tasks/Nian/nian/nian_auto_matching.png")

+ 8 - 0
tasks/Nian/nian/click.json

@@ -0,0 +1,8 @@
+[
+  {
+    "itemName": "clic_safe",
+    "roiFront": "242,25,100,65",
+    "roiBack": "242,25,100,65",
+    "description": "description"
+  }
+]

+ 7 - 0
tasks/Nian/script_task.py

@@ -90,6 +90,13 @@ class ScriptTask(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, NianAssets):
                 else:
                     break
             # 如果时间到了
+            if click_timer.reached():
+                logger.warning('It has waited for 240s , but the battle has not started.')
+                logger.warning('It will be waited for 240s and try again.')
+                self.screenshot()
+                self.click(self.C_CLIC_SAFE)
+                continue
+
             if check_timer.reached():
                 logger.warning('Nian match timeout')
                 while 1: