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

Fix: [EN] shop and supply pack tasks

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
module/shop/assets.py
View File

@@ -16,7 +16,7 @@ SHOP_BUY_CONFIRM = Button(area={'cn': (703, 483, 876, 540), 'en': (708, 487, 872
SHOP_BUY_CONFIRM_AMOUNT = Button(area={'cn': (756, 622, 827, 653), 'en': (724, 623, 856, 650), 'jp': (756, 623, 826, 653), 'tw': (756, 623, 827, 653)}, color={'cn': (137, 168, 209), 'en': (146, 174, 211), 'jp': (123, 158, 204), 'tw': (139, 170, 210)}, button={'cn': (756, 622, 827, 653), 'en': (724, 623, 856, 650), 'jp': (756, 623, 826, 653), 'tw': (756, 623, 827, 653)}, file={'cn': './assets/cn/shop/SHOP_BUY_CONFIRM_AMOUNT.png', 'en': './assets/en/shop/SHOP_BUY_CONFIRM_AMOUNT.png', 'jp': './assets/jp/shop/SHOP_BUY_CONFIRM_AMOUNT.png', 'tw': './assets/tw/shop/SHOP_BUY_CONFIRM_AMOUNT.png'})
SHOP_BUY_CONFIRM_MISTAKE = Button(area={'cn': (590, 300, 612, 318), 'en': (590, 300, 612, 318), 'jp': (590, 300, 612, 318), 'tw': (590, 300, 612, 318)}, color={'cn': (154, 79, 103), 'en': (154, 79, 103), 'jp': (154, 79, 103), 'tw': (154, 79, 103)}, button={'cn': (590, 300, 612, 318), 'en': (590, 300, 612, 318), 'jp': (590, 300, 612, 318), 'tw': (590, 300, 612, 318)}, file={'cn': './assets/cn/shop/SHOP_BUY_CONFIRM_MISTAKE.png', 'en': './assets/en/shop/SHOP_BUY_CONFIRM_MISTAKE.png', 'jp': './assets/jp/shop/SHOP_BUY_CONFIRM_MISTAKE.png', 'tw': './assets/tw/shop/SHOP_BUY_CONFIRM_MISTAKE.png'})
SHOP_BUY_CONFIRM_SELECT = Button(area={'cn': (604, 642, 676, 671), 'en': (567, 630, 712, 675), 'jp': (588, 638, 689, 669), 'tw': (558, 627, 725, 680)}, color={'cn': (236, 191, 130), 'en': (229, 171, 90), 'jp': (230, 170, 89), 'tw': (225, 155, 60)}, button={'cn': (604, 642, 676, 671), 'en': (567, 630, 712, 675), 'jp': (588, 638, 689, 669), 'tw': (558, 627, 725, 680)}, file={'cn': './assets/cn/shop/SHOP_BUY_CONFIRM_SELECT.png', 'en': './assets/en/shop/SHOP_BUY_CONFIRM_SELECT.png', 'jp': './assets/jp/shop/SHOP_BUY_CONFIRM_SELECT.png', 'tw': './assets/tw/shop/SHOP_BUY_CONFIRM_SELECT.png'})
SHOP_CLICK_SAFE_AREA = Button(area={'cn': (1051, 137, 1218, 179), 'en': (108, 108, 143, 233), 'jp': (1051, 137, 1218, 179), 'tw': (108, 108, 143, 233)}, color={'cn': (150, 181, 163), 'en': (50, 57, 76), 'jp': (150, 181, 163), 'tw': (50, 57, 76)}, button={'cn': (1051, 137, 1218, 179), 'en': (108, 108, 143, 233), 'jp': (1051, 137, 1218, 179), 'tw': (108, 108, 143, 233)}, file={'cn': './assets/cn/shop/SHOP_CLICK_SAFE_AREA.png', 'en': './assets/en/shop/SHOP_CLICK_SAFE_AREA.png', 'jp': './assets/jp/shop/SHOP_CLICK_SAFE_AREA.png', 'tw': './assets/tw/shop/SHOP_CLICK_SAFE_AREA.png'})
SHOP_CLICK_SAFE_AREA = Button(area={'cn': (1051, 137, 1218, 179), 'en': (1051, 137, 1218, 179), 'jp': (1051, 137, 1218, 179), 'tw': (108, 108, 143, 233)}, color={'cn': (150, 181, 163), 'en': (150, 181, 163), 'jp': (150, 181, 163), 'tw': (50, 57, 76)}, button={'cn': (1051, 137, 1218, 179), 'en': (1051, 137, 1218, 179), 'jp': (1051, 137, 1218, 179), 'tw': (108, 108, 143, 233)}, file={'cn': './assets/cn/shop/SHOP_CLICK_SAFE_AREA.png', 'en': './assets/en/shop/SHOP_CLICK_SAFE_AREA.png', 'jp': './assets/jp/shop/SHOP_CLICK_SAFE_AREA.png', 'tw': './assets/tw/shop/SHOP_CLICK_SAFE_AREA.png'})
SHOP_CORE = Button(area={'cn': (1163, 174, 1261, 198), 'en': (1163, 174, 1261, 198), 'jp': (1163, 174, 1261, 198), 'tw': (1163, 174, 1261, 198)}, color={'cn': (88, 91, 101), 'en': (88, 91, 101), 'jp': (88, 91, 101), 'tw': (88, 91, 101)}, button={'cn': (1163, 174, 1261, 198), 'en': (1163, 174, 1261, 198), 'jp': (1163, 174, 1261, 198), 'tw': (1163, 174, 1261, 198)}, file={'cn': './assets/cn/shop/SHOP_CORE.png', 'en': './assets/en/shop/SHOP_CORE.png', 'jp': './assets/jp/shop/SHOP_CORE.png', 'tw': './assets/tw/shop/SHOP_CORE.png'})
SHOP_CORE_SWIPE_END = Button(area={'cn': (1135, 659, 1216, 678), 'en': (1137, 658, 1182, 676), 'jp': (1093, 660, 1199, 679), 'tw': (1135, 659, 1216, 678)}, color={'cn': (126, 126, 128), 'en': (126, 126, 128), 'jp': (81, 81, 85), 'tw': (126, 126, 128)}, button={'cn': (1135, 659, 1216, 678), 'en': (1137, 658, 1182, 676), 'jp': (1093, 660, 1199, 679), 'tw': (1135, 659, 1216, 678)}, file={'cn': './assets/cn/shop/SHOP_CORE_SWIPE_END.png', 'en': './assets/en/shop/SHOP_CORE_SWIPE_END.png', 'jp': './assets/jp/shop/SHOP_CORE_SWIPE_END.png', 'tw': './assets/cn/shop/SHOP_CORE_SWIPE_END.png'})
SHOP_GEMS = Button(area={'cn': (1035, 23, 1133, 51), 'en': (1035, 23, 1133, 51), 'jp': (1035, 23, 1133, 51), 'tw': (1035, 23, 1133, 51)}, color={'cn': (55, 56, 53), 'en': (55, 56, 53), 'jp': (55, 56, 53), 'tw': (55, 56, 53)}, button={'cn': (1035, 23, 1133, 51), 'en': (1035, 23, 1133, 51), 'jp': (1035, 23, 1133, 51), 'tw': (1035, 23, 1133, 51)}, file={'cn': './assets/cn/shop/SHOP_GEMS.png', 'en': './assets/en/shop/SHOP_GEMS.png', 'jp': './assets/jp/shop/SHOP_GEMS.png', 'tw': './assets/tw/shop/SHOP_GEMS.png'})
@@ -29,10 +29,10 @@ SHOP_MERIT = Button(area={'cn': (876, 173, 971, 197), 'en': (876, 173, 971, 197)
SHOP_MERIT_SWIPE_END = Button(area={'cn': (1135, 660, 1215, 678), 'en': (1131, 658, 1193, 676), 'jp': (1101, 677, 1211, 700), 'tw': (1131, 676, 1217, 694)}, color={'cn': (138, 139, 140), 'en': (119, 119, 122), 'jp': (77, 78, 84), 'tw': (140, 140, 142)}, button={'cn': (1135, 660, 1215, 678), 'en': (1131, 658, 1193, 676), 'jp': (1101, 677, 1211, 700), 'tw': (1131, 676, 1217, 694)}, file={'cn': './assets/cn/shop/SHOP_MERIT_SWIPE_END.png', 'en': './assets/en/shop/SHOP_MERIT_SWIPE_END.png', 'jp': './assets/jp/shop/SHOP_MERIT_SWIPE_END.png', 'tw': './assets/tw/shop/SHOP_MERIT_SWIPE_END.png'})
SHOP_META_SWIPE_END = Button(area={'cn': (394, 661, 494, 677), 'en': (381, 658, 472, 676), 'jp': (377, 663, 477, 678), 'tw': (394, 661, 494, 677)}, color={'cn': (126, 127, 129), 'en': (127, 128, 130), 'jp': (106, 107, 109), 'tw': (126, 127, 129)}, button={'cn': (394, 661, 494, 677), 'en': (381, 658, 472, 676), 'jp': (377, 663, 477, 678), 'tw': (394, 661, 494, 677)}, file={'cn': './assets/cn/shop/SHOP_META_SWIPE_END.png', 'en': './assets/en/shop/SHOP_META_SWIPE_END.png', 'jp': './assets/jp/shop/SHOP_META_SWIPE_END.png', 'tw': './assets/cn/shop/SHOP_META_SWIPE_END.png'})
SHOP_OCR_BALANCE = Button(area={'cn': (903, 164, 983, 189), 'en': (903, 164, 983, 189), 'jp': (903, 164, 983, 189), 'tw': (903, 164, 983, 189)}, color={'cn': (210, 215, 220), 'en': (210, 215, 220), 'jp': (210, 215, 220), 'tw': (210, 215, 220)}, button={'cn': (903, 164, 983, 189), 'en': (903, 164, 983, 189), 'jp': (903, 164, 983, 189), 'tw': (903, 164, 983, 189)}, file={'cn': './assets/cn/shop/SHOP_OCR_BALANCE.png', 'en': './assets/cn/shop/SHOP_OCR_BALANCE.png', 'jp': './assets/cn/shop/SHOP_OCR_BALANCE.png', 'tw': './assets/cn/shop/SHOP_OCR_BALANCE.png'})
SHOP_OCR_OIL = Button(area={'cn': (700, 23, 785, 47), 'en': (700, 23, 785, 47), 'jp': (700, 23, 785, 47), 'tw': (700, 23, 785, 47)}, color={'cn': (150, 185, 194), 'en': (150, 185, 194), 'jp': (150, 185, 194), 'tw': (150, 185, 194)}, button={'cn': (700, 23, 785, 47), 'en': (700, 23, 785, 47), 'jp': (700, 23, 785, 47), 'tw': (700, 23, 785, 47)}, file={'cn': './assets/cn/shop/SHOP_OCR_OIL.png', 'en': './assets/cn/shop/SHOP_OCR_OIL.png', 'jp': './assets/cn/shop/SHOP_OCR_OIL.png', 'tw': './assets/cn/shop/SHOP_OCR_OIL.png'})
SHOP_OCR_OIL_CHECK = Button(area={'cn': (666, 30, 682, 43), 'en': (666, 30, 682, 43), 'jp': (666, 30, 682, 43), 'tw': (666, 30, 682, 43)}, color={'cn': (73, 73, 73), 'en': (73, 73, 73), 'jp': (73, 73, 73), 'tw': (73, 73, 73)}, button={'cn': (666, 30, 682, 43), 'en': (666, 30, 682, 43), 'jp': (666, 30, 682, 43), 'tw': (666, 30, 682, 43)}, file={'cn': './assets/cn/shop/SHOP_OCR_OIL_CHECK.png', 'en': './assets/cn/shop/SHOP_OCR_OIL_CHECK.png', 'jp': './assets/cn/shop/SHOP_OCR_OIL_CHECK.png', 'tw': './assets/cn/shop/SHOP_OCR_OIL_CHECK.png'})
SHOP_OCR_OIL = Button(area={'cn': (700, 23, 785, 47), 'en': (700, 23, 785, 47), 'jp': (700, 23, 785, 47), 'tw': (700, 23, 785, 47)}, color={'cn': (150, 185, 194), 'en': (150, 185, 194), 'jp': (150, 185, 194), 'tw': (150, 185, 194)}, button={'cn': (700, 23, 785, 47), 'en': (700, 23, 785, 47), 'jp': (700, 23, 785, 47), 'tw': (700, 23, 785, 47)}, file={'cn': './assets/cn/shop/SHOP_OCR_OIL.png', 'en': './assets/en/shop/SHOP_OCR_OIL.png', 'jp': './assets/cn/shop/SHOP_OCR_OIL.png', 'tw': './assets/cn/shop/SHOP_OCR_OIL.png'})
SHOP_OCR_OIL_CHECK = Button(area={'cn': (666, 30, 682, 43), 'en': (666, 30, 682, 43), 'jp': (666, 30, 682, 43), 'tw': (666, 30, 682, 43)}, color={'cn': (73, 73, 73), 'en': (73, 73, 73), 'jp': (73, 73, 73), 'tw': (73, 73, 73)}, button={'cn': (666, 30, 682, 43), 'en': (666, 30, 682, 43), 'jp': (666, 30, 682, 43), 'tw': (666, 30, 682, 43)}, file={'cn': './assets/cn/shop/SHOP_OCR_OIL_CHECK.png', 'en': './assets/en/shop/SHOP_OCR_OIL_CHECK.png', 'jp': './assets/cn/shop/SHOP_OCR_OIL_CHECK.png', 'tw': './assets/cn/shop/SHOP_OCR_OIL_CHECK.png'})
SHOP_PROTOTYPE_SWIPE_END = Button(area={'cn': (1135, 660, 1215, 678), 'en': (1101, 658, 1215, 676), 'jp': (1097, 660, 1199, 678), 'tw': (1135, 660, 1215, 678)}, color={'cn': (136, 137, 139), 'en': (111, 112, 115), 'jp': (86, 87, 91), 'tw': (136, 137, 139)}, button={'cn': (1135, 660, 1215, 678), 'en': (1101, 658, 1215, 676), 'jp': (1097, 660, 1199, 678), 'tw': (1135, 660, 1215, 678)}, file={'cn': './assets/cn/shop/SHOP_PROTOTYPE_SWIPE_END.png', 'en': './assets/en/shop/SHOP_PROTOTYPE_SWIPE_END.png', 'jp': './assets/jp/shop/SHOP_PROTOTYPE_SWIPE_END.png', 'tw': './assets/cn/shop/SHOP_PROTOTYPE_SWIPE_END.png'})
SHOP_REFRESH = Button(area={'cn': (950, 660, 1003, 684), 'en': (1161, 162, 1270, 206), 'jp': (1161, 162, 1270, 206), 'tw': (1161, 162, 1270, 206)}, color={'cn': (73, 164, 221), 'en': (181, 141, 82), 'jp': (178, 142, 84), 'tw': (179, 143, 88)}, button={'cn': (950, 660, 1003, 684), 'en': (1161, 162, 1270, 206), 'jp': (1161, 162, 1270, 206), 'tw': (1161, 162, 1270, 206)}, file={'cn': './assets/cn/shop/SHOP_REFRESH.png', 'en': './assets/en/shop/SHOP_REFRESH.png', 'jp': './assets/jp/shop/SHOP_REFRESH.png', 'tw': './assets/tw/shop/SHOP_REFRESH.png'})
SHOP_REFRESH = Button(area={'cn': (950, 660, 1003, 684), 'en': (950, 660, 1003, 684), 'jp': (1161, 162, 1270, 206), 'tw': (1161, 162, 1270, 206)}, color={'cn': (73, 164, 221), 'en': (73, 164, 221), 'jp': (178, 142, 84), 'tw': (179, 143, 88)}, button={'cn': (950, 660, 1003, 684), 'en': (950, 660, 1003, 684), 'jp': (1161, 162, 1270, 206), 'tw': (1161, 162, 1270, 206)}, file={'cn': './assets/cn/shop/SHOP_REFRESH.png', 'en': './assets/en/shop/SHOP_REFRESH.png', 'jp': './assets/jp/shop/SHOP_REFRESH.png', 'tw': './assets/tw/shop/SHOP_REFRESH.png'})
SHOP_SELECT_PR1 = Button(area={'cn': (182, 212, 308, 339), 'en': (182, 212, 308, 339), 'jp': (182, 212, 308, 339), 'tw': (182, 212, 308, 339)}, color={'cn': (157, 158, 143), 'en': (157, 158, 143), 'jp': (157, 158, 143), 'tw': (157, 158, 143)}, button={'cn': (182, 212, 308, 339), 'en': (182, 212, 308, 339), 'jp': (182, 212, 308, 339), 'tw': (182, 212, 308, 339)}, file={'cn': './assets/cn/shop/SHOP_SELECT_PR1.png', 'en': './assets/en/shop/SHOP_SELECT_PR1.png', 'jp': './assets/jp/shop/SHOP_SELECT_PR1.png', 'tw': './assets/tw/shop/SHOP_SELECT_PR1.png'})
SHOP_SELECT_PR2 = Button(area={'cn': (182, 212, 310, 340), 'en': (182, 212, 310, 340), 'jp': (182, 212, 310, 340), 'tw': (182, 212, 310, 340)}, color={'cn': (160, 159, 145), 'en': (160, 159, 145), 'jp': (160, 159, 145), 'tw': (160, 159, 145)}, button={'cn': (182, 212, 310, 340), 'en': (182, 212, 310, 340), 'jp': (182, 212, 310, 340), 'tw': (182, 212, 310, 340)}, file={'cn': './assets/cn/shop/SHOP_SELECT_PR2.png', 'en': './assets/en/shop/SHOP_SELECT_PR2.png', 'jp': './assets/jp/shop/SHOP_SELECT_PR2.png', 'tw': './assets/tw/shop/SHOP_SELECT_PR2.png'})
SHOP_SELECT_PR3 = Button(area={'cn': (180, 212, 309, 340), 'en': (180, 212, 309, 340), 'jp': (180, 212, 309, 340), 'tw': (180, 212, 309, 340)}, color={'cn': (156, 156, 142), 'en': (156, 156, 142), 'jp': (156, 156, 142), 'tw': (156, 156, 142)}, button={'cn': (180, 212, 309, 340), 'en': (180, 212, 309, 340), 'jp': (180, 212, 309, 340), 'tw': (180, 212, 309, 340)}, file={'cn': './assets/cn/shop/SHOP_SELECT_PR3.png', 'en': './assets/en/shop/SHOP_SELECT_PR3.png', 'jp': './assets/jp/shop/SHOP_SELECT_PR3.png', 'tw': './assets/tw/shop/SHOP_SELECT_PR3.png'})

22
module/shop/shop_core.py
View File

@@ -1,4 +1,4 @@
from module.base.decorator import cached_property
from module.base.decorator import Config, cached_property
from module.logger import logger
from module.shop.assets import *
from module.shop.base import ShopItemGrid, ShopItemGrid_250814
@@ -110,8 +110,26 @@ class CoreShop_250814(CoreShop):
template_area=(25, 20, 82, 72),
amount_area=(42, 50, 65, 65),
cost_area=(-12, 115, 60, 155),
price_area=(18, 121, 85, 150),
price_area=self._shop_core_price_area,
)
shop_core_items.load_template_folder(self.shop_template_folder)
shop_core_items.load_cost_template_folder('./assets/shop/cost')
return shop_core_items
@cached_property
@Config.when(SERVER='en')
def _shop_core_price_area(self):
"""
Returns:
tuple:
"""
return 18, 121, 85, 160
@cached_property
@Config.when(SERVER=None)
def _shop_core_price_area(self):
"""
Returns:
tuple:
"""
return 18, 121, 85, 150

22
module/shop/shop_general.py
View File

@@ -1,4 +1,4 @@
from module.base.decorator import cached_property
from module.base.decorator import Config, cached_property
from module.logger import logger
from module.ocr.ocr import Digit
from module.shop.assets import *
@@ -171,8 +171,26 @@ class GeneralShop_250814(GeneralShop):
template_area=(25, 20, 82, 72),
amount_area=(42, 50, 65, 65),
cost_area=(-12, 115, 60, 155),
price_area=(14, 121, 85, 150),
price_area=self._shop_general_price_area,
)
shop_general_items.load_template_folder(self.shop_template_folder)
shop_general_items.load_cost_template_folder('./assets/shop/cost')
return shop_general_items
@cached_property
@Config.when(SERVER='en')
def _shop_general_price_area(self):
"""
Returns:
tuple:
"""
return 18, 121, 85, 160
@cached_property
@Config.when(SERVER=None)
def _shop_general_price_area(self):
"""
Returns:
tuple:
"""
return 14, 121, 85, 150

22
module/shop/shop_guild.py
View File

@@ -1,4 +1,4 @@
from module.base.decorator import cached_property
from module.base.decorator import Config, cached_property
from module.logger import logger
from module.shop.assets import *
from module.shop.base import ShopItemGrid, ShopItemGrid_250814
@@ -123,9 +123,27 @@ class GuildShop_250814(GuildShop):
template_area=(25, 20, 82, 72),
amount_area=(42, 50, 65, 65),
cost_area=(-12, 115, 60, 155),
price_area=(14, 121, 85, 150),
price_area=self._shop_guild_price_area,
)
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')
return shop_guild_items
@cached_property
@Config.when(SERVER='en')
def _shop_guild_price_area(self):
"""
Returns:
tuple:
"""
return 18, 121, 85, 160
@cached_property
@Config.when(SERVER=None)
def _shop_guild_price_area(self):
"""
Returns:
tuple:
"""
return 14, 121, 85, 150

26
module/shop/shop_medal.py
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

22
module/shop/shop_merit.py
View File

@@ -1,4 +1,4 @@
from module.base.decorator import cached_property
from module.base.decorator import Config, cached_property
from module.logger import logger
from module.shop.base import ShopItemGrid, ShopItemGrid_250814
from module.shop.clerk import ShopClerk
@@ -93,8 +93,26 @@ class MeritShop_250814(MeritShop):
template_area=(25, 20, 82, 72),
amount_area=(42, 50, 65, 65),
cost_area=(-12, 115, 60, 155),
price_area=(14, 121, 85, 150),
price_area=self._shop_merit_price_area
)
shop_merit_items.load_template_folder(self.shop_template_folder)
shop_merit_items.load_cost_template_folder('./assets/shop/cost')
return shop_merit_items
@cached_property
@Config.when(SERVER='en')
def _shop_merit_price_area(self):
"""
Returns:
tuple:
"""
return 18, 121, 85, 160
@cached_property
@Config.when(SERVER=None)
def _shop_merit_price_area(self):
"""
Returns:
tuple:
"""
return 18, 121, 85, 150

4
module/shop/shop_reward.py
View File

@@ -15,7 +15,7 @@ class RewardShop(ShopUI):
self.shop_tab.set(main=self, left=2)
self.shop_nav.set(main=self, upper=1)
GeneralShop(self.config, self.device).run()
elif self.config.SERVER in ['cn']:
elif self.config.SERVER in ['cn', 'en']:
self.device.click_record_clear()
self.shop_tab_250814.set(main=self, upper=1)
self.shop_nav_250814.set(main=self, left=1)
@@ -46,7 +46,7 @@ class RewardShop(ShopUI):
self.shop_tab.set(main=self, left=1)
self.shop_nav.set(main=self, upper=3)
MedalShop2(self.config, self.device).run()
elif self.config.SERVER in ['cn']:
elif self.config.SERVER in ['cn', 'en']:
self.device.click_record_clear()
self.shop_tab_250814.set(main=self, upper=1)
self.shop_nav_250814.set(main=self, left=2)

23
module/shop/ui.py
View File

@@ -99,6 +99,29 @@ class ShopUI(UI):
)
@cached_property
@Config.when(SERVER='en')
def shop_tab_250814(self):
"""
Set with `self.shop_tab.set(main=self, upper={index})`
- index
1: General supply shops
2: Monthly shops
3: Event shops
"""
grids = ButtonGrid(
origin=(29, 519), delta=(0, 50),
button_shape=(60, 15), grid_shape=(1, 3),
name='SHOP_TAB')
return Navbar(
grids=grids,
# blue text active
active_color=(0, 131, 255), active_threshold=221, active_count=100,
# white text inactive
inactive_color=(249, 252, 253), inactive_threshold=221, inactive_count=100,
)
@cached_property
@Config.when(SERVER=None)
def shop_tab_250814(self):
"""
Set with `self.shop_tab.set(main=self, upper={index})`