Merge branch 'master' into dev

Browse Source

...

This commit is contained in:

LmeSzinc

2020-09-27 15:47:11 +08:00

parent 80ea891f0b e97cdea1b3

commit 075dfd70f9

12 changed files with 46 additions and 12 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/MAIN_FLEET_POWER_ZERO.png Normal file

Binary file not shown.

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

BIN

assets/cn/combat/PREPARATION_STABLE_CHECKER.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.7 KiB

BIN

assets/en/combat/MAIN_FLEET_POWER_ZERO.png Normal file

Binary file not shown.

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

BIN

assets/en/combat/PREPARATION_STABLE_CHECKER.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.7 KiB

BIN

assets/jp/combat/MAIN_FLEET_POWER_ZERO.png Normal file

Binary file not shown.

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

BIN

assets/jp/combat/PREPARATION_STABLE_CHECKER.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.7 KiB