瀏覽代碼

fix(ReplaceShikigami): Add guard checks and click interval in
switch_shikigami_class loop

Neptine 5 月之前
父節點
當前提交
8b538ff4c4
共有 1 個文件被更改,包括 7 次插入 和 2 次删除
  1. 7 2
      tasks/Component/ReplaceShikigami/replace_shikigami.py

+ 7 - 2
tasks/Component/ReplaceShikigami/replace_shikigami.py

@@ -52,9 +52,14 @@ class ReplaceShikigami(BaseTask, ReplaceShikigamiAssets):
             if self.appear(check_selected):
             if self.appear(check_selected):
                 break
                 break
             if self.appear(check_click, interval=1):
             if self.appear(check_click, interval=1):
-                if self.wait_until_pos_stable(check_click, stable_time=1.5, timeout=3.5):
-                    self.click(check_click)
+                if not (self.wait_until_pos_stable(check_click, stable_time=1.5, timeout=3.5)
+                        and self.appear(check_click)):
+                    continue
+                if self.appear(check_selected):
+                    break
+                self.click(check_click, interval=2)
                 continue
                 continue
+            self.wait_animate_stable(rule=self.C_SHIKIGAMI_SWITCH_1, interval=0.8)
             if self.click(self.C_SHIKIGAMI_SWITCH_1, interval=3.5):
             if self.click(self.C_SHIKIGAMI_SWITCH_1, interval=3.5):
                 continue
                 continue
         logger.info('Select shikigami class: %s' % shikigami_class)
         logger.info('Select shikigami class: %s' % shikigami_class)