Merge branch 'master' into app

Browse Source

# Conflicts:
#	module/tactical/tactical_class.py

...

This commit is contained in:

LmeSzinc

2021-10-03 03:10:27 +08:00

parent 8aa7a1cfaa 00d44cf9b8

commit e5434f4327

13 changed files with 16 additions and 16 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/gacha/BUILD_CUBE_COUNT.png

Binary file not shown.

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

BIN

assets/jp/gacha/BUILD_FINISH_ORDERS.png

Binary file not shown.

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

BIN

assets/jp/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: 24 KiB

BIN

assets/jp/gacha/BUILD_MINUS.png

Binary file not shown.

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

BIN

assets/jp/gacha/BUILD_PLUS.png

Binary file not shown.

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

BIN

assets/jp/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: 17 KiB

BIN

assets/jp/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: 17 KiB

BIN

assets/jp/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: 24 KiB