ReDawn/M-AzurLaneAutoScript
1
0
Fork 0
mirror of https://github.com/W1NDes/M-AzurLaneAutoScript.git synced 2026-05-14 07:08:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix(storage): 修复了科研装备箱不足时的报错

Browse Source
This commit is contained in:
W1NDes 2025-07-06 14:08:03 +08:00
parent 350f3eefe4
commit 6fd4cdc797
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
module/storage/storage.py
View File

@ -15,7 +15,7 @@ from module.storage.assets import *
from module.storage.ui import StorageUI
from module.ui.assets import BACK_ARROW, STORAGE_CHECK
from module.ui.scroll import Scroll
from module.exception import GameTooManyClickError
MATERIAL_SCROLL = Scroll(METERIAL_SCROLL, color=(247, 211, 66))
EQUIPMENT_GRIDS = ButtonGrid(origin=(140, 88), delta=(159, 178), button_shape=(124, 124),
@ -96,10 +96,13 @@ class StorageHandler(StorageUI):
if retry.reached():
button = AMOUNT_PLUS if diff > 0 else AMOUNT_MINUS
self.device.multi_click(button, n=abs(diff), interval=(0.1, 0.2))
try:
self.device.multi_click(button, n=abs(diff), interval=(0.1, 0.2))
except GameTooManyClickError:
return current
retry.reset()
return True
return amount
def _storage_use_one_box(self, button, amount=1):
"""
@ -156,10 +159,10 @@ class StorageHandler(StorageUI):
# use match_template_color on BOX_AMOUNT_CONFIRM
# a long animation that opens a box, will be on the top of BOX_AMOUNT_CONFIRM
if self.match_template_color(BOX_AMOUNT_CONFIRM, offset=(20, 20), interval=5):
self._handle_use_box_amount(amount)
real_used = self._handle_use_box_amount(amount)
self.device.click(BOX_AMOUNT_CONFIRM)
self.interval_reset(BOX_AMOUNT_CONFIRM)
used = amount
used = real_used
continue
if self.appear_then_click(EQUIP_CONFIRM, offset=(20, 20), interval=5):
self.interval_reset(MATERIAL_CHECK)