Merge branch 'master' into app

Browse Source

# Conflicts:
#	module/campaign/gems_farming.py
#	module/config/config.py

...

This commit is contained in:

LmeSzinc

2021-09-19 23:34:30 +08:00

parent b2ea5f897f fd4a345e7e

commit f71a151678

19 changed files with 69 additions and 23 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/shipyard/SHIPYARD_LEVEL_NOT_ENOUGH_DEV.png Normal file

Binary file not shown.

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

BIN

assets/cn/shipyard/SHIPYARD_LEVEL_NOT_ENOUGH_FATE.png Normal file

Binary file not shown.

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

BIN

assets/jp/shipyard/SHIPYARD_LEVEL_NOT_ENOUGH_DEV.png Normal file

Binary file not shown.

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

BIN

assets/jp/shipyard/SHIPYARD_LEVEL_NOT_ENOUGH_FATE.png Normal file

Binary file not shown.

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

BIN

assets/jp/ui/META_CHECK.png

Binary file not shown.

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