Merge branch 'dev_lishuo' into dev
# Conflicts: # .gitignore # Assets/Scenes/Ride/Scripts/SelectPlayerFactory.cs
This commit is contained in:
commit
a7ea02f70a
52 files changed
+6329
-2723
No files matched your search
@@ -89,4 +89,5 @@ Assets/Resources/Sound.meta
|
||||
Assets/MapWorkoutRecords
|
||||
Assets/Mapbox/User
|
||||
Assets/Mapbox/User.meta
|
||||
Packages/packages-lock.json
|
||||
GPUCache
|
||||
Reference in new issue
Block a user