Merge branch 'LmeSzinc:master' into dev-minigame-for-pr

Browse Source

...

This commit is contained in:

Tipsy Fisher

2023-07-14 10:59:13 +08:00

committed by GitHub

parent 28cae91564 2cd7f1df01

commit a962b13343

63 changed files with 439 additions and 106 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

assets/cn/shop/MEDAL_SHOP_SCROLL_AREA.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.6 KiB After Width:  |  Height:  |  Size: 6.2 KiB

BIN

assets/cn/shop/SHOP_CORE.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.2 KiB After Width:  |  Height:  |  Size: 7.1 KiB

BIN

assets/cn/shop/SHOP_GUILD_COINS.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.1 KiB After Width:  |  Height:  |  Size: 7.2 KiB

BIN

assets/cn/shop/SHOP_MEDAL.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.0 KiB After Width:  |  Height:  |  Size: 7.1 KiB

BIN

assets/cn/shop/SHOP_MERIT.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.5 KiB After Width:  |  Height:  |  Size: 7.2 KiB

BIN

assets/cn/shop/SHOP_REFRESH.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.3 KiB After Width:  |  Height:  |  Size: 9.2 KiB

BIN

assets/cn/ui/MUNITIONS_CHECK.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 8.9 KiB After Width:  |  Height:  |  Size: 7.6 KiB

BIN

assets/cn/ui/SHOP_CHECK.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.1 KiB After Width:  |  Height:  |  Size: 7.0 KiB

BIN

assets/cn/ui/SHOP_GOTO_SUPPLY_PACK.BUTTON.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 62 KiB After Width:  |  Height:  |  Size: 5.8 KiB

BIN

assets/cn/ui/SHOP_GOTO_SUPPLY_PACK.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.1 KiB After Width:  |  Height:  |  Size: 9.1 KiB

BIN

assets/en/shop/MEDAL_SHOP_SCROLL_AREA.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.6 KiB After Width:  |  Height:  |  Size: 6.2 KiB

BIN

assets/en/shop/SHOP_CORE.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.2 KiB After Width:  |  Height:  |  Size: 7.1 KiB

BIN

assets/en/shop/SHOP_GUILD_COINS.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.1 KiB After Width:  |  Height:  |  Size: 7.2 KiB

BIN

assets/en/shop/SHOP_MEDAL.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.0 KiB After Width:  |  Height:  |  Size: 7.1 KiB

BIN

assets/en/shop/SHOP_MERIT.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.5 KiB After Width:  |  Height:  |  Size: 7.2 KiB

BIN

assets/en/shop/SHOP_REFRESH.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.2 KiB After Width:  |  Height:  |  Size: 13 KiB

BIN

assets/en/ui/MUNITIONS_CHECK.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.5 KiB After Width:  |  Height:  |  Size: 9.4 KiB

BIN

assets/en/ui/SHOP_CHECK.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 5.4 KiB After Width:  |  Height:  |  Size: 10 KiB

BIN

assets/en/ui/SHOP_GOTO_SUPPLY_PACK.BUTTON.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 48 KiB After Width:  |  Height:  |  Size: 5.8 KiB

BIN

assets/en/ui/SHOP_GOTO_SUPPLY_PACK.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.7 KiB After Width:  |  Height:  |  Size: 9.1 KiB

BIN

assets/jp/shop/MEDAL_SHOP_SCROLL_AREA.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.6 KiB After Width:  |  Height:  |  Size: 6.2 KiB

BIN

assets/jp/shop/SHOP_CORE.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.2 KiB After Width:  |  Height:  |  Size: 7.1 KiB

BIN

assets/jp/shop/SHOP_GUILD_COINS.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 18 KiB After Width:  |  Height:  |  Size: 7.2 KiB

BIN

assets/jp/shop/SHOP_MEDAL.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.0 KiB After Width:  |  Height:  |  Size: 7.1 KiB

BIN

assets/jp/shop/SHOP_MERIT.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 19 KiB After Width:  |  Height:  |  Size: 7.2 KiB

BIN

assets/jp/shop/SHOP_REFRESH.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 19 KiB After Width:  |  Height:  |  Size: 9.1 KiB

BIN

assets/jp/ui/MUNITIONS_CHECK.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 19 KiB After Width:  |  Height:  |  Size: 7.3 KiB

BIN

assets/jp/ui/SHOP_CHECK.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 7.1 KiB

BIN

assets/jp/ui/SHOP_GOTO_SUPPLY_PACK.BUTTON.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 59 KiB After Width:  |  Height:  |  Size: 5.8 KiB

BIN

assets/jp/ui/SHOP_GOTO_SUPPLY_PACK.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 8.5 KiB After Width:  |  Height:  |  Size: 9.1 KiB

BIN

assets/research_blueprint/flandre.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

assets/research_blueprint/hindenburg.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

assets/research_blueprint/kearsarge.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

assets/research_blueprint/schultz.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

assets/research_blueprint/shimanto.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

assets/shop/cost/Coins_2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.2 KiB

BIN

assets/shop/cost/Core_2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.8 KiB

BIN

assets/shop/cost/Gems_2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.0 KiB

BIN

assets/shop/cost/GuildCoins_2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.4 KiB

BIN

assets/shop/cost/Medal_2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.0 KiB

BIN

assets/shop/cost/Merit_2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.1 KiB

BIN

assets/tw/ui/SHOP_GOTO_SUPPLY_PACK.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.1 KiB