Ciakon/racesm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ooftooft.net:Racesm

Browse Source 
# 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:
Ciakon
2024-04-24 08:56:12 +02:00
parent 7b313fe2d4 e5ca63e64b
commit 3acfcbf5bc
13 changed files with 1040 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Prefabs/Cars/Hotrod.prefab
View File

@@ -106,7 +106,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 58d3a2623a4164b4bb25683edc176b03, type: 3}
m_Name:
m_EditorClassIdentifier:
motorTorque: 50
motorTorque: 500
brakeTorque: 500
maxSpeed: 100
steeringRange: 9

32
Assets/Prefabs/Cars/RaceCar.prefab
View File

@@ -72,13 +72,13 @@ WheelCollider:
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
@@ -166,7 +166,7 @@ WheelCollider:
m_ExtremumValue: 1
m_AsymptoteSlip: 0.5
m_AsymptoteValue: 0.75
m_Stiffness: 2
m_Stiffness: 3
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
@@ -248,13 +248,13 @@ WheelCollider:
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
@@ -276,8 +276,8 @@ GameObject:
- component: {fileID: 5022958917504388741}
- component: {fileID: 2357909291779874818}
m_Layer: 0
m_Name: Racecar
m_TagString: Untagged
m_Name: RaceCar
m_TagString: Player
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -306,7 +306,7 @@ Rigidbody:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4599203270359476959}
serializedVersion: 4
m_Mass: 1600
m_Mass: 1300
m_Drag: 0.1
m_AngularDrag: 0
m_CenterOfMass: {x: 0, y: 0, z: 0}
@@ -318,7 +318,7 @@ Rigidbody:
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitCom: 0
m_ImplicitTensor: 1
m_UseGravity: 1
m_IsKinematic: 0
@@ -337,14 +337,16 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 58d3a2623a4164b4bb25683edc176b03, type: 3}
m_Name:
m_EditorClassIdentifier:
motorTorque: 300
brakeTorque: 500
maxSpeed: 400
steeringRange: 9
steeringRangeAtMaxSpeed: 7
motorTorque: 650
brakeTorque: 700
maxSpeed: 200
steeringRange: 12
steeringRangeAtMaxSpeed: 8
autoBrake: 100
audio: {fileID: 0}
rigidBody: {fileID: 0}
checkpointsCollected: 0
checkpoints: []
--- !u!1 &6494610058044814199
GameObject:
m_ObjectHideFlags: 0
@@ -423,7 +425,7 @@ WheelCollider:
m_ExtremumValue: 1
m_AsymptoteSlip: 0.5
m_AsymptoteValue: 0.75
m_Stiffness: 2
m_Stiffness: 3
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0

6
Assets/Prefabs/Cars/SchoolBus.prefab
View File

@@ -365,7 +365,7 @@ GameObject:
- component: {fileID: 3850042300170401570}
m_Layer: 0
m_Name: SchoolBus
m_TagString: Untagged
m_TagString: Player
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -394,7 +394,7 @@ Rigidbody:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9044108803436088291}
serializedVersion: 4
m_Mass: 1500
m_Mass: 2000
m_Drag: 0.1
m_AngularDrag: 0
m_CenterOfMass: {x: 0, y: 0, z: 0}
@@ -433,6 +433,8 @@ MonoBehaviour:
autoBrake: 100
audio: {fileID: 0}
rigidBody: {fileID: 0}
checkpointsCollected: 0
checkpoints: []
--- !u!1001 &4482012058693709184
PrefabInstance:
m_ObjectHideFlags: 0

31
Assets/Prefabs/Cars/StreetRacist.prefab
View File

@@ -150,7 +150,7 @@ WheelCollider:
m_ExtremumValue: 1
m_AsymptoteSlip: 0.5
m_AsymptoteValue: 0.75
m_Stiffness: 1.125
m_Stiffness: 2
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
@@ -187,9 +187,10 @@ GameObject:
- component: {fileID: 1090221803596404863}
- component: {fileID: 1929790857927811850}
- component: {fileID: 8561609910625013332}
- component: {fileID: 8114145217251812400}
m_Layer: 0
m_Name: StreetRacist
m_TagString: Untagged
m_TagString: Player
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -232,6 +233,8 @@ MonoBehaviour:
autoBrake: 100
audio: {fileID: 2596011702013363691}
rigidBody: {fileID: 0}
checkpointsCollected: 0
checkpoints: []
--- !u!54 &8561609910625013332
Rigidbody:
m_ObjectHideFlags: 0
@@ -259,6 +262,28 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &8114145217251812400
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3343305849921024470}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 58d3a2623a4164b4bb25683edc176b03, type: 3}
m_Name:
m_EditorClassIdentifier:
motorTorque: 450
brakeTorque: 500
maxSpeed: 110
steeringRange: 45
steeringRangeAtMaxSpeed: 40
autoBrake: 120
audio: {fileID: 0}
rigidBody: {fileID: 0}
checkpointsCollected: 0
checkpoints: []
--- !u!1 &5449209354807011024
GameObject:
m_ObjectHideFlags: 0
@@ -321,7 +346,7 @@ WheelCollider:
m_ExtremumValue: 1
m_AsymptoteSlip: 0.5
m_AsymptoteValue: 0.75
m_Stiffness: 1.125
m_Stiffness: 2
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0

107
Assets/Prefabs/Tracks/Racetrack3.prefab
View File

@@ -1,5 +1,111 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &351053360079161266
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9053630949307204883}
- component: {fileID: 3016128410609624593}
- component: {fileID: 8434205703421450761}
- component: {fileID: 5885390725186999972}
m_Layer: 0
m_Name: Plane
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &9053630949307204883
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 351053360079161266}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.2, z: 0}
m_LocalScale: {x: 100, y: 4, z: 100}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8440853621307243318}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &3016128410609624593
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 351053360079161266}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &8434205703421450761
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 351053360079161266}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10758, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &5885390725186999972
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 351053360079161266}
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: 5
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1023705412061189779
GameObject:
m_ObjectHideFlags: 0
@@ -440,6 +546,7 @@ Transform:
- {fileID: 6729906292851240334}
- {fileID: 6271417281618620428}
- {fileID: 2572699368672332911}
- {fileID: 9053630949307204883}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &13224934022731104