Jelajahi Sumber

Merge remote-tracking branch 'upstream/dev' into develop

Chino dentist Ko 2 tahun lalu
induk
melakukan
3ab8562f1b

+ 9 - 9
tasks/Component/ReplaceShikigami/replace_shikigami.py

@@ -77,14 +77,14 @@ class ReplaceShikigami(BaseTask, ReplaceShikigamiAssets):
         :return:
         :return:
         """
         """
         # 选择式神
         # 选择式神
-        click_match = {1: self.C_SHIKIGAMI_LEFT_1,
-                       2: self.C_SHIKIGAMI_LEFT_2,
-                       3: self.C_SHIKIGAMI_LEFT_3,
-                       4: self.C_SHIKIGAMI_LEFT_4,
-                       5: self.C_SHIKIGAMI_LEFT_5,
-                       6: self.C_SHIKIGAMI_LEFT_6,
-                       7: self.C_SHIKIGAMI_LEFT_7}
-        click_match = click_match[shikigami_order]
+        _click_match = {1: self.C_SHIKIGAMI_LEFT_1,
+                        2: self.C_SHIKIGAMI_LEFT_2,
+                        3: self.C_SHIKIGAMI_LEFT_3,
+                        4: self.C_SHIKIGAMI_LEFT_4,
+                        5: self.C_SHIKIGAMI_LEFT_5,
+                        6: self.C_SHIKIGAMI_LEFT_6,
+                        7: self.C_SHIKIGAMI_LEFT_7}
+        click_match = _click_match[shikigami_order]
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
 
 
@@ -96,7 +96,7 @@ class ReplaceShikigami(BaseTask, ReplaceShikigamiAssets):
 
 
             if self.click(click_match, interval=1.5):
             if self.click(click_match, interval=1.5):
                 continue
                 continue
-            if self.click(click_match[6], interval=4.5):
+            if self.click(_click_match[6], interval=4.5):
                 # 有的时候第七个格子被占用到寄养上去了
                 # 有的时候第七个格子被占用到寄养上去了
                 # 导致一直无法选上
                 # 导致一直无法选上
                 continue
                 continue

+ 1 - 0
tasks/KekkaiActivation/script_task.py

@@ -349,6 +349,7 @@ class ScriptTask(KU, KekkaiActivationAssets):
             logger.info('No max level shikigami')
             logger.info('No max level shikigami')
         if self.detect_no_shikigami():
         if self.detect_no_shikigami():
             logger.warning('There are no any shikigami grow room')
             logger.warning('There are no any shikigami grow room')
+            self.switch_shikigami_class(shikigami_class)
             self.set_shikigami(shikigami_order=7, stop_image=self.I_RS_NO_ADD)
             self.set_shikigami(shikigami_order=7, stop_image=self.I_RS_NO_ADD)
 
 
         # 回到结界界面
         # 回到结界界面