Merge branch 'master' of ooftooft.net:Racesm
# Conflicts: # Assets/Imported Assets/PolygonCity/Prefabs/Characters/Character_BusinessMan_Shirt_01.prefab # Assets/ML-Agents/Timers/Car Customization_timers.json # Assets/ML-Agents/Timers/Racetrack mini_timers.json
This commit is contained in:
@@ -6139,7 +6139,7 @@ PrefabInstance:
|
||||
- target: {fileID: 1742803291406415280, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
|
||||
propertyPath: TargetCar
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
objectReference: {fileID: 788662684}
|
||||
- target: {fileID: 1742803291406415280, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
|
||||
propertyPath: CamerasPreset.Array.data[1].SetPositionSpeed
|
||||
value: 4
|
||||
@@ -28006,7 +28006,7 @@ PrefabInstance:
|
||||
- target: {fileID: 5539949921570205737, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
|
||||
propertyPath: PlayerCar
|
||||
value:
|
||||
objectReference: {fileID: 350793952}
|
||||
objectReference: {fileID: 788662684}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
||||
Reference in New Issue
Block a user