Просмотр исходного кода

补卡寄养候补式神卡住的bug

GanSer 1 год назад
Родитель
Сommit
7fdb4346aa

+ 4 - 0
tasks/Component/ReplaceShikigami/assets.py

@@ -84,5 +84,9 @@ class ReplaceShikigamiAssets:
 	# Image Rule Assets
 	# 小一个尺寸的 确认按钮 
 	I_U_CONFIRM_SMALL = RuleImage(roi_front=(672,513,131,60), roi_back=(672,513,131,60), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/utilize_u_confirm_small.png")
+	# 候补式神确认 
+	I_U_CONFIRM_ALTERNATE = RuleImage(roi_front=(692,407,134,47), roi_back=(692,407,134,47), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_u_confirm_alternate.png")
+	# 候补式神圆圈 
+	I_U_CIRCLE_ALTERNATE = RuleImage(roi_front=(535,339,41,43), roi_back=(535,339,41,43), threshold=0.8, method="Template matching", file="./tasks/Component/ReplaceShikigami/rs/rs_u_circle_alternate.png")
 
 

+ 3 - 0
tasks/Component/ReplaceShikigami/replace_shikigami.py

@@ -100,6 +100,9 @@ class ReplaceShikigami(BaseTask, ReplaceShikigamiAssets):
                 # 有的时候第七个格子被占用到寄养上去了
                 # 导致一直无法选上
                 continue
+            if self.appear_then_click(self.I_U_CIRCLE_ALTERNATE, interval=2.5):
+                self.appear_then_click(self.I_U_CONFIRM_ALTERNATE, interval=1.5)
+                continue
         logger.info('Set shikigami: %d' % shikigami_order)
 
     def detect_no_shikigami(self) -> bool:

BIN
tasks/Component/ReplaceShikigami/rs/rs_u_circle_alternate.png


BIN
tasks/Component/ReplaceShikigami/rs/rs_u_confirm_alternate.png


+ 18 - 0
tasks/Component/ReplaceShikigami/rs/supplement.json

@@ -7,5 +7,23 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "小一个尺寸的 确认按钮"
+  },
+  {
+    "itemName": "u_confirm_alternate",
+    "imageName": "rs_u_confirm_alternate.png",
+    "roiFront": "692,407,134,47",
+    "roiBack": "692,407,134,47",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "候补式神确认"
+  },
+  {
+    "itemName": "u_circle_alternate",
+    "imageName": "rs_u_circle_alternate.png",
+    "roiFront": "535,339,41,43",
+    "roiBack": "535,339,41,43",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "候补式神圆圈"
   }
 ]