Merge branch 'dev_lishuo' into dev

# Conflicts:
#	.gitignore
#	Assets/Scenes/Ride/Scripts/SelectPlayerFactory.cs
This commit is contained in:
suntao committed 2021-05-12 10:30:08 +08:00
commit a7ea02f70a
52 files changed
+6329 -2723

No files matched your search

+1
View File
@@ -89,4 +89,5 @@ Assets/Resources/Sound.meta
Assets/MapWorkoutRecords
Assets/Mapbox/User
Assets/Mapbox/User.meta
Packages/packages-lock.json
GPUCache