sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-16 05:47:23 +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

20
module/exercise/equipment.py
View File

@@ -1,18 +1,10 @@
from module.base.timer import Timer
from module.combat.assets import BATTLE_PREPARATION
<<<<<<< HEAD
from module.equipment.equipment import Equipment
from module.exercise.assets import *
class ExerciseEquipment(Equipment):
=======
from module.equipment.equipment_change import EquipmentChange
from module.exercise.assets import *
class ExerciseEquipment(EquipmentChange):
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
def _active_edit(self):
timer = Timer(5)
while 1:
@@ -40,7 +32,6 @@ class ExerciseEquipment(EquipmentChange):
break
def equipment_take_on(self):
<<<<<<< HEAD
if self.config.EXERCISE_FLEET_EQUIPMENT is None:
return False
if self.equipment_has_take_on:
@@ -61,14 +52,3 @@ class ExerciseEquipment(EquipmentChange):
super().equipment_take_off(enter=EQUIP_ENTER, out=BATTLE_PREPARATION, fleet=self.config.EXERCISE_FLEET_EQUIPMENT)
self._inactive_edit()
return True
=======
self._active_edit()
self.fleet_equipment_take_on_preset(preset_record=self.config.EXERCISE_FLEET_EQUIPMENT, enter=EQUIP_ENTER,
long_click=True, out=BATTLE_PREPARATION)
self._inactive_edit()
def equipment_take_off(self):
self._active_edit()
self.fleet_equipment_take_off(enter=EQUIP_ENTER, long_click=True, out=BATTLE_PREPARATION)
self._inactive_edit()
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0