Merge branch 'master' into dev

Browse Source

...

This commit is contained in:

LmeSzinc

2021-12-06 10:01:42 +08:00

parent 927be88d08 b6b1700407

commit 1290224c50

17 changed files with 68 additions and 37 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/battle_pass/REWARD_RECEIVE_SP.png Normal file

Binary file not shown.

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

BIN

assets/en/battle_pass/REWARD_RECEIVE_SP.png Normal file

Binary file not shown.

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

BIN

assets/jp/battle_pass/BATTLE_PASS_RED_DOT.png Normal file

Binary file not shown.

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

BIN

assets/jp/battle_pass/PURCHASE_POPUP.png Normal file

Binary file not shown.

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

BIN

assets/jp/battle_pass/REWARD_RECEIVE_SP.png Normal file

Binary file not shown.

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

BIN

assets/shop/general/FoodT6_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/guild_cn/FoodT6_2.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/FoodT6_2.png Normal file

Binary file not shown.

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

BIN

assets/tw/battle_pass/BATTLE_PASS_RED_DOT.png Normal file

Binary file not shown.

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

BIN

assets/tw/battle_pass/PURCHASE_POPUP.png Normal file

Binary file not shown.

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