Merge branch 'master' of ooftooft.net:Racesm

2024-04-05 11:30:57 +02:00
parent 66ca2f2ec0 d416cbff3c
commit 28562de791
2 changed files with 41 additions and 81 deletions
--- a/Assets/Prefabs/Hotrod.prefab
+++ b/Assets/Prefabs/Hotrod.prefab
@@ -54,13 +54,13 @@ Rigidbody:
  m_ExcludeLayers:
    serializedVersion: 2
    m_Bits: 0
-  m_ImplicitCom: 1
+  m_ImplicitCom: 0
  m_ImplicitTensor: 1
  m_UseGravity: 1
  m_IsKinematic: 0
  m_Interpolate: 0
  m_Constraints: 0
-  m_CollisionDetection: 0
+  m_CollisionDetection: 1
 --- !u!114 &1857703685905104433
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -90,11 +90,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 5229367761133960, guid: 0a84c5c2846d02440b5cea7fafee4fa5, type: 3}
      propertyPath: m_WheelDampingRate
-      value: 0.0001
+      value: 0.01
      objectReference: {fileID: 0}
    - target: {fileID: 5229367761133960, guid: 0a84c5c2846d02440b5cea7fafee4fa5, type: 3}
      propertyPath: m_SuspensionDistance
-      value: 0
+      value: 0.25
      objectReference: {fileID: 0}
    - target: {fileID: 5229367761133960, guid: 0a84c5c2846d02440b5cea7fafee4fa5, type: 3}
      propertyPath: m_SuspensionSpring.damper
@@ -114,11 +114,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 211855197576047450, guid: 0a84c5c2846d02440b5cea7fafee4fa5, type: 3}
      propertyPath: m_WheelDampingRate
-      value: 0.0001
+      value: 0.01
      objectReference: {fileID: 0}
    - target: {fileID: 211855197576047450, guid: 0a84c5c2846d02440b5cea7fafee4fa5, type: 3}
      propertyPath: m_SuspensionDistance
-      value: 0
+      value: 0.25
      objectReference: {fileID: 0}
    - target: {fileID: 211855197576047450, guid: 0a84c5c2846d02440b5cea7fafee4fa5, type: 3}
      propertyPath: m_SuspensionSpring.targetPosition
@@ -174,11 +174,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 5640727645891893896, guid: 0a84c5c2846d02440b5cea7fafee4fa5, type: 3}
      propertyPath: m_WheelDampingRate
-      value: 0.0001
+      value: 0.01
      objectReference: {fileID: 0}
    - target: {fileID: 5640727645891893896, guid: 0a84c5c2846d02440b5cea7fafee4fa5, type: 3}
      propertyPath: m_SuspensionDistance
-      value: 0
+      value: 0.25
      objectReference: {fileID: 0}
    - target: {fileID: 5640727645891893896, guid: 0a84c5c2846d02440b5cea7fafee4fa5, type: 3}
      propertyPath: m_SuspensionSpring.damper
@@ -194,11 +194,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8344151628468935024, guid: 0a84c5c2846d02440b5cea7fafee4fa5, type: 3}
      propertyPath: m_WheelDampingRate
-      value: 0.0001
+      value: 0.01
      objectReference: {fileID: 0}
    - target: {fileID: 8344151628468935024, guid: 0a84c5c2846d02440b5cea7fafee4fa5, type: 3}
      propertyPath: m_SuspensionDistance
-      value: 0
+      value: 0.25
      objectReference: {fileID: 0}
    - target: {fileID: 8344151628468935024, guid: 0a84c5c2846d02440b5cea7fafee4fa5, type: 3}
      propertyPath: m_SuspensionSpring.damper
@@ -211,8 +211,37 @@ PrefabInstance:
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 3607537162475918540, guid: 0a84c5c2846d02440b5cea7fafee4fa5, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 2070334146872065751}
  m_SourcePrefab: {fileID: 100100000, guid: 0a84c5c2846d02440b5cea7fafee4fa5, type: 3}
+--- !u!1 &7627314183742200739 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3607537162475918540, guid: 0a84c5c2846d02440b5cea7fafee4fa5, type: 3}
+  m_PrefabInstance: {fileID: 6613855157239500655}
+  m_PrefabAsset: {fileID: 0}
+--- !u!65 &2070334146872065751
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7627314183742200739}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 1
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1.9627337, y: 1.770384, z: 4.430439}
+  m_Center: {x: 0, y: 0.9859993, z: 0.105917215}
 --- !u!4 &7953198523918571078 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 3861359295483779369, guid: 0a84c5c2846d02440b5cea7fafee4fa5, type: 3}
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -217,32 +217,6 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &1033049105 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 7627314183742200739, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
-  m_PrefabInstance: {fileID: 1328367594557032345}
-  m_PrefabAsset: {fileID: 0}
--- !u!65 &1033049109
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1033049105}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 0
-  m_ProvidesContacts: 1
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 1.9627337, y: 1.770384, z: 4.430439}
-  m_Center: {x: 0, y: 0.9859993, z: 0.105917215}
 --- !u!1 &1201679266 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 4258781391370674817, guid: 77e4cd38c4994de4f9312bea83b75104, type: 3}
@@ -455,30 +429,6 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 1553392025741153767, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
-      propertyPath: m_WheelDampingRate
-      value: 0.01
-      objectReference: {fileID: 0}
-    - target: {fileID: 1553392025741153767, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
-      propertyPath: m_SuspensionDistance
-      value: 0.25
-      objectReference: {fileID: 0}
-    - target: {fileID: 2883785401448142367, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
-      propertyPath: m_WheelDampingRate
-      value: 0.01
-      objectReference: {fileID: 0}
-    - target: {fileID: 2883785401448142367, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
-      propertyPath: m_SuspensionDistance
-      value: 0.25
-      objectReference: {fileID: 0}
-    - target: {fileID: 3239213433477781764, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
-      propertyPath: m_ImplicitCom
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3239213433477781764, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
-      propertyPath: m_CollisionDetection
-      value: 1
-      objectReference: {fileID: 0}
    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
      propertyPath: m_LocalPosition.x
      value: -4.25
@@ -523,29 +473,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: Hotrod
      objectReference: {fileID: 0}
-    - target: {fileID: 6429322875164058677, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
-      propertyPath: m_WheelDampingRate
-      value: 0.01
-      objectReference: {fileID: 0}
-    - target: {fileID: 6429322875164058677, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
-      propertyPath: m_SuspensionDistance
-      value: 0.25
-      objectReference: {fileID: 0}
-    - target: {fileID: 6619084378601959143, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
-      propertyPath: m_WheelDampingRate
-      value: 0.01
-      objectReference: {fileID: 0}
-    - target: {fileID: 6619084378601959143, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
-      propertyPath: m_SuspensionDistance
-      value: 0.25
-      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 7627314183742200739, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 1033049109}
+    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
 --- !u!4 &1328367594557032349 stripped
 Transform: