sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 03:58:22 +08:00
Code Activity

Upd: Update new UI 20250814 for server JP, update CN assets

Browse Source
This commit is contained in:
weeswelai
2025-08-21 23:58:41 +08:00
parent ef22869306
commit 87257e65a8
15 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/shop/shop_general.py
View File

@@ -165,7 +165,7 @@ class GeneralShop_250814(GeneralShop):
"""
shop_grid = self.shop_grid
shop_general_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_general_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=(14, 121, 85, 150))
shop_general_items.load_template_folder(self.shop_template_folder)
shop_general_items.load_cost_template_folder('./assets/shop/cost')
return shop_general_items

2
module/shop/shop_guild.py
View File

@@ -117,7 +117,7 @@ class GuildShop_250814(GuildShop):
ShopItemGrid:
"""
shop_grid = self.shop_grid
shop_guild_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_guild_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=(14, 121, 85, 150))
self.shop_template_folder = './assets/shop/guild'
shop_guild_items.load_template_folder(self.shop_template_folder)
shop_guild_items.load_cost_template_folder('./assets/shop/cost')

8
module/shop/shop_medal.py
View File

@@ -2,6 +2,7 @@ import cv2
import numpy as np
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.timer import Timer
@@ -64,7 +65,10 @@ class ShopPriceOcr(DigitYuv):
PRICE_OCR = ShopPriceOcr([], letter=(255, 223, 57), threshold=32, name='Price_ocr')
PRICE_OCR_250814 = DigitYuv([], letter=(255, 255, 255), threshold=128, name='Price_ocr')
if server.server == 'jp':
PRICE_OCR_250814 = Digit([], lang='cnocr', letter=(235, 235, 255), threshold=128, name='Price_ocr')
else:
PRICE_OCR_250814 = Digit([], letter=(255, 255, 255), threshold=128, name='Price_ocr')
TEMPLATE_MEDAL_ICON = Template('./assets/shop/cost/Medal.png')
TEMPLATE_MEDAL_ICON_2 = Template('./assets/shop/cost/Medal_2.png')
TEMPLATE_MEDAL_ICON_3 = Template('./assets/shop/cost/Medal_3.png')
@@ -342,7 +346,7 @@ class MedalShop_250814(MedalShop2):
shop_medal_items = ShopItemGrid_250814(
shop_grid,
templates={}, amount_area=(60, 74, 96, 95),
price_area=(18, 121, 76, 150), cost_area=(-12, 115, 60, 155))
price_area=(14, 122, 85, 149), cost_area=(-12, 115, 60, 155))
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

2
module/shop/shop_merit.py
View File

@@ -87,7 +87,7 @@ class MeritShop_250814(MeritShop):
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 = 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=(14, 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