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

fix: 修复退四打九时,依然会选择准备按钮

chubbycat 1 год назад
Родитель
Сommit
06aabee74c
2 измененных файлов с 7 добавлено и 7 удалено
  1. 3 3
      tasks/Component/GeneralBattle/general_battle.py
  2. 4 4
      tasks/RealmRaid/script_task.py

+ 3 - 3
tasks/Component/GeneralBattle/general_battle.py

@@ -73,14 +73,14 @@ class GeneralBattle(GeneralBuff, GeneralBattleAssets):
         else:
             return False
 
-    def run_general_battle_back(self, config: GeneralBattleConfig = None) -> bool:
+    def run_general_battle_back(self, config: GeneralBattleConfig = None, exit_four: bool = False) -> bool:
         """
         进入挑战然后直接返回
         :param config:
         :return:
         """
-        # 如果没有锁定队伍那么在点击准备后才退出的
-        if not config.lock_team_enable:
+        # 如果没有锁定队伍那么在点击准备后才退出的,退四的话就直接退出
+        if not config.lock_team_enable and not exit_four:
             # 点击准备按钮
             self.wait_until_appear(self.I_PREPARE_HIGHLIGHT)
             while 1:

+ 4 - 4
tasks/RealmRaid/script_task.py

@@ -184,13 +184,13 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, RealmRaidAssets):
                 if con.raid_config.exit_four:
                     logger.info('Exit four enable')
                     self.fire(index)
-                    self.run_general_battle_back(con.general_battle_config)
+                    self.run_general_battle_back(con.general_battle_config, exit_four=True)
                     self.fire(index)
-                    self.run_general_battle_back(con.general_battle_config)
+                    self.run_general_battle_back(con.general_battle_config, exit_four=True)
                     self.fire(index)
-                    self.run_general_battle_back(con.general_battle_config)
+                    self.run_general_battle_back(con.general_battle_config, exit_four=True)
                     self.fire(index)
-                    self.run_general_battle_back(con.general_battle_config)
+                    self.run_general_battle_back(con.general_battle_config, exit_four=True)
             elif self.check_medal_is_frog(frog, medal, index):
                 # 如果挑战的这只是呱太的话,就要把锁定改为不锁定
                 con.general_battle_config.lock_team_enable = False