sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-05-03 10:22:30 +08:00
Code Activity

merge alas

Browse Source
This commit is contained in:
SevCrane
2024-06-05 23:57:58 +08:00
parent 3cb29a9a37
commit abfbbe5064
146 changed files with 0 additions and 13646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
module/exercise/combat.py
View File

@@ -24,13 +24,10 @@ class ExerciseCombat(HpDaemon, OpponentChoose, ExerciseEquipment, Combat):
# self.equipment_take_on()
pass
<<<<<<< HEAD
# Power limit check
from module.gg_handler.gg_handler import GGHandler
GGHandler(config=self.config, device=self.device).power_limit('Exercise')
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
self.device.click(BATTLE_PREPARATION)
continue
@@ -177,7 +174,6 @@ class ExerciseCombat(HpDaemon, OpponentChoose, ExerciseEquipment, Combat):
return False
self._choose_opponent(0)
<<<<<<< HEAD
super().equipment_take_off()
self._preparation_quit()
@@ -190,17 +186,3 @@ class ExerciseCombat(HpDaemon, OpponentChoose, ExerciseEquipment, Combat):
# self._choose_opponent(0)
# super().equipment_take_on()
# self._preparation_quit()
=======
self.equipment_take_off()
self._preparation_quit()
def equipment_take_on(self):
if self.config.EXERCISE_FLEET_EQUIPMENT is None:
return False
if self.equipment_has_take_on:
return False
self._choose_opponent(0)
super().equipment_take_on()
self._preparation_quit()
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0