Merge branch 'master' into dev

Browse Source

...

This commit is contained in:

LmeSzinc

2022-08-15 21:53:17 +08:00

parent a5c851869b 2bd72e87b1

commit 0fd6fe9292

28 changed files with 101 additions and 42 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/retire/EMPTY_ENHANCE_SLOT.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.5 KiB

BIN

assets/cn/retire/EMPTY_ENHANCE_SLOT_PLUS.png Normal file

Binary file not shown.

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

BIN

assets/en/os/MAP_NAME.png

Binary file not shown.

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

BIN

assets/en/os_handler/AUTO_SEARCH_OS_MAP_OPTION_OFF.png

Binary file not shown.

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

BIN

assets/en/os_handler/AUTO_SEARCH_OS_MAP_OPTION_ON.png

Binary file not shown.

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

BIN

assets/en/retire/EMPTY_ENHANCE_SLOT.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.5 KiB

BIN

assets/en/retire/EMPTY_ENHANCE_SLOT_PLUS.png Normal file

Binary file not shown.

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

BIN

assets/jp/retire/EMPTY_ENHANCE_SLOT.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.5 KiB

BIN

assets/jp/retire/EMPTY_ENHANCE_SLOT_PLUS.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/DRBrestS5.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/DRPlymouthS5.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/DRS5.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/PRChkalovS5.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/PRHarbinS5.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/PRRupprechtS5.png Normal file

Binary file not shown.

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

BIN

assets/shop/medal/PRS5.png Normal file

Binary file not shown.

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

BIN

assets/tw/retire/EMPTY_ENHANCE_SLOT.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.5 KiB

BIN

assets/tw/retire/EMPTY_ENHANCE_SLOT_PLUS.png Normal file

Binary file not shown.

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