Merge branch 'master' into dev

Browse Source

...

This commit is contained in:

LmeSzinc

2022-08-22 12:07:34 +08:00

parent d140a9b4f4 378ee5e8ab

commit d54d42f0f9

29 changed files with 101 additions and 44 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/combat/AUTOMATION_CONFIRM.png

Binary file not shown.

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

BIN

assets/cn/shop/SHOP_MEDAL_SWIPE_END.png

Binary file not shown.

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

BIN

assets/cn/shop/SHOP_MERIT_SWIPE_END.png

Binary file not shown.

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