yEs1do 2 lat temu
rodzic
commit
7bf06a8cef
1 zmienionych plików z 2 dodań i 12 usunięć
  1. 2 12
      tasks/Exploration/solo.py

+ 2 - 12
tasks/Exploration/solo.py

@@ -69,26 +69,16 @@ class SoloExploration(BaseExploration):
                 # boss
                 if self.appear(self.I_BOSS_BATTLE_BUTTON):
                     while 1:
-                        if not (self.appear(self.I_E_SETTINGS_BUTTON) or
-                            self.appear(self.I_E_AUTO_ROTATE_ON) or
-                            self.appear(self.I_E_AUTO_ROTATE_OFF)):
+                        if self.fire(self.I_BOSS_BATTLE_BUTTON):
                             break
-                        self.ui_click_until_disappear(self.I_BOSS_BATTLE_BUTTON)
-                    self.run_general_battle(self._config.general_battle_config)
-                    self.minions_cnt += 1
                     logger.info(f'Boss battle, minions cnt {self.minions_cnt}')
                     continue
                 # 小怪
                 fight_button = self.search_up_fight()
                 if fight_button is not None:
                     while 1:
-                        if not (self.appear(self.I_E_SETTINGS_BUTTON) or
-                            self.appear(self.I_E_AUTO_ROTATE_ON) or
-                            self.appear(self.I_E_AUTO_ROTATE_OFF)):
+                        if self.fire(fight_button):
                             break
-                        self.ui_click_until_disappear(fight_button)
-                    self.run_general_battle(self._config.general_battle_config)
-                    self.minions_cnt += 1
                     logger.info(f'Fight, minions cnt {self.minions_cnt}')
                     continue
                 # 向后拉,寻找怪