1
0
mirror of https://github.com/TheFunny/ArisuAutoSweeper synced 2025-12-17 00:15:13 +00:00

fix(popup): make correction to ap exceed and add insufficient inventory for JP

This commit is contained in:
YoursFunny 2023-11-17 14:09:34 +08:00
parent 84f78230d2
commit 8781e7830c
Signed by: YoursFunny
GPG Key ID: 207EDC3CD5B40F9C
7 changed files with 19 additions and 5 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

View File

@ -24,10 +24,10 @@ AP_EXCEED = ButtonWrapper(
name='AP_EXCEED', name='AP_EXCEED',
jp=Button( jp=Button(
file='./assets/jp/base/popup/AP_EXCEED.png', file='./assets/jp/base/popup/AP_EXCEED.png',
area=(610, 124, 669, 153), area=(611, 147, 669, 177),
search=(590, 104, 689, 173), search=(591, 127, 689, 197),
color=(139, 153, 168), color=(143, 156, 170),
button=(535, 494, 746, 565), button=(539, 470, 743, 533),
), ),
en=Button( en=Button(
file='./assets/en/base/popup/AP_EXCEED.png', file='./assets/en/base/popup/AP_EXCEED.png',
@ -124,7 +124,13 @@ GET_REWARD_SKIP = ButtonWrapper(
) )
INSUFFICIENT_INVENTORY = ButtonWrapper( INSUFFICIENT_INVENTORY = ButtonWrapper(
name='INSUFFICIENT_INVENTORY', name='INSUFFICIENT_INVENTORY',
jp=None, jp=Button(
file='./assets/jp/base/popup/INSUFFICIENT_INVENTORY.png',
area=(610, 124, 669, 153),
search=(590, 104, 689, 173),
color=(139, 153, 168),
button=(535, 494, 746, 565),
),
en=Button( en=Button(
file='./assets/en/base/popup/INSUFFICIENT_INVENTORY.png', file='./assets/en/base/popup/INSUFFICIENT_INVENTORY.png',
area=(578, 117, 703, 152), area=(578, 117, 703, 152),

View File

@ -94,6 +94,12 @@ class PopupHandler(ModuleBase):
return False return False
def handle_insufficient_inventory(self, interval=5) -> bool:
if self.appear_then_click(INSUFFICIENT_INVENTORY, interval=interval):
return True
return False
def handle_item_expired(self, interval=5) -> bool: def handle_item_expired(self, interval=5) -> bool:
if self.appear_then_click(ITEM_EXPIRED, interval=interval): if self.appear_then_click(ITEM_EXPIRED, interval=interval):
return True return True

View File

@ -345,6 +345,8 @@ class UI(MainPage):
return True return True
if self.handle_ap_exceed(): if self.handle_ap_exceed():
return True return True
if self.handle_insufficient_inventory():
return True
if self.handle_item_expired(): if self.handle_item_expired():
return True return True