Merge branch 'dev'

Browse Source

...

This commit is contained in:

LmeSzinc

2021-12-09 23:33:48 +08:00

parent 7ceff49e5d 9529639909

commit ae41f8fd0e

120 changed files with 1731 additions and 252 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/FLEET_1.png Normal file

Binary file not shown.

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

BIN

assets/cn/os/FLEET_2.png Normal file

Binary file not shown.

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

BIN

assets/cn/os/FLEET_3.png Normal file

Binary file not shown.

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

BIN

assets/cn/os/FLEET_4.png Normal file

Binary file not shown.

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

BIN

assets/cn/os/FLEET_BAR.png Normal file

Binary file not shown.

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

BIN

assets/cn/os/FLEET_CHOOSE.png Normal file

Binary file not shown.

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

0

assets/cn/os/SELECT_LOGGER.png → assets/cn/os/SELECT_ABYSSAL.png

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

0

assets/cn/os/ZONE_LOGGER.png → assets/cn/os/ZONE_ABYSSAL.png

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

BIN

assets/cn/os_handler/ASH_POPUP_CHECK.png

Binary file not shown.

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

BIN

assets/cn/os_handler/ORDER_SCAN.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_handler/ORDER_SCAN.png

Binary file not shown.

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

BIN

assets/cn/os_handler/ORDER_SUBMARINE.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/cn/os_handler/ORDER_SUBMARINE.png

Binary file not shown.

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

BIN

assets/cn/os_handler/TEMPLATE_STORAGE_ABYSSAL.png Normal file

Binary file not shown.

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

0

assets/cn/os_handler/TEMPLATE_STORAGE_OBSCURED.png → assets/cn/os_handler/TEMPLATE_STORAGE_OBSCURE.png

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

0

assets/en/os/SELECT_LOGGER.png → assets/en/os/SELECT_ABYSSAL.png

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

0

assets/en/os/ZONE_LOGGER.png → assets/en/os/ZONE_ABYSSAL.png

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

BIN

assets/en/os_handler/ASH_POPUP_CHECK.png

Binary file not shown.

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

BIN

assets/en/os_handler/ORDER_SCAN.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/en/os_handler/ORDER_SCAN.png

Binary file not shown.

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

BIN

assets/en/os_handler/ORDER_SUBMARINE.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/en/os_handler/ORDER_SUBMARINE.png

Binary file not shown.

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

BIN

assets/en/os_handler/TEMPLATE_STORAGE_ABYSSAL.png Normal file

Binary file not shown.

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

0

assets/en/os_handler/TEMPLATE_STORAGE_OBSCURED.png → assets/en/os_handler/TEMPLATE_STORAGE_OBSCURE.png

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

0

assets/jp/os/SELECT_LOGGER.png → assets/jp/os/SELECT_ABYSSAL.png

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

0

assets/jp/os/ZONE_LOGGER.png → assets/jp/os/ZONE_ABYSSAL.png

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

BIN

assets/jp/os_handler/ORDER_SCAN.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/jp/os_handler/ORDER_SCAN.png

Binary file not shown.

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

BIN

assets/jp/os_handler/ORDER_SUBMARINE.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/jp/os_handler/ORDER_SUBMARINE.png

Binary file not shown.

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

BIN

assets/jp/os_handler/TEMPLATE_STORAGE_ABYSSAL.png Normal file

Binary file not shown.

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

0

assets/jp/os_handler/TEMPLATE_STORAGE_OBSCURED.png → assets/jp/os_handler/TEMPLATE_STORAGE_OBSCURE.png

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

0

assets/tw/os/SELECT_LOGGER.png → assets/tw/os/SELECT_ABYSSAL.png

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

0

assets/tw/os/ZONE_LOGGER.png → assets/tw/os/ZONE_ABYSSAL.png

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

BIN

assets/tw/os_handler/ASH_POPUP_CHECK.png

Binary file not shown.

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

BIN

assets/tw/os_handler/ORDER_SCAN.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/tw/os_handler/ORDER_SCAN.png

Binary file not shown.

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

BIN

assets/tw/os_handler/ORDER_SUBMARINE.BUTTON.png Normal file

Binary file not shown.

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

BIN

assets/tw/os_handler/ORDER_SUBMARINE.png

Binary file not shown.

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

BIN

assets/tw/os_handler/TEMPLATE_STORAGE_ABYSSAL.png Normal file

Binary file not shown.

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

0

assets/tw/os_handler/TEMPLATE_STORAGE_OBSCURED.png → assets/tw/os_handler/TEMPLATE_STORAGE_OBSCURE.png

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