Merge branch 'master' into dev

Browse Source

...

This commit is contained in:

LmeSzinc

2022-07-16 00:24:38 +08:00

parent 3ce625aec5 65ea5a65cd

commit 0180e6e286

32 changed files with 232 additions and 60 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/os_ash/BEACON_REMAIN.png

Binary file not shown.

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

BIN

assets/en/os_ash/BEACON_ENTER.png

Binary file not shown.

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

BIN

assets/en/os_ash/BEACON_REMAIN.png

Binary file not shown.

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

BIN

assets/jp/os_ash/ASH_SHOWDOWN.png Normal file

Binary file not shown.

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

BIN

assets/jp/os_ash/BEACON_REMAIN.png

Binary file not shown.

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

BIN

assets/tw/os_ash/BEACON_EMPTY.png

Binary file not shown.

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

BIN

assets/tw/os_ash/BEACON_ENTER.png

Binary file not shown.

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

BIN

assets/tw/os_ash/BEACON_REMAIN.png

Binary file not shown.

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