Merge branch 'master' into dev

Browse Source

...

This commit is contained in:

LmeSzinc

2022-03-03 10:49:44 +08:00

parent 4bf5d21227 f3e62ffaf1

commit fe6e8160c8

31 changed files with 128 additions and 47 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/map/MAP_CAT_ATTACK_MIRROR.png

Binary file not shown.

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

BIN

assets/en/map/MAP_CAT_ATTACK_MIRROR.png

Binary file not shown.

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

BIN

assets/en/os/SELECT_ARCHIVE.png Normal file

Binary file not shown.

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

BIN

assets/en/os/ZONE_ARCHIVE.png Normal file

Binary file not shown.

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

BIN

assets/jp/map/MAP_CAT_ATTACK_MIRROR.png

Binary file not shown.

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

BIN

assets/shop/core/Chip_2.png Normal file

Binary file not shown.

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

BIN

assets/tw/campaign/SWITCH_2_EX.png

Binary file not shown.

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

BIN

assets/tw/map/MAP_CAT_ATTACK_MIRROR.png

Binary file not shown.

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