1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-20 06:04:59 +08:00

Fix: shop_medal refactor UI and route for base functionality

This commit is contained in:
nEEtdo0d
2022-06-04 20:59:06 -04:00
parent b65c729380
commit cf8adaff38
8 changed files with 41 additions and 14 deletions

View File

@@ -25,7 +25,7 @@ class MedalShop(ShopClerk):
ButtonGrid:
"""
shop_grid = ButtonGrid(
origin=(197, 193), delta=(223, 190), button_shape=(100.5, 100.5), grid_shape=(3, 2), name='SHOP_GRID')
origin=(489, 149), delta=(156, 213), button_shape=(96, 96), grid_shape=(5, 2), name='SHOP_GRID')
return shop_grid
@cached_property
@@ -56,7 +56,9 @@ class MedalShop(ShopClerk):
"""
shop_grid = self.shop_grid
shop_medal_items = ShopItemGrid(
shop_grid, templates={}, amount_area=(60, 74, 96, 95), price_area=(52, 134, 132, 162))
shop_grid,
templates={}, amount_area=(60, 74, 96, 95),
price_area=(52, 132, 132, 162))
shop_medal_items.load_template_folder('./assets/shop/medal')
shop_medal_items.load_cost_template_folder('./assets/shop/cost')
shop_medal_items.similarity = 0.88 # Lower the threshold for consistent matches of PR/DRBP
@@ -99,6 +101,36 @@ class MedalShop(ShopClerk):
return False
return True
def shop_interval_clear(self):
"""
Clear interval on select assets for
shop_buy_handle
"""
super().shop_interval_clear()
self.interval_clear(SHOP_BUY_CONFIRM_SELECT)
self.interval_clear(SHOP_BUY_CONFIRM_AMOUNT)
def shop_buy_handle(self, item):
"""
Handle shop_medal buy interface if detected
Args:
item: Item to handle
Returns:
bool: whether interface was detected and handled
"""
if self.appear(SHOP_BUY_CONFIRM_SELECT, offset=(20, 20), interval=3):
self.shop_buy_select_execute(item)
self.interval_reset(SHOP_BUY_CONFIRM_SELECT)
return True
if self.appear(SHOP_BUY_CONFIRM_AMOUNT, offset=(20, 20), interval=3):
self.shop_buy_amount_execute(item)
self.interval_reset(SHOP_BUY_CONFIRM_AMOUNT)
return True
return False
def run(self):
"""
Run Medal Shop