Merge branch 'master' into quick_assets

Browse Source

...

This commit is contained in:

LmeSzinc

2021-07-11 11:45:25 +08:00

committed by GitHub

parent fd6522e018 0e1a37a576

commit 4a300e4738

7 changed files with 71 additions and 71 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/jp/raid/TICKET_USE_CONFIRM.png

Binary file not shown.

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

BIN

assets/jp/reward/MEOWFFICER_TRAIN_COMPLETE.png

Binary file not shown.

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

BIN

assets/jp/reward/MEOWFFICER_TRAIN_FILL_QUEUE.png

Binary file not shown.

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

BIN

assets/jp/reward/MEOWFFICER_TRAIN_FINISH_ALL.png

Binary file not shown.

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

BIN

assets/jp/reward/MEOWFFICER_TRAIN_START.png

Binary file not shown.

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