Merge branch 'master' of ooftooft.net:Racesm

# Conflicts:
#	Assets/Imported Assets/PolygonCity/Prefabs/Characters/Character_BusinessMan_Shirt_01.prefab
#	Assets/ML-Agents/Timers/Racetrack mini_timers.json

Signed-off-by: Ciakon <noahkarottki@gmail.com>
This commit is contained in:
2024-04-24 11:39:04 +02:00
10 changed files with 928 additions and 67 deletions

View File

@@ -5261,6 +5261,84 @@ MonoBehaviour:
animator: {fileID: 388371159}
npcPrefab: {fileID: 153506, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3}
audio: {fileID: 0}
--- !u!1001 &392623382
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3}
propertyPath: m_LocalPosition.x
value: 64.98537
objectReference: {fileID: 0}
- target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3}
propertyPath: m_LocalPosition.y
value: 0.00062897056
objectReference: {fileID: 0}
- target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3}
propertyPath: m_LocalPosition.z
value: 15.267399
objectReference: {fileID: 0}
- target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2106440785211624687, guid: 21578c15f92da4b4d96697315edfc546, type: 3}
propertyPath: m_Name
value: MuscleCar
objectReference: {fileID: 0}
- target: {fileID: 3985587579150572548, guid: 21578c15f92da4b4d96697315edfc546, type: 3}
propertyPath: m_SuspensionSpring.damper
value: 1500
objectReference: {fileID: 0}
- target: {fileID: 4311002844589887538, guid: 21578c15f92da4b4d96697315edfc546, type: 3}
propertyPath: m_SuspensionSpring.damper
value: 1500
objectReference: {fileID: 0}
- target: {fileID: 6247996953015795539, guid: 21578c15f92da4b4d96697315edfc546, type: 3}
propertyPath: m_SuspensionSpring.damper
value: 1500
objectReference: {fileID: 0}
- target: {fileID: 8947798677317855350, guid: 21578c15f92da4b4d96697315edfc546, type: 3}
propertyPath: m_SuspensionSpring.damper
value: 1500
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 21578c15f92da4b4d96697315edfc546, type: 3}
--- !u!1 &392623383 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2106440785211624687, guid: 21578c15f92da4b4d96697315edfc546, type: 3}
m_PrefabInstance: {fileID: 392623382}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &395250118
PrefabInstance:
m_ObjectHideFlags: 0
@@ -6060,7 +6138,7 @@ PrefabInstance:
- target: {fileID: 1742803291406415280, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
propertyPath: TargetCar
value:
objectReference: {fileID: 0}
objectReference: {fileID: 392623383}
- target: {fileID: 1742803291406415280, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3}
propertyPath: CamerasPreset.Array.data[1].SetPositionSpeed
value: 4
@@ -27239,7 +27317,7 @@ PrefabInstance:
- target: {fileID: 5539949921570205737, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
propertyPath: PlayerCar
value:
objectReference: {fileID: 0}
objectReference: {fileID: 392623383}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -27260,3 +27338,4 @@ SceneRoots:
- {fileID: 454865284}
- {fileID: 8684226825208193988}
- {fileID: 1513738220}
- {fileID: 392623382}