Merge branch 'master' of git@ooftooft.net:Racesm.git
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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}
|
||||
|
||||
47
Assets/Prefabs/GameManager.prefab
Normal file
47
Assets/Prefabs/GameManager.prefab
Normal file
@@ -0,0 +1,47 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &3730747174356696648
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6654786458191517942}
|
||||
- component: {fileID: 5081994082839948773}
|
||||
m_Layer: 0
|
||||
m_Name: GameManager
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &6654786458191517942
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3730747174356696648}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 973.61975, y: 433.16608, z: 10.137479}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &5081994082839948773
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3730747174356696648}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: eb30df1407c4e1348a03c058cb70c8ff, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
playerCar: {fileID: 0}
|
||||
7
Assets/Prefabs/GameManager.prefab.meta
Normal file
7
Assets/Prefabs/GameManager.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: dc3e6243ce610df4c845a9fa5df754a7
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
133839
Assets/Prefabs/Training Areas/TrainingV4.prefab
Normal file
133839
Assets/Prefabs/Training Areas/TrainingV4.prefab
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Prefabs/Training Areas/TrainingV4.prefab.meta
Normal file
7
Assets/Prefabs/Training Areas/TrainingV4.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 742a3192b43bde644ad6d9a3cc58e51d
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user