sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 13:17:00 +08:00
Code Activity

Chore: equipment function names

Browse Source
This commit is contained in:
sui-feng-cb
2025-10-18 03:36:35 +08:00
parent 1cd3a1f386
commit 90a7853560
8 changed files with 65 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
module/exercise/combat.py
View File

@@ -201,15 +201,15 @@ class ExerciseCombat(HpDaemon, OpponentChoose, ExerciseEquipment, Combat):
return False
self._choose_opponent(0)
super().equipment_take_off()
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()
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()

21
module/exercise/equipment.py
View File

@@ -1,10 +1,10 @@
from module.base.timer import Timer
from module.combat.assets import BATTLE_PREPARATION
from module.equipment.equipment import Equipment
from module.equipment.equipment_change import EquipmentChange
from module.exercise.assets import *
class ExerciseEquipment(Equipment):
class ExerciseEquipment(EquipmentChange):
def _active_edit(self):
timer = Timer(5)
while 1:
@@ -32,23 +32,12 @@ class ExerciseEquipment(Equipment):
break
def equipment_take_on(self):
if self.config.EXERCISE_FLEET_EQUIPMENT is None:
return False
if self.equipment_has_take_on:
return False
self._active_edit()
super().equipment_take_on(enter=EQUIP_ENTER, out=BATTLE_PREPARATION, fleet=self.config.EXERCISE_FLEET_EQUIPMENT)
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()
return True
def equipment_take_off(self):
if self.config.EXERCISE_FLEET_EQUIPMENT is None:
return False
if not self.equipment_has_take_on:
return False
self._active_edit()
super().equipment_take_off(enter=EQUIP_ENTER, out=BATTLE_PREPARATION, fleet=self.config.EXERCISE_FLEET_EQUIPMENT)
self.fleet_equipment_take_off(enter=EQUIP_ENTER, long_click=True, out=BATTLE_PREPARATION)
self._inactive_edit()
return True