Merge branch 'master' into dev

Browse Source

...

This commit is contained in:

LmeSzinc

2021-01-28 12:29:13 +08:00

parent 68398860f7 8e84099073

commit 14c3dc9b0c

43 changed files with 479 additions and 133 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/handler/AUTO_SEARCH_MAP_OPTION_OFF.png Normal file

Binary file not shown.

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

BIN

assets/cn/handler/AUTO_SEARCH_MAP_OPTION_ON.png Normal file

Binary file not shown.

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

BIN

assets/cn/handler/AUTO_SEARCH_MENU_CONTINUE.png Normal file

Binary file not shown.

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

BIN

assets/cn/handler/AUTO_SEARCH_MENU_EXIT.png Normal file

Binary file not shown.

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

BIN

assets/cn/map/FLEET_NUM_1.png Normal file

Binary file not shown.

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

BIN

assets/cn/map/FLEET_NUM_2.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/AUTO_SEARCH_MAP_OPTION_OFF.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/AUTO_SEARCH_MAP_OPTION_ON.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/AUTO_SEARCH_MENU_CONTINUE.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/AUTO_SEARCH_MENU_EXIT.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/AUTO_SEARCH_SET_ALL.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/AUTO_SEARCH_SET_BOSS.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/AUTO_SEARCH_SET_MOB.png Normal file

Binary file not shown.

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

BIN

assets/en/handler/AUTO_SEARCH_SET_STANDBY.png Normal file

Binary file not shown.

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

BIN

assets/en/map/FLEET_NUM_1.png Normal file

Binary file not shown.

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

BIN

assets/en/map/FLEET_NUM_2.png Normal file

Binary file not shown.

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

BIN

assets/jp/map/FLEET_NUM_1.png Normal file

Binary file not shown.

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

BIN

assets/jp/map/FLEET_NUM_2.png Normal file

Binary file not shown.

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

BIN

assets/tw/map/FLEET_NUM_1.png Normal file

Binary file not shown.

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

BIN

assets/tw/map/FLEET_NUM_2.png Normal file

Binary file not shown.

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