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/ML-Agents/Timers/Racetrack mini_timers.json.meta
This commit is contained in:
Ciakon
2024-04-12 13:28:50 +02:00
parent 045ba23fd7 1379afa15c
commit c38ce59409
3 changed files with 125 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/ML-Agents/Timers/Racetrack mini_timers.json.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7d2a5db40fad4a84e967eb077fee7d1a
guid: d782ab132601a814383476237b843de4
TextScriptImporter:
externalObjects: {}
userData:

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

@@ -9,6 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4521100388491296405}
- component: {fileID: 57874311452535623}
- component: {fileID: 133451452503184363}
m_Layer: 0
m_Name: Wheel_FL_Collider
@@ -32,6 +33,22 @@ Transform:
m_Children: []
m_Father: {fileID: 7633494796128260512}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &57874311452535623
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 958898810854575637}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9901c050a200da94bbc65da2891b7708, type: 3}
m_Name:
m_EditorClassIdentifier:
wheelModel: {fileID: 2208675037575349654}
WheelCollider: {fileID: 0}
steerable: 1
motorized: 1
--- !u!146 &133451452503184363
WheelCollider:
m_ObjectHideFlags: 0
@@ -80,6 +97,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6017908800610419054}
- component: {fileID: 942680567432017428}
- component: {fileID: 269437700598189008}
m_Layer: 0
m_Name: Wheel_BL_Collider
@@ -103,6 +121,22 @@ Transform:
m_Children: []
m_Father: {fileID: 7633494796128260512}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &942680567432017428
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1291889888039102550}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9901c050a200da94bbc65da2891b7708, type: 3}
m_Name:
m_EditorClassIdentifier:
wheelModel: {fileID: 8957284093749567292}
WheelCollider: {fileID: 0}
steerable: 0
motorized: 1
--- !u!146 &269437700598189008
WheelCollider:
m_ObjectHideFlags: 0
@@ -151,6 +185,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5644291528752137612}
- component: {fileID: 9001513127344400772}
- component: {fileID: 3083305290984775741}
m_Layer: 0
m_Name: Wheel_FR_Collider
@@ -174,6 +209,22 @@ Transform:
m_Children: []
m_Father: {fileID: 7633494796128260512}
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!114 &9001513127344400772
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2253268385440341370}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9901c050a200da94bbc65da2891b7708, type: 3}
m_Name:
m_EditorClassIdentifier:
wheelModel: {fileID: 3351966752540482600}
WheelCollider: {fileID: 0}
steerable: 1
motorized: 1
--- !u!146 &3083305290984775741
WheelCollider:
m_ObjectHideFlags: 0
@@ -241,7 +292,7 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.3487434, y: 1.2610518, z: -2.3607507}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.25, y: 0.25, z: 0.25}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7633494796128260512}
@@ -255,7 +306,7 @@ Rigidbody:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4599203270359476959}
serializedVersion: 4
m_Mass: 1000
m_Mass: 1450
m_Drag: 0.1
m_AngularDrag: 0
m_CenterOfMass: {x: 0, y: 0, z: 0}
@@ -281,17 +332,18 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4599203270359476959}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 58d3a2623a4164b4bb25683edc176b03, type: 3}
m_Name:
m_EditorClassIdentifier:
motorTorque: 2000
brakeTorque: 2000
maxSpeed: 20
steeringRange: 30
steeringRangeAtMaxSpeed: 10
autoBrake: 0
motorTorque: 300
brakeTorque: 500
maxSpeed: 400
steeringRange: 9
steeringRangeAtMaxSpeed: 7
autoBrake: 100
rigidBody: {fileID: 0}
--- !u!1 &6494610058044814199
GameObject:
m_ObjectHideFlags: 0
@@ -301,6 +353,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5264853234930823133}
- component: {fileID: 3076033516170323885}
- component: {fileID: 4541059454383419935}
m_Layer: 0
m_Name: Wheel_BR_Collider
@@ -324,6 +377,22 @@ Transform:
m_Children: []
m_Father: {fileID: 7633494796128260512}
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
--- !u!114 &3076033516170323885
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6494610058044814199}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9901c050a200da94bbc65da2891b7708, type: 3}
m_Name:
m_EditorClassIdentifier:
wheelModel: {fileID: 6781958364159663153}
WheelCollider: {fileID: 0}
steerable: 0
motorized: 1
--- !u!146 &4541059454383419935
WheelCollider:
m_ObjectHideFlags: 0
@@ -385,15 +454,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 459707049714192761, guid: a34d17982603e394b85abe66729deb02, type: 3}
propertyPath: m_LocalPosition.x
value: -1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 459707049714192761, guid: a34d17982603e394b85abe66729deb02, type: 3}
propertyPath: m_LocalPosition.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 459707049714192761, guid: a34d17982603e394b85abe66729deb02, type: 3}
propertyPath: m_LocalPosition.z
value: 3.5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 459707049714192761, guid: a34d17982603e394b85abe66729deb02, type: 3}
propertyPath: m_LocalRotation.w
@@ -435,10 +504,10 @@ PrefabInstance:
addedObject: {fileID: 5644291528752137612}
- targetCorrespondingSourceObject: {fileID: 459707049714192761, guid: a34d17982603e394b85abe66729deb02, type: 3}
insertIndex: -1
addedObject: {fileID: 6017908800610419054}
addedObject: {fileID: 4521100388491296405}
- targetCorrespondingSourceObject: {fileID: 459707049714192761, guid: a34d17982603e394b85abe66729deb02, type: 3}
insertIndex: -1
addedObject: {fileID: 4521100388491296405}
addedObject: {fileID: 6017908800610419054}
- targetCorrespondingSourceObject: {fileID: 459707049714192761, guid: a34d17982603e394b85abe66729deb02, type: 3}
insertIndex: -1
addedObject: {fileID: 5264853234930823133}
@@ -473,8 +542,28 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 2.0421307, y: 1.5047604, z: 4.305852}
m_Center: {x: 0, y: 0.81503993, z: 0.21946335}
--- !u!4 &2208675037575349654 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8153872731855783247, guid: a34d17982603e394b85abe66729deb02, type: 3}
m_PrefabInstance: {fileID: 8038549520670359769}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3351966752540482600 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4686626748596083953, guid: a34d17982603e394b85abe66729deb02, type: 3}
m_PrefabInstance: {fileID: 8038549520670359769}
m_PrefabAsset: {fileID: 0}
--- !u!4 &6781958364159663153 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3571619494755851496, guid: a34d17982603e394b85abe66729deb02, type: 3}
m_PrefabInstance: {fileID: 8038549520670359769}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7633494796128260512 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 459707049714192761, guid: a34d17982603e394b85abe66729deb02, type: 3}
m_PrefabInstance: {fileID: 8038549520670359769}
m_PrefabAsset: {fileID: 0}
--- !u!4 &8957284093749567292 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1423137885988757477, guid: a34d17982603e394b85abe66729deb02, type: 3}
m_PrefabInstance: {fileID: 8038549520670359769}
m_PrefabAsset: {fileID: 0}

41
Assets/Scenes/Racetrack mini.unity
View File

@@ -123,11 +123,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &16893714 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5711380006811689493, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
m_PrefabInstance: {fileID: 1427960684}
m_PrefabAsset: {fileID: 0}
--- !u!1 &19977952
GameObject:
m_ObjectHideFlags: 0
@@ -2600,6 +2595,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
m_PrefabInstance: {fileID: 443573514}
m_PrefabAsset: {fileID: 0}
--- !u!1 &820021813 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4599203270359476959, guid: d5caff8338f793c4eb4490cc52546faf, type: 3}
m_PrefabInstance: {fileID: 1930340722}
m_PrefabAsset: {fileID: 0}
--- !u!4 &860198821 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
@@ -4372,11 +4372,11 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 5418785709807611868, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_Enabled
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalPosition.x
value: 83.8
value: -40.8
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalPosition.y
@@ -4384,7 +4384,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalPosition.z
value: -56.4
value: -5.8
objectReference: {fileID: 0}
- target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
propertyPath: m_LocalRotation.w
@@ -4590,15 +4590,15 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.x
value: 86.31581
value: -46.923958
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.y
value: -1.0605093
value: -0.8705056
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.z
value: -50.95881
value: -7.0643635
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.w
@@ -4606,7 +4606,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.x
value: 0.24253564
value: 0.24253562
objectReference: {fileID: 0}
- target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.y
@@ -4699,22 +4699,22 @@ PrefabInstance:
- target: {fileID: 8858152487650577344, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_Follow
value:
objectReference: {fileID: 1693759701}
objectReference: {fileID: 1930340723}
- target: {fileID: 8858152487650577344, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LookAt
value:
objectReference: {fileID: 1693759701}
objectReference: {fileID: 1930340723}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.x
value: 86.31581
value: -46.923958
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.y
value: -1.0605093
value: -0.8705056
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalPosition.z
value: -50.95881
value: -7.0643635
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.w
@@ -4722,7 +4722,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.x
value: 0.24253564
value: 0.24253562
objectReference: {fileID: 0}
- target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
propertyPath: m_LocalRotation.y
@@ -4957,8 +4957,8 @@ PrefabInstance:
m_SourcePrefab: {fileID: 100100000, guid: ebee340de387f334f9ac44e044abd8fb, type: 3}
--- !u!4 &1693759701 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
m_PrefabInstance: {fileID: 1427960684}
m_CorrespondingSourceObject: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
m_PrefabInstance: {fileID: 1709776410}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1724690485
GameObject:
@@ -5931,3 +5931,4 @@ SceneRoots:
- {fileID: 1605662800}
- {fileID: 2105306304}
- {fileID: 753416033}
- {fileID: 1930340722}