Merge branch 'master' into gems_farming

Browse Source

...

This commit is contained in:

LmeSzinc

2021-07-18 20:16:44 +08:00

parent 6f0ad970fc 96e388d7ab

commit c459a014db

49 changed files with 154 additions and 170 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/LOGIN_RETURN_INFO.png Normal file

Binary file not shown.

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

BIN

assets/cn/os/ZONE_SWITCH.png

Binary file not shown.

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

BIN

assets/cn/ui/RESHMENU_GOTO_SHIPYARD.png Normal file

Binary file not shown.

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

BIN

assets/cn/research/RESEARCH_TITLE.png → assets/cn/ui/SHIPYARD_CHECK.png

Binary file not shown.

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