mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-22 00:09:18 +08:00
Chore: Cleanup code and assets of old UI
This commit is contained in:
@@ -6,7 +6,7 @@ from module.shop.shop_status import ShopStatus
|
||||
from module.shop.ui import ShopUI
|
||||
|
||||
|
||||
class MeritShop(ShopClerk, ShopUI, ShopStatus):
|
||||
class MeritShop_250814(ShopClerk, ShopUI, ShopStatus):
|
||||
shop_template_folder = './assets/shop/merit'
|
||||
|
||||
@cached_property
|
||||
@@ -17,6 +17,7 @@ class MeritShop(ShopClerk, ShopUI, ShopStatus):
|
||||
"""
|
||||
return self.config.MeritShop_Filter.strip()
|
||||
|
||||
# New UI in 2025-08-14
|
||||
@cached_property
|
||||
def shop_merit_items(self):
|
||||
"""
|
||||
@@ -24,7 +25,14 @@ class MeritShop(ShopClerk, ShopUI, ShopStatus):
|
||||
ShopItemGrid:
|
||||
"""
|
||||
shop_grid = self.shop_grid
|
||||
shop_merit_items = ShopItemGrid(shop_grid, templates={}, amount_area=(60, 74, 96, 95))
|
||||
shop_merit_items = ShopItemGrid_250814(
|
||||
shop_grid,
|
||||
templates={},
|
||||
template_area=(25, 20, 82, 72),
|
||||
amount_area=(42, 50, 65, 65),
|
||||
cost_area=(-12, 115, 60, 155),
|
||||
price_area=(18, 121, 85, 150),
|
||||
)
|
||||
shop_merit_items.load_template_folder(self.shop_template_folder)
|
||||
shop_merit_items.load_cost_template_folder('./assets/shop/cost')
|
||||
return shop_merit_items
|
||||
@@ -76,25 +84,3 @@ class MeritShop(ShopClerk, ShopUI, ShopStatus):
|
||||
if refresh and self.shop_refresh():
|
||||
continue
|
||||
break
|
||||
|
||||
|
||||
class MeritShop_250814(MeritShop):
|
||||
# New UI in 2025-08-14
|
||||
@cached_property
|
||||
def shop_merit_items(self):
|
||||
"""
|
||||
Returns:
|
||||
ShopItemGrid:
|
||||
"""
|
||||
shop_grid = self.shop_grid
|
||||
shop_merit_items = ShopItemGrid_250814(
|
||||
shop_grid,
|
||||
templates={},
|
||||
template_area=(25, 20, 82, 72),
|
||||
amount_area=(42, 50, 65, 65),
|
||||
cost_area=(-12, 115, 60, 155),
|
||||
price_area=(18, 121, 85, 150),
|
||||
)
|
||||
shop_merit_items.load_template_folder(self.shop_template_folder)
|
||||
shop_merit_items.load_cost_template_folder('./assets/shop/cost')
|
||||
return shop_merit_items
|
||||
|
||||
Reference in New Issue
Block a user