1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-26 20:57:54 +08:00

Fix: [EN] shop and supply pack tasks

This commit is contained in:
nEEtdo0d
2025-08-26 21:23:14 -04:00
parent a6e3706ae4
commit 5a9a227ff8
21 changed files with 137 additions and 22 deletions

View File

@@ -4,7 +4,7 @@ from scipy import signal
import module.config.server as server
from module.base.button import ButtonGrid
from module.base.decorator import cached_property, del_cached_property
from module.base.decorator import Config, cached_property, del_cached_property
from module.base.timer import Timer
from module.base.utils import area_offset
from module.logger import logger
@@ -345,8 +345,10 @@ class MedalShop2_250814(MedalShop2):
shop_grid = self.shop_grid
shop_medal_items = ShopItemGrid_250814(
shop_grid,
templates={}, amount_area=(60, 74, 96, 95),
price_area=(14, 122, 85, 149), cost_area=(-12, 115, 60, 155))
templates={},
amount_area=(60, 74, 96, 95),
cost_area=(-12, 115, 60, 155),
price_area=self._shop_medal_price_area)
shop_medal_items.load_template_folder(self.shop_template_folder)
shop_medal_items.load_cost_template_folder('./assets/shop/cost')
shop_medal_items.similarity = 0.85 # Lower the threshold for consistent matches of PR/DRBP
@@ -354,6 +356,24 @@ class MedalShop2_250814(MedalShop2):
shop_medal_items.price_ocr = PRICE_OCR_250814
return shop_medal_items
@cached_property
@Config.when(SERVER='en')
def _shop_medal_price_area(self):
"""
Returns:
tuple:
"""
return 18, 121, 85, 160
@cached_property
@Config.when(SERVER=None)
def _shop_medal_price_area(self):
"""
Returns:
tuple:
"""
return 14, 122, 85, 149
def run(self):
"""
Run Medal Shop