Merge remote-tracking branch 'origin/dev' into dev_lishuo

Browse Source

# Conflicts:
#	Assets/NuGet.meta
#	Assets/Resources/Images/Ride.meta
#	Assets/Resources/Sound.meta
#	Assets/Scripts/App.cs
#	Assets/Scripts/UI/Prefab/BigMap/Tips.cs
#	Assets/StreamingAssets.meta

...

This commit is contained in:

lishuo committed 2021-04-15 17:14:00 +08:00

2 parents 92e43c2cd8 f4cbad819b

commit 70626ae741

46 files changed

+11645 -3948

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/1-Login.unity

+1221 -1064

File diff suppressed because it is too large. Load diff

Assets/Scenes/3-MapList.unity

+6306 -299

File diff suppressed because it is too large. Load diff