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

Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

Browse Source
This commit is contained in:
SevCrane
2024-06-05 23:53:03 +08:00
parent 5e482958f6 24aa3e00bd
commit 3cb29a9a37
179 changed files with 17873 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
module/hard/equipment.py
View File

@@ -1,17 +1,32 @@
<<<<<<< HEAD
from module.equipment.equipment import Equipment
=======
from module.equipment.equipment_change import EquipmentChange
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
from module.hard.assets import *
from module.map.assets import *
<<<<<<< HEAD
class HardEquipment(Equipment):
=======
class HardEquipment(EquipmentChange):
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
def equipment_take_on(self):
if self.config.FLEET_HARD_EQUIPMENT is None:
return False
if self.equipment_has_take_on:
return False
<<<<<<< HEAD
enter = EQUIP_ENTER_1 if self.config.FLEET_HARD == 1 else EQUIP_ENTER_2
super().equipment_take_on(enter=enter, out=FLEET_PREPARATION, fleet=self.config.FLEET_HARD_EQUIPMENT)
=======
enter = EQUIP_ENTER_1 if self.config.Hard_HardFleet == 1 else EQUIP_ENTER_2
self.fleet_equipment_take_on_preset(preset_record=self.config.FLEET_HARD_EQUIPMENT, enter=enter,
long_click=True, out=FLEET_PREPARATION)
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
return True
def equipment_take_off(self):
@@ -20,6 +35,11 @@ class HardEquipment(Equipment):
if not self.equipment_has_take_on:
return False
<<<<<<< HEAD
enter = EQUIP_ENTER_1 if self.config.FLEET_HARD == 1 else EQUIP_ENTER_2
super().equipment_take_off(enter=enter, out=FLEET_PREPARATION, fleet=self.config.FLEET_HARD_EQUIPMENT)
=======
enter = EQUIP_ENTER_1 if self.config.Hard_HardFleet == 1 else EQUIP_ENTER_2
self.fleet_equipment_take_off(enter=enter, long_click=True, out=FLEET_PREPARATION)
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
return True