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

Fix: handle StorageFull when using box

Browse Source
This commit is contained in:
LmeSzinc
2025-05-23 15:24:21 +08:00
parent f6e0a0bba2
commit ad5de4e2ed
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
module/storage/storage.py
View File

@@ -425,14 +425,29 @@ class StorageHandler(StorageUI):
break break
self._storage_enter_material() self._storage_enter_material()
try:
boxes = self._storage_use_box_execute(rarity=rarity, amount=amount - disassembled) boxes = self._storage_use_box_execute(rarity=rarity, amount=amount - disassembled)
if boxes <= 0: if boxes <= 0:
logger.warning('No more boxes to use, disassemble equipment end') logger.warning('No more boxes to use, disassemble equipment end')
self.storage_has_boxes = False self.storage_has_boxes = False
break break
# since 2025.05.20, equipments in boxes get disassembled automatically # since 2025.05.20, equipments in boxes get disassembled automatically
disassembled += boxes disassembled += boxes
# use bos success, check total again
continue
except StorageFull:
pass
# handle storage full
self._storage_enter_disassemble()
equip = self._storage_disassemble_equipment_execute(rarity=rarity, amount=amount)
disassembled += equip
if equip <= 0:
logger.warning('StorageFull but unable to disassemble, '
'probably because storage is full of rare equipments or above, '
'disassemble equipment end')
logger.warning('Please manually disassemble some equipments to free up storage')
self.storage_has_boxes = False
break
return disassembled return disassembled