Upd: Assets for entering supply pack

2025-01-08 12:07:36 +08:00 · 2023-07-13 23:18:01 +08:00 · 2023-07-13 23:18:01 +08:00 · 85bea51b60
commit 85bea51b60
parent 91e4100dc4
9 changed files with 1 additions and 5 deletions
--- a/assets/cn/ui/SHOP_GOTO_SUPPLY_PACK.BUTTON.png
+++ b/assets/cn/ui/SHOP_GOTO_SUPPLY_PACK.BUTTON.png
--- a/assets/cn/ui/SHOP_GOTO_SUPPLY_PACK.png
+++ b/assets/cn/ui/SHOP_GOTO_SUPPLY_PACK.png
--- a/assets/en/ui/SHOP_GOTO_SUPPLY_PACK.BUTTON.png
+++ b/assets/en/ui/SHOP_GOTO_SUPPLY_PACK.BUTTON.png
--- a/assets/en/ui/SHOP_GOTO_SUPPLY_PACK.png
+++ b/assets/en/ui/SHOP_GOTO_SUPPLY_PACK.png
--- a/assets/jp/ui/SHOP_GOTO_SUPPLY_PACK.BUTTON.png
+++ b/assets/jp/ui/SHOP_GOTO_SUPPLY_PACK.BUTTON.png
--- a/assets/jp/ui/SHOP_GOTO_SUPPLY_PACK.png
+++ b/assets/jp/ui/SHOP_GOTO_SUPPLY_PACK.png
--- a/assets/tw/ui/SHOP_GOTO_SUPPLY_PACK.png
+++ b/assets/tw/ui/SHOP_GOTO_SUPPLY_PACK.png
--- a/module/freebies/supply_pack.py
+++ b/module/freebies/supply_pack.py
@ -70,10 +70,6 @@ class SupplyPack(CampaignStatus):
            in: Any page
            out: page_supply_pack, supply pack tab
        """
-        if self.config.SERVER in ['cn', 'en', 'jp']:
-            logger.warning(f'SupplyPack is disabled in server {self.config.SERVER.upper()} until assets are updated')
-            return
-
        self.ui_ensure(page_supply_pack)

        if self.get_oil() < 21000:
--- a/module/ui/assets.py
+++ b/module/ui/assets.py
@ -75,7 +75,7 @@ REWARD_GOTO_TACTICAL = Button(area={'cn': (418, 413, 468, 434), 'en': (428, 413,
 SHIPYARD_CHECK = Button(area={'cn': (9, 131, 82, 148), 'en': (4, 126, 52, 141), 'jp': (8, 130, 82, 148), 'tw': (7, 130, 83, 150)}, color={'cn': (159, 180, 229), 'en': (133, 148, 171), 'jp': (152, 169, 202), 'tw': (142, 164, 219)}, button={'cn': (9, 131, 82, 148), 'en': (4, 126, 52, 141), 'jp': (8, 130, 82, 148), 'tw': (7, 130, 83, 150)}, file={'cn': './assets/cn/ui/SHIPYARD_CHECK.png', 'en': './assets/en/ui/SHIPYARD_CHECK.png', 'jp': './assets/jp/ui/SHIPYARD_CHECK.png', 'tw': './assets/tw/ui/SHIPYARD_CHECK.png'})
 SHOP_CHECK = Button(area={'cn': (121, 14, 174, 39), 'en': (124, 15, 197, 37), 'jp': (121, 14, 229, 39), 'tw': (121, 14, 175, 40)}, color={'cn': (160, 176, 213), 'en': (118, 133, 173), 'jp': (86, 98, 132), 'tw': (154, 170, 207)}, button={'cn': (121, 14, 174, 39), 'en': (124, 15, 197, 37), 'jp': (121, 14, 229, 39), 'tw': (121, 14, 175, 40)}, file={'cn': './assets/cn/ui/SHOP_CHECK.png', 'en': './assets/en/ui/SHOP_CHECK.png', 'jp': './assets/jp/ui/SHOP_CHECK.png', 'tw': './assets/tw/ui/SHOP_CHECK.png'})
 SHOP_GOTO_MUNITIONS = Button(area={'cn': (840, 560, 999, 600), 'en': (840, 560, 999, 600), 'jp': (836, 570, 964, 613), 'tw': (840, 560, 999, 600)}, color={'cn': (122, 87, 75), 'en': (122, 87, 75), 'jp': (118, 88, 83), 'tw': (122, 87, 75)}, button={'cn': (840, 560, 999, 600), 'en': (840, 560, 999, 600), 'jp': (836, 570, 964, 613), 'tw': (840, 560, 999, 600)}, file={'cn': './assets/cn/ui/SHOP_GOTO_MUNITIONS.png', 'en': './assets/en/ui/SHOP_GOTO_MUNITIONS.png', 'jp': './assets/jp/ui/SHOP_GOTO_MUNITIONS.png', 'tw': './assets/tw/ui/SHOP_GOTO_MUNITIONS.png'})
-SHOP_GOTO_SUPPLY_PACK = Button(area={'cn': (884, 341, 930, 383), 'en': (864, 344, 920, 412), 'jp': (876, 345, 939, 386), 'tw': (884, 341, 930, 383)}, color={'cn': (197, 131, 140), 'en': (140, 116, 79), 'jp': (183, 125, 104), 'tw': (197, 131, 140)}, button={'cn': (812, 158, 987, 440), 'en': (819, 173, 979, 433), 'jp': (814, 178, 986, 413), 'tw': (812, 158, 987, 440)}, file={'cn': './assets/cn/ui/SHOP_GOTO_SUPPLY_PACK.png', 'en': './assets/en/ui/SHOP_GOTO_SUPPLY_PACK.png', 'jp': './assets/jp/ui/SHOP_GOTO_SUPPLY_PACK.png', 'tw': './assets/cn/ui/SHOP_GOTO_SUPPLY_PACK.png'})
+SHOP_GOTO_SUPPLY_PACK = Button(area={'cn': (883, 537, 929, 579), 'en': (883, 537, 929, 579), 'jp': (883, 537, 929, 579), 'tw': (883, 537, 929, 579)}, color={'cn': (197, 131, 140), 'en': (197, 131, 140), 'jp': (197, 131, 140), 'tw': (197, 131, 140)}, button={'cn': (810, 353, 987, 638), 'en': (810, 353, 987, 638), 'jp': (810, 353, 987, 638), 'tw': (810, 353, 987, 638)}, file={'cn': './assets/cn/ui/SHOP_GOTO_SUPPLY_PACK.png', 'en': './assets/en/ui/SHOP_GOTO_SUPPLY_PACK.png', 'jp': './assets/jp/ui/SHOP_GOTO_SUPPLY_PACK.png', 'tw': './assets/tw/ui/SHOP_GOTO_SUPPLY_PACK.png'})
 SP_CHECK = Button(area={'cn': (123, 63, 206, 109), 'en': (123, 63, 206, 109), 'jp': (125, 66, 205, 107), 'tw': (123, 63, 206, 109)}, color={'cn': (95, 110, 145), 'en': (95, 110, 145), 'jp': (78, 92, 127), 'tw': (95, 110, 145)}, button={'cn': (123, 63, 206, 109), 'en': (123, 63, 206, 109), 'jp': (125, 66, 205, 107), 'tw': (123, 63, 206, 109)}, file={'cn': './assets/cn/ui/SP_CHECK.png', 'en': './assets/en/ui/SP_CHECK.png', 'jp': './assets/jp/ui/SP_CHECK.png', 'tw': './assets/tw/ui/SP_CHECK.png'})
 STORAGE_CHECK = Button(area={'cn': (120, 14, 175, 40), 'en': (123, 14, 209, 36), 'jp': (121, 13, 176, 41), 'tw': (120, 14, 175, 40)}, color={'cn': (137, 151, 188), 'en': (119, 133, 174), 'jp': (137, 156, 196), 'tw': (137, 151, 188)}, button={'cn': (120, 14, 175, 40), 'en': (123, 14, 209, 36), 'jp': (121, 13, 176, 41), 'tw': (120, 14, 175, 40)}, file={'cn': './assets/cn/ui/STORAGE_CHECK.png', 'en': './assets/en/ui/STORAGE_CHECK.png', 'jp': './assets/jp/ui/STORAGE_CHECK.png', 'tw': './assets/cn/ui/STORAGE_CHECK.png'})
 SUPPLY_PACK_CHECK = Button(area={'cn': (123, 14, 230, 38), 'en': (123, 15, 209, 37), 'jp': (127, 14, 261, 40), 'tw': (121, 14, 230, 40)}, color={'cn': (145, 161, 200), 'en': (117, 131, 170), 'jp': (110, 124, 161), 'tw': (152, 168, 206)}, button={'cn': (123, 14, 230, 38), 'en': (123, 15, 209, 37), 'jp': (127, 14, 261, 40), 'tw': (121, 14, 230, 40)}, file={'cn': './assets/cn/ui/SUPPLY_PACK_CHECK.png', 'en': './assets/en/ui/SUPPLY_PACK_CHECK.png', 'jp': './assets/jp/ui/SUPPLY_PACK_CHECK.png', 'tw': './assets/tw/ui/SUPPLY_PACK_CHECK.png'})