Merge branch 'master' of git@ooftooft.net:Racesm.git

# Conflicts: # Assets/ML-Agents/Timers/Racetrack mini_timers.json # Assets/Scenes/Racetrack mini.unity Signed-off-by: Ciakon <noahkarottki@gmail.com>
2024-04-23 10:46:53 +02:00
parent f2ae69b28f 2990a061ae
commit 5eb69aaa38
12 changed files with 21120 additions and 5075 deletions
--- a/Assets/Prefabs/Cars/SchoolBus.prefab
+++ b/Assets/Prefabs/Cars/SchoolBus.prefab
@@ -47,10 +47,10 @@ WheelCollider:
    spring: 35000
    damper: 1500
    targetPosition: 1
-  m_SuspensionDistance: 0.3
+  m_SuspensionDistance: 0.25
  m_ForceAppPointDistance: 0
-  m_Mass: 20
-  m_WheelDampingRate: 0.25
+  m_Mass: 80
+  m_WheelDampingRate: 0.01
  m_ForwardFriction:
    m_ExtremumSlip: 0.4
    m_ExtremumValue: 1
@@ -135,10 +135,10 @@ WheelCollider:
    spring: 35000
    damper: 1500
    targetPosition: 1
-  m_SuspensionDistance: 0.3
+  m_SuspensionDistance: 0.25
  m_ForceAppPointDistance: 0
-  m_Mass: 20
-  m_WheelDampingRate: 0.25
+  m_Mass: 80
+  m_WheelDampingRate: 0.01
  m_ForwardFriction:
    m_ExtremumSlip: 0.4
    m_ExtremumValue: 1
@@ -223,22 +223,22 @@ WheelCollider:
    spring: 35000
    damper: 1500
    targetPosition: 1
-  m_SuspensionDistance: 0.3
+  m_SuspensionDistance: 0.25
  m_ForceAppPointDistance: 0
-  m_Mass: 20
-  m_WheelDampingRate: 0.25
+  m_Mass: 80
+  m_WheelDampingRate: 0.01
  m_ForwardFriction:
    m_ExtremumSlip: 0.4
    m_ExtremumValue: 1
    m_AsymptoteSlip: 0.8
    m_AsymptoteValue: 0.5
-    m_Stiffness: 1
+    m_Stiffness: 2
  m_SidewaysFriction:
    m_ExtremumSlip: 0.2
    m_ExtremumValue: 1
    m_AsymptoteSlip: 0.5
    m_AsymptoteValue: 0.75
-    m_Stiffness: 1
+    m_Stiffness: 2
  m_IncludeLayers:
    serializedVersion: 2
    m_Bits: 0
@@ -311,22 +311,22 @@ WheelCollider:
    spring: 35000
    damper: 1500
    targetPosition: 1
-  m_SuspensionDistance: 0.3
+  m_SuspensionDistance: 0.25
  m_ForceAppPointDistance: 0
-  m_Mass: 20
-  m_WheelDampingRate: 0.25
+  m_Mass: 80
+  m_WheelDampingRate: 0.01
  m_ForwardFriction:
    m_ExtremumSlip: 0.4
    m_ExtremumValue: 1
    m_AsymptoteSlip: 0.8
    m_AsymptoteValue: 0.5
-    m_Stiffness: 1
+    m_Stiffness: 2
  m_SidewaysFriction:
    m_ExtremumSlip: 0.2
    m_ExtremumValue: 1
    m_AsymptoteSlip: 0.5
    m_AsymptoteValue: 0.75
-    m_Stiffness: 1
+    m_Stiffness: 2
  m_IncludeLayers:
    serializedVersion: 2
    m_Bits: 0
@@ -406,7 +406,7 @@ Rigidbody:
  m_ExcludeLayers:
    serializedVersion: 2
    m_Bits: 0
-  m_ImplicitCom: 1
+  m_ImplicitCom: 0
  m_ImplicitTensor: 1
  m_UseGravity: 1
  m_IsKinematic: 0
@@ -427,7 +427,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  motorTorque: 300
  brakeTorque: 500
-  maxSpeed: 400
+  maxSpeed: 100
  steeringRange: 10
  steeringRangeAtMaxSpeed: 7
  autoBrake: 100
--- a/Assets/Prefabs/Cars/StreetRacist.prefab
+++ b/Assets/Prefabs/Cars/StreetRacist.prefab
@@ -45,12 +45,12 @@ WheelCollider:
  m_Radius: 0.3555168
  m_SuspensionSpring:
    spring: 35000
-    damper: 4500
+    damper: 1500
    targetPosition: 0.5
-  m_SuspensionDistance: 0.3
+  m_SuspensionDistance: 0.25
  m_ForceAppPointDistance: 0
-  m_Mass: 20
-  m_WheelDampingRate: 0.25
+  m_Mass: 80
+  m_WheelDampingRate: 0.01
  m_ForwardFriction:
    m_ExtremumSlip: 0.4
    m_ExtremumValue: 1
@@ -133,12 +133,12 @@ WheelCollider:
  m_Radius: 0.3555168
  m_SuspensionSpring:
    spring: 35000
-    damper: 4500
+    damper: 1500
    targetPosition: 0.5
-  m_SuspensionDistance: 0.3
+  m_SuspensionDistance: 0.25
  m_ForceAppPointDistance: 0
-  m_Mass: 20
-  m_WheelDampingRate: 0.25
+  m_Mass: 80
+  m_WheelDampingRate: 0.01
  m_ForwardFriction:
    m_ExtremumSlip: 0.4
    m_ExtremumValue: 1
@@ -150,7 +150,7 @@ WheelCollider:
    m_ExtremumValue: 1
    m_AsymptoteSlip: 0.5
    m_AsymptoteValue: 0.75
-    m_Stiffness: 1
+    m_Stiffness: 1.125
  m_IncludeLayers:
    serializedVersion: 2
    m_Bits: 0
@@ -172,7 +172,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 9901c050a200da94bbc65da2891b7708, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  wheelModel: {fileID: 3021246406777660175}
+  wheelModel: {fileID: 129542991850398677}
  WheelCollider: {fileID: 0}
  steerable: 0
  motorized: 1
@@ -224,13 +224,12 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 58d3a2623a4164b4bb25683edc176b03, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  motorTorque: 2000
-  brakeTorque: 2000
-  maxSpeed: 20
-  steeringRange: 30
-  steeringRangeAtMaxSpeed: 10
-  autoBrake: 0
-  lookat: {fileID: 8764419593260817307}
+  motorTorque: 300
+  brakeTorque: 400
+  maxSpeed: 250
+  steeringRange: 9
+  steeringRangeAtMaxSpeed: 7
+  autoBrake: 100
  audio: {fileID: 2596011702013363691}
  rigidBody: {fileID: 0}
 --- !u!54 &8561609910625013332
@@ -253,7 +252,7 @@ Rigidbody:
  m_ExcludeLayers:
    serializedVersion: 2
    m_Bits: 0
-  m_ImplicitCom: 1
+  m_ImplicitCom: 0
  m_ImplicitTensor: 1
  m_UseGravity: 1
  m_IsKinematic: 0
@@ -305,12 +304,12 @@ WheelCollider:
  m_Radius: 0.3555168
  m_SuspensionSpring:
    spring: 35000
-    damper: 4500
+    damper: 1500
    targetPosition: 0.5
-  m_SuspensionDistance: 0.3
+  m_SuspensionDistance: 0.25
  m_ForceAppPointDistance: 0
-  m_Mass: 20
-  m_WheelDampingRate: 0.25
+  m_Mass: 80
+  m_WheelDampingRate: 0.01
  m_ForwardFriction:
    m_ExtremumSlip: 0.4
    m_ExtremumValue: 1
@@ -322,7 +321,7 @@ WheelCollider:
    m_ExtremumValue: 1
    m_AsymptoteSlip: 0.5
    m_AsymptoteValue: 0.75
-    m_Stiffness: 1
+    m_Stiffness: 1.125
  m_IncludeLayers:
    serializedVersion: 2
    m_Bits: 0
@@ -393,12 +392,12 @@ WheelCollider:
  m_Radius: 0.3555168
  m_SuspensionSpring:
    spring: 35000
-    damper: 4500
+    damper: 1500
    targetPosition: 0.5
-  m_SuspensionDistance: 0.3
+  m_SuspensionDistance: 0.25
  m_ForceAppPointDistance: 0
-  m_Mass: 20
-  m_WheelDampingRate: 0.25
+  m_Mass: 80
+  m_WheelDampingRate: 0.01
  m_ForwardFriction:
    m_ExtremumSlip: 0.4
    m_ExtremumValue: 1
@@ -662,8 +661,16 @@ PrefabInstance:
    - targetCorrespondingSourceObject: {fileID: 473435645620777240, guid: 329c3d78ac09e334fb65c9fe92616bc6, type: 3}
      insertIndex: -1
      addedObject: {fileID: 3215875682596354958}
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 7125661131191776206, guid: 329c3d78ac09e334fb65c9fe92616bc6, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 3073178764391476130}
  m_SourcePrefab: {fileID: 100100000, guid: 329c3d78ac09e334fb65c9fe92616bc6, type: 3}
+--- !u!4 &129542991850398677 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 6444586294712828132, guid: 329c3d78ac09e334fb65c9fe92616bc6, type: 3}
+  m_PrefabInstance: {fileID: 6387229884709069617}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &716333724680151082 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 5860047361562542875, guid: 329c3d78ac09e334fb65c9fe92616bc6, type: 3}
@@ -679,6 +686,32 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 9064403983274732764, guid: 329c3d78ac09e334fb65c9fe92616bc6, type: 3}
  m_PrefabInstance: {fileID: 6387229884709069617}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &4197513966662553855 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7125661131191776206, guid: 329c3d78ac09e334fb65c9fe92616bc6, type: 3}
+  m_PrefabInstance: {fileID: 6387229884709069617}
+  m_PrefabAsset: {fileID: 0}
+--- !u!65 &3073178764391476130
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4197513966662553855}
+  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: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 2.2657216, y: 1.5574021, z: 4.5322247}
+  m_Center: {x: 0.0000004768373, y: 0.8336425, z: -0.011788848}
 --- !u!4 &6787492584016843305 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 473435645620777240, guid: 329c3d78ac09e334fb65c9fe92616bc6, type: 3}