Merge branch 'master' into app

Browse Source

# Conflicts:
#	module/config/event.py

...

This commit is contained in:

LmeSzinc

2021-10-11 12:58:52 +08:00

parent c68f9c1ccd 63a8821112

commit 85101590b7

18 changed files with 37 additions and 11 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/TEMPLATE_EMPTY_HP.png Normal file

Binary file not shown.

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

BIN

assets/en/os/TEMPLATE_EMPTY_HP.png Normal file

Binary file not shown.

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

BIN

assets/jp/os/TEMPLATE_EMPTY_HP.png Normal file

Binary file not shown.

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

BIN

assets/tw/gacha/BUILD_FINISH_ORDERS.png

Binary file not shown.

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

BIN

assets/tw/gacha/BUILD_FINISH_RESULTS.png

Binary file not shown.

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

BIN

assets/tw/gacha/BUILD_MINUS.png

Binary file not shown.

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

BIN

assets/tw/gacha/BUILD_PLUS.png

Binary file not shown.

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

BIN

assets/tw/gacha/BUILD_SUBMIT_COUNT.png

Binary file not shown.

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

BIN

assets/tw/gacha/BUILD_SUBMIT_ORDERS.png

Binary file not shown.

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

BIN

assets/tw/gacha/BUILD_SUBMIT_WW_COUNT.png

Binary file not shown.

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

BIN

assets/tw/gacha/BUILD_SUBMIT_WW_ORDERS.png

Binary file not shown.

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

BIN

assets/tw/gacha/BUILD_WW_CHECK.png

Binary file not shown.

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

BIN

assets/tw/os/TEMPLATE_EMPTY_HP.png Normal file

Binary file not shown.

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