Version v2.0.1.6 release

moesnow · Feb 15, 2024 · 53c02b4 · 53c02b4
1 parent 82472d4
commit 53c02b4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/assets/config/version.txt b/assets/config/version.txt
@@ -1 +1 @@
-v2.0.1.5
+v2.0.1.6
diff --git a/tasks/power/instance.py b/tasks/power/instance.py
@@ -148,7 +148,7 @@ def complete_run(instance_type):
         auto.click_element("./assets/images/zh_CN/fight/fight_exit.png", "image", 0.9, max_retries=10)
         time.sleep(2)
 
-        if "侵蚀隧洞" in instance_type and config.break_down_level_four_relicset:
+        if ("侵蚀隧洞" or "历战余响") in instance_type and config.break_down_level_four_relicset:
             Relicset.run()
 
     @staticmethod

diff --git a/tasks/power/relicset.py b/tasks/power/relicset.py
@@ -2,6 +2,7 @@
 from managers.screen_manager import screen
 from managers.logger_manager import logger
 from managers.translate_manager import _
+import time
 
 
 class Relicset:
@@ -40,6 +41,7 @@ def change_to_relicset():
     @staticmethod
     def prepare_break_down_relicset():
         if auto.click_element(Relicset.SELECT_IMAGE, "image", 0.9, max_retries=10):
+            time.sleep(1)
             if auto.click_element(Relicset.LEVEL_FOUR_IMAGE, "image", 0.9, max_retries=10):
                 if auto.click_element(Relicset.CONFIRM_IMAGE, "image", 0.9, max_retries=10):
                     if auto.find_element(Relicset.SCREEN_IMAGE, "image", 0.9, max_retries=10):
@@ -50,12 +52,16 @@ def prepare_break_down_relicset():
 
     @staticmethod
     def start_break_down_relicset():
-        if auto.click_element(Relicset.BREAK_IMAGE, "image", 0.9, max_retries=10):
-            if auto.click_element(Relicset.CONFIRM_IMAGE, "image", 0.9, max_retries=10):
-                if auto.click_element(Relicset.CLICK_CLOSE_IMAGE, "image", 0.9, max_retries=10):
-                    if auto.find_element(Relicset.SCREEN_IMAGE, "image", 0.9, max_retries=10):
-                        auto.press_key("esc")
-                        logger.info("分解遗器成功")
-                        return True
+        if not auto.click_element(Relicset.BREAK_IMAGE, "image", 0.9, max_retries=5):
+            logger.info("不存在可分解的遗器")
+            return False
+
+        time.sleep(1)
+        if auto.click_element(Relicset.CONFIRM_IMAGE, "image", 0.9, max_retries=10):
+            if auto.click_element(Relicset.CLICK_CLOSE_IMAGE, "image", 0.9, max_retries=10):
+                if auto.find_element(Relicset.SCREEN_IMAGE, "image", 0.9, max_retries=10):
+                    auto.press_key("esc")
+                    logger.info("分解遗器成功")
+                    return True
         logger.error("分解遗器失败")
         return False