Merge remote-tracking branch 'origin/dev_nonearth' into dev_cyp

Browse Source

# Conflicts:
#	Assets/Scripts/UI/Prefab/MapList/MapItem.cs

...

This commit is contained in:

Caiyanpeng committed 2021-12-16 16:55:14 +08:00

2 parents 1cb555c13d b9d14a590c

commit 12e0d8d295

11 files changed

+1261 -1207

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

No files matched your search

Assets/Scenes/Login-Mobile.unity

+1163 -1163

File diff suppressed because it is too large. Load diff