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

This commit is contained in:
PokingPines
2024-04-23 10:46:53 +02:00
47 changed files with 156603 additions and 5701 deletions

View File

@@ -94,13 +94,13 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: IsTurning
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer

View File

@@ -1758,7 +1758,7 @@ Transform:
m_GameObject: {fileID: 153506}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -124.06736, y: 0, z: 100.35948}
m_LocalPosition: {x: -640.6719, y: 0, z: 100.35948}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 58f7e79a87c79824597746e8c1bfe400
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f58d25b9e504a4f41ab4a71cf87c1845
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1 +1 @@
{"count":1,"self":809.2977152,"total":4632.3942763,"children":{"InitializeActuators":{"count":10,"self":0.0025077999999999997,"total":0.0025077999999999997,"children":null},"InitializeSensors":{"count":10,"self":0.0025223,"total":0.0025223,"children":null},"AgentSendState":{"count":1255617,"self":31.879206399999998,"total":70.695593899999992,"children":{"CollectObservations":{"count":2511240,"self":11.534297599999999,"total":11.5342975,"children":null},"WriteActionMask":{"count":2511240,"self":1.0299128,"total":1.0299128,"children":null},"RequestDecision":{"count":2511240,"self":4.8350608,"total":26.2521764,"children":{"AgentInfo.ToProto":{"count":2511240,"self":3.9296072,"total":21.417115499999998,"children":{"GenerateSensorData":{"count":2511240,"self":14.390806399999999,"total":17.4875084,"children":{"RayPerceptionSensor.Perceive":{"count":5022480,"self":3.0967018,"total":3.0967018,"children":null}}}}}}}}},"DecideAction":{"count":1255617,"self":3650.8291071999997,"total":3650.8292428,"children":null},"AgentAct":{"count":1255617,"self":101.3596032,"total":101.56567179999999,"children":{"AgentInfo.ToProto":{"count":13246,"self":0.042745899999999996,"total":0.20606549999999998,"children":{"GenerateSensorData":{"count":13246,"self":0.1278361,"total":0.16331959999999998,"children":{"RayPerceptionSensor.Perceive":{"count":26492,"self":0.0354835,"total":0.0354835,"children":null}}}}}}}},"gauges":{"BensonV6.1.CumulativeReward":{"count":13246,"max":26.7048168,"min":-0.06671302,"runningAverage":17.17633,"value":18.1915569,"weightedAverage":18.4008961}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713626948","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\noahk\\Documents\\Unity projects\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-noahk -hubSessionId e08cc479-296a-466a-a392-68af5330fc09 -accessToken S1StEIprioU2rzDDo5vTCfsRe2zgz-zUchvR2e0iCUQ005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"AI training","end_time_seconds":"1713631580"}}
{"count":1,"self":39.290192,"total":39.369816199999995,"children":{"InitializeActuators":{"count":1,"self":0.0015026999999999998,"total":0.0015026999999999998,"children":null},"InitializeSensors":{"count":1,"self":0.0010000999999999999,"total":0.0010000999999999999,"children":null},"AgentSendState":{"count":1732,"self":0.0165505,"total":0.0299536,"children":{"CollectObservations":{"count":347,"self":0.0070706,"total":0.0070706,"children":null},"WriteActionMask":{"count":347,"self":0.0016007999999999999,"total":0.0016007999999999999,"children":null},"RequestDecision":{"count":347,"self":0.0047317,"total":0.0047317,"children":null}}},"DecideAction":{"count":1732,"self":0.013416899999999999,"total":0.013416899999999999,"children":null},"AgentAct":{"count":1732,"self":0.0327384,"total":0.0327384,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713859090","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\noahk\\Documents\\Unity projects\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-noahk -hubSessionId 249cbe37-b739-48da-be83-8703208ec644 -accessToken 8HP4BNN_d2rYa9gBqxxeXFjsh8NpNokVC4_Asgt7liQ005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"AI training","end_time_seconds":"1713859130"}}

View File

@@ -1 +1,5 @@
{"count":1,"self":24.0355824,"total":24.4568187,"children":{"InitializeActuators":{"count":1,"self":0.0019961,"total":0.0019961,"children":null},"InitializeSensors":{"count":1,"self":0.0030007999999999996,"total":0.0030007999999999996,"children":null},"AgentSendState":{"count":927,"self":0.0219898,"total":0.0439837,"children":{"CollectObservations":{"count":186,"self":0.0059596,"total":0.0059596,"children":null},"WriteActionMask":{"count":186,"self":0.0019936999999999997,"total":0.0019936999999999997,"children":null},"RequestDecision":{"count":186,"self":0.014040599999999999,"total":0.014040599999999999,"children":null}}},"DecideAction":{"count":927,"self":0.3294081,"total":0.3334212,"children":{"RayPerceptionSensor.Perceive":{"count":372,"self":0.0040130999999999995,"total":0.0040130999999999995,"children":null}}},"AgentAct":{"count":927,"self":0.037792,"total":0.037792,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713786962","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\Magnus\\Desktop\\Ny unityting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId a46bbc96-28a5-4259-92a3-973b67f02cfa -accessToken k4OEQxiwScKug_Xa5U1DLZvpTm4D3Er8o-C8T-s54Ak005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1713786986"}}
<<<<<<< HEAD
{"count":1,"self":10.982344,"total":11.1048147,"children":{"InitializeActuators":{"count":1,"self":0.0010012999999999999,"total":0.0010012999999999999,"children":null},"InitializeSensors":{"count":1,"self":0.0015044,"total":0.0015044,"children":null},"AgentSendState":{"count":321,"self":0.008182,"total":0.0197174,"children":{"CollectObservations":{"count":65,"self":0.0025157,"total":0.0025157,"children":null},"WriteActionMask":{"count":65,"self":0,"total":0,"children":null},"RequestDecision":{"count":65,"self":0.0090197,"total":0.0090197,"children":null}}},"DecideAction":{"count":321,"self":0.086684299999999992,"total":0.086684299999999992,"children":{"RayPerceptionSensor.Perceive":{"count":130,"self":0,"total":0,"children":null}}},"AgentAct":{"count":321,"self":0.012562,"total":0.012562,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713861459","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\noahk\\Documents\\Unity projects\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-noahk -hubSessionId 249cbe37-b739-48da-be83-8703208ec644 -accessToken 8HP4BNN_d2rYa9gBqxxeXFjsh8NpNokVC4_Asgt7liQ005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1713861470"}}
=======
{"count":1,"self":67.02152319999999,"total":68.75985519999999,"children":{"InitializeActuators":{"count":1,"self":0.00099969999999999985,"total":0.00099969999999999985,"children":null},"InitializeSensors":{"count":1,"self":0.0029919,"total":0.0029919,"children":null},"AgentSendState":{"count":3173,"self":0.0853182,"total":0.146277,"children":{"CollectObservations":{"count":635,"self":0.0375563,"total":0.0375563,"children":null},"WriteActionMask":{"count":635,"self":0.0019976,"total":0.0019976,"children":null},"RequestDecision":{"count":635,"self":0.021404899999999998,"total":0.021404899999999998,"children":null}}},"DecideAction":{"count":3173,"self":1.3692536,"total":1.3805634,"children":{"RayPerceptionSensor.Perceive":{"count":1270,"self":0.0113098,"total":0.0113098,"children":null}}},"AgentAct":{"count":3173,"self":0.20445629999999998,"total":0.20445629999999998,"children":null}},"gauges":{"BensonV6.1.CumulativeReward":{"count":2,"max":25.4223919,"min":12.8763666,"runningAverage":19.14938,"value":12.8763666,"weightedAverage":22.2858849}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713860886","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\Magnus\\Desktop\\Ny unityting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId 85628495-4bbf-4ebf-9a76-a3f42df70699 -accessToken SYITqeuCKSOmslEUEeguWUuVHsXrKJl43gox_St5y34005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1713860954"}}
>>>>>>> 2990a061aeca8ed1ac64145cadd8b499f1d65402

View File

@@ -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

View File

@@ -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}

View 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}

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: dc3e6243ce610df4c845a9fa5df754a7
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 742a3192b43bde644ad6d9a3cc58e51d
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -1160,6 +1160,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 813494252}
- {fileID: 1393956057}
- {fileID: 1408062815}
- {fileID: 251171423}
@@ -1235,6 +1236,7 @@ MonoBehaviour:
- {fileID: 2100000, guid: de683385749d77b49a1cc4d8876323d8, type: 2}
- {fileID: 2100000, guid: cb13a603242ea654885b9973cf7c97c0, type: 2}
- {fileID: 2100000, guid: 290dcb9964b00e94bb0debc820182e71, type: 2}
startButton: {fileID: 1240586970}
--- !u!81 &481224848
AudioListener:
m_ObjectHideFlags: 0
@@ -1546,6 +1548,71 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 600364070}
m_CullTransparentMesh: 1
--- !u!1001 &637686386
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3730747174356696648, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
propertyPath: m_Name
value: Car Data
objectReference: {fileID: 0}
- target: {fileID: 3730747174356696648, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5081994082839948773, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
propertyPath: playerCar
value:
objectReference: {fileID: 1557708818}
- target: {fileID: 6654786458191517942, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
propertyPath: m_LocalPosition.x
value: 973.61975
objectReference: {fileID: 0}
- target: {fileID: 6654786458191517942, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
propertyPath: m_LocalPosition.y
value: 433.16608
objectReference: {fileID: 0}
- target: {fileID: 6654786458191517942, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
propertyPath: m_LocalPosition.z
value: 10.137479
objectReference: {fileID: 0}
- target: {fileID: 6654786458191517942, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6654786458191517942, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6654786458191517942, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6654786458191517942, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6654786458191517942, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6654786458191517942, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6654786458191517942, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
--- !u!1001 &691379311
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1947,6 +2014,37 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 810085648}
m_CullTransparentMesh: 1
--- !u!1 &813494251
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 813494252}
m_Layer: 0
m_Name: Car Saver
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &813494252
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 813494251}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 481224846}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &832326020
PrefabInstance:
m_ObjectHideFlags: 0
@@ -3635,6 +3733,7 @@ RectTransform:
m_Children:
- {fileID: 1232782459}
- {fileID: 1808069676}
- {fileID: 1240586969}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -3804,6 +3903,127 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1233876300}
m_CullTransparentMesh: 1
--- !u!1 &1240586968
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1240586969}
- component: {fileID: 1240586972}
- component: {fileID: 1240586971}
- component: {fileID: 1240586970}
m_Layer: 5
m_Name: Play
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1240586969
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1240586968}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1718872333}
m_Father: {fileID: 1221337729}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -392}
m_SizeDelta: {x: 300, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1240586970
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1240586968}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1240586971}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &1240586971
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1240586968}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.23031552, g: 0.8490566, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 61583fba956632548911dbe60ba47876, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1240586972
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1240586968}
m_CullTransparentMesh: 1
--- !u!1 &1242612115
GameObject:
m_ObjectHideFlags: 0
@@ -4552,6 +4772,140 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1671445827}
m_CullTransparentMesh: 1
--- !u!1 &1718872332
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1718872333}
- component: {fileID: 1718872335}
- component: {fileID: 1718872334}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1718872333
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1718872332}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1240586969}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1718872334
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1718872332}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Start
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 40
m_fontSizeBase: 40
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 1
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1718872335
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1718872332}
m_CullTransparentMesh: 1
--- !u!1 &1728768882
GameObject:
m_ObjectHideFlags: 0
@@ -5550,3 +5904,4 @@ SceneRoots:
- {fileID: 1221337729}
- {fileID: 1741633972}
- {fileID: 146840321}
- {fileID: 637686386}

View File

@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.32097125, g: 0.21131825, b: 0.40435025, a: 1}
m_IndirectSpecularColor: {r: 0.32107174, g: 0.21133253, b: 0.40438062, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -4007,13 +4007,13 @@ MonoBehaviour:
m_HorizontalDamping: 4.8
m_VerticalDamping: 0.5
m_ScreenX: 0.5
m_ScreenY: 0.5
m_ScreenY: 0.62
m_DeadZoneWidth: 0
m_DeadZoneHeight: 0
m_SoftZoneWidth: 0.264
m_SoftZoneHeight: 0.181
m_SoftZoneWidth: 0.04
m_SoftZoneHeight: 0.11
m_BiasX: 0
m_BiasY: 0
m_BiasY: -0.12
m_CenterOnActivate: 1
--- !u!1001 &287427410
PrefabInstance:
@@ -4298,7 +4298,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &323815922
Transform:
m_ObjectHideFlags: 0
@@ -6026,6 +6026,11 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
--- !u!4 &440836397 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
m_PrefabInstance: {fileID: 1205272008}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &443573514
PrefabInstance:
m_ObjectHideFlags: 0
@@ -6949,6 +6954,50 @@ MonoBehaviour:
animator: {fileID: 546157697}
npcPrefab: {fileID: 153506, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3}
audio: {fileID: 0}
--- !u!1 &556260502
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 556260504}
- component: {fileID: 556260503}
m_Layer: 0
m_Name: Car Loader
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &556260503
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 556260502}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7750762847caa7b4bbc035455344adf9, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &556260504
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 556260502}
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!4 &559703698 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
@@ -14855,6 +14904,63 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3}
--- !u!1001 &1205272008
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_LocalPosition.x
value: 62.069893
objectReference: {fileID: 0}
- target: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_LocalPosition.y
value: 0.25062922
objectReference: {fileID: 0}
- target: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_LocalPosition.z
value: 13.101168
objectReference: {fileID: 0}
- target: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3343305849921024470, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
propertyPath: m_Name
value: StreetRacist
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3}
--- !u!1001 &1207110270
PrefabInstance:
m_ObjectHideFlags: 0
@@ -17225,11 +17331,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
--- !u!4 &1427960685 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1671451206055750931, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
m_PrefabInstance: {fileID: 1427960684}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1430263216
PrefabInstance:
m_ObjectHideFlags: 0
@@ -17389,8 +17490,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1438942457}
serializedVersion: 2
m_LocalRotation: {x: 0.16245987, y: 0.688191, z: -0.16245987, w: 0.688191}
m_LocalPosition: {x: 10.6308975, y: -35.366627, z: 101.59595}
m_LocalRotation: {x: 0.11473485, y: 0.6977363, z: -0.11473485, w: 0.6977363}
m_LocalPosition: {x: 9.25079, y: -35.426, z: 97.42711}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -17415,8 +17516,8 @@ MonoBehaviour:
m_StreamingVersion: 20170927
m_Priority: 10
m_StandbyUpdate: 2
m_LookAt: {fileID: 1427960685}
m_Follow: {fileID: 1427960685}
m_LookAt: {fileID: 440836397}
m_Follow: {fileID: 440836397}
m_Lens:
FieldOfView: 60.000004
OrthographicSize: 5
@@ -24980,6 +25081,63 @@ MonoBehaviour:
animator: {fileID: 2019051411}
npcPrefab: {fileID: 153506, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3}
audio: {fileID: 0}
--- !u!1001 &2047826617
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 9044108803436088291, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_Name
value: SchoolBus
objectReference: {fileID: 0}
- target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_LocalPosition.x
value: 64.31719
objectReference: {fileID: 0}
- target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_LocalPosition.y
value: 0.25099647
objectReference: {fileID: 0}
- target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_LocalPosition.z
value: 14.522134
objectReference: {fileID: 0}
- target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3}
--- !u!1 &2049722134
GameObject:
m_ObjectHideFlags: 0
@@ -25007,8 +25165,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2049722134}
serializedVersion: 2
m_LocalRotation: {x: 0.16245987, y: 0.688191, z: -0.16245987, w: 0.688191}
m_LocalPosition: {x: 10.6308975, y: -35.366627, z: 101.59595}
m_LocalRotation: {x: 0.11473485, y: 0.6977363, z: -0.11473485, w: 0.6977363}
m_LocalPosition: {x: 9.25079, y: -35.426, z: 97.42711}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -26450,3 +26608,6 @@ SceneRoots:
- {fileID: 5211344267139555828}
- {fileID: 998358590}
- {fileID: 323815922}
- {fileID: 556260504}
- {fileID: 1205272008}
- {fileID: 2047826617}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -266,7 +266,6 @@ public class AgentControllerV6 : Agent
totalReward = 0;
print("checkpoint");
}
currentStep += 1;

View File

@@ -0,0 +1,295 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Unity.MLAgents;
using Unity.MLAgents.Sensors;
using Unity.MLAgents.Actuators;
using UnityEngine.UIElements;
using System.Linq;
using Unity.Mathematics;
using Unity.VisualScripting;
using System.Reflection;
using System;
public class AgentControllerV7 : Agent
{
public float motorTorque = 300;
public float brakeTorque = 500;
public float maxSpeed = 400;
public float steeringRange = 9;
public float steeringRangeAtMaxSpeed = 7;
public float autoBrake = 100;
WheelControl[] wheels;
public List<GameObject> checkpoints;
Rigidbody rb;
Vector3 startPosition;
Quaternion startRotation;
int currentStep = 0;
float totalReward = 0;
float totalMentalPain = 0;
int stepsSinceCheckpoint = 0;
int checkpointsReached = 0;
public int maxStepsPerCheckpoint = 300;
public int distanceBetweenCheckpoints = 5;
public bool ignoreMentalPain = true;
// Start is called before the first frame update
void Start()
{
rb = GetComponent<Rigidbody>();
// Find all child GameObjects that have the WheelControl script attached
wheels = GetComponentsInChildren<WheelControl>();
startPosition = transform.localPosition;
startRotation = transform.localRotation;
}
public override void OnEpisodeBegin()
{
stepsSinceCheckpoint = 0;
checkpointsReached = 0;
totalReward = 0;
totalMentalPain = 0;
// reset wheels
foreach (var wheel in wheels)
{
wheel.WheelCollider.brakeTorque = 0;
wheel.WheelCollider.motorTorque = 0;
wheel.WheelCollider.steerAngle = 0;
}
// reset car
transform.localPosition = startPosition;
transform.localRotation = startRotation;
rb.velocity = Vector3.zero;
rb.angularVelocity = Vector3.zero;
}
public override void CollectObservations(VectorSensor sensor)
{
Transform currentCheckpoint = checkpoints[checkpointsReached].transform;
// distance to next checkpoint
sensor.AddObservation(distanceToCheckpoint(currentCheckpoint));
// relative angle to checkpoint
sensor.AddObservation(angleToCheckpoint(currentCheckpoint));
// relative vector pointing to checkpoint
Vector3 position = transform.localPosition;
Vector3 checkpointPosition = currentCheckpoint.localPosition;
Vector3 toCheckpoint = new Vector3(
checkpointPosition.x - position.x,
0,
checkpointPosition.z - position.z
);
float carAngle = transform.localEulerAngles.y;
toCheckpoint = Quaternion.Euler(0, -carAngle, 0) * toCheckpoint.normalized;
sensor.AddObservation(toCheckpoint.x);
sensor.AddObservation(toCheckpoint.z);
// relative Velocity
Vector3 velocity = new Vector3(
rb.velocity.x,
0,
rb.velocity.z
);
Vector3 relativeVelocity = Quaternion.Euler(0, -carAngle, 0) * velocity;
sensor.AddObservation(relativeVelocity.x);
sensor.AddObservation(relativeVelocity.z);
}
public override void OnActionReceived(ActionBuffers actions)
{
// Actions size = 2 [vertical speed, horizontal speed] = [-1..1, -1..1] // discrete = [{0, 1, 2}, {0, 1, 2}] = [{-1, 0, 1}...]
float vInput = 0;
float hInput = 0;
if (actions.DiscreteActions[0] == 0)
vInput = -1f;
if (actions.DiscreteActions[0] == 1)
vInput = 1f;
if (actions.DiscreteActions[1] == 0)
hInput = -1f;
if (actions.DiscreteActions[1] == 1)
hInput = 1f;
// give benson mental pain for existing (punishment for maximizing first checkpoint by standing still)
// AddReward(-0.002f);
AddReward(-0.0018f); // less pain because of V4
totalMentalPain -= 0.0018f;
if (ignoreMentalPain)
totalReward -= 0.0018f;
float forwardSpeed = Vector3.Dot(transform.forward, rb.velocity);
// Calculate how close the car is to top speed
// as a number from zero to one
float speedFactor = Mathf.InverseLerp(0, maxSpeed / 4, forwardSpeed);
// Use that to calculate how much torque is available
// (zero torque at top speed)
float currentMotorTorque = Mathf.Lerp(motorTorque, 0, speedFactor);
// …and to calculate how much to steer
// (the car steers more gently at top speed)
float currentSteerRange = Mathf.Lerp(steeringRange, steeringRangeAtMaxSpeed, speedFactor);
// Check whether the user input is in the same direction
// as the car's velocity
bool isAccelerating = Mathf.Sign(vInput) == Mathf.Sign(forwardSpeed);
bool isStopping = vInput == 0; // range
bool isBraking = (vInput < 0 && forwardSpeed > 0) || (vInput > 0 && forwardSpeed < 0);
if (vInput > 0 && forwardSpeed < 0)
{
isAccelerating = false;
}
foreach (var wheel in wheels)
{
// Apply steering to Wheel colliders that have "Steerable" enabled
if (wheel.steerable)
{
wheel.WheelCollider.steerAngle = hInput * currentSteerRange;
}
if (isBraking)
{
wheel.WheelCollider.brakeTorque = Mathf.Abs(vInput) * brakeTorque;
//wheel.WheelCollider.motorTorque = 0;
}
if (isAccelerating)
{
// Apply torque to Wheel colliders that have "Motorized" enabled
if (wheel.motorized)
{
wheel.WheelCollider.motorTorque = vInput * currentMotorTorque;
}
wheel.WheelCollider.brakeTorque = 0;
}
if (isStopping)
{
// If the user is trying to go in the opposite direction
// apply brakes to all wheels
wheel.WheelCollider.brakeTorque = Mathf.Abs(vInput) * brakeTorque + autoBrake;
if (forwardSpeed < 0)
{
wheel.WheelCollider.brakeTorque = (Mathf.Abs(vInput) * brakeTorque + autoBrake) * 5;
}
}
}
// rewards
Transform currentCheckpoint = checkpoints[checkpointsReached].transform;
float checkpintDistance = distanceToCheckpoint(currentCheckpoint);
float reward = (1 - Mathf.InverseLerp(0, distanceBetweenCheckpoints, checkpintDistance)) / 500;
totalReward += reward;
AddReward(reward);
float checkpointAngle = angleToCheckpoint(currentCheckpoint);
if (checkpointAngle > 0)
reward = (1 - Mathf.InverseLerp(0, 60, checkpointAngle)) / 2000;
else
reward = Mathf.InverseLerp(-60, 0, checkpointAngle) / 2000;
AddReward(reward);
if (checkpintDistance < 0.1f)
{
stepsSinceCheckpoint = 0;
checkpointsReached += 1;
// If last checkpoint
if (checkpointsReached == checkpoints.Count - 1)
{
AddReward(10f);
EndEpisode();
}
//TODO fix variable names
AddReward(1f);
AddReward(-totalReward);
totalReward = 0;
}
currentStep += 1;
stepsSinceCheckpoint += 1;
if (stepsSinceCheckpoint >= maxStepsPerCheckpoint)
{
stepsSinceCheckpoint = 0;
EndEpisode();
}
// print(GetCumulativeReward());
}
public override void Heuristic(in ActionBuffers actionsOut)
{
var discreteActionsOut = actionsOut.DiscreteActions;
discreteActionsOut[0] = 2;
discreteActionsOut[1] = 2;
if (Input.GetAxis("Vertical") < -0.5)
discreteActionsOut[0] = 0;
if (Input.GetAxis("Vertical") > 0.5)
discreteActionsOut[0] = 1;
if (Input.GetAxis("Horizontal") < -0.5)
discreteActionsOut[1] = 0;
if (Input.GetAxis("Horizontal") > 0.5)
discreteActionsOut[1] = 1;
}
// finds distance from agent to closest point on the checkpoint line
float distanceToCheckpoint(Transform checkpoint)
{
var closestPoint = checkpoint.GetComponent<Collider>().ClosestPointOnBounds(transform.position);
var distanceToCheckpoint = Vector3.Distance(transform.position, closestPoint);
return distanceToCheckpoint;
}
float angleToCheckpoint(Transform checkpoint)
{
Vector3 checkpointDirection = checkpoint.localPosition - transform.localPosition;
float angle = Vector3.SignedAngle(transform.forward, checkpointDirection, Vector3.up);
return angle;
}
private void OnCollisionEnter(Collision other) {
// if (other.gameObject.tag == "NPC")
// {
// AddReward(0.1f);
// }
if (other.gameObject.tag == "Player")
{
AddReward(-0.1f);
}
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 2eeab89a9b8a5f04291ce55ceb722904
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -2,6 +2,7 @@ using System.Collections;
using System.Collections.Generic;
using Unity.Mathematics;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class Garage : MonoBehaviour
@@ -13,6 +14,7 @@ public class Garage : MonoBehaviour
public Button[] ColorButtons;
public Material[] Colors;
quaternion currentRotation;
public Button startButton;
void Start()
{
CarButtons[0].onClick.AddListener(SelectHotrod);
@@ -37,6 +39,8 @@ public class Garage : MonoBehaviour
ColorButtons[10].onClick.AddListener(SelectWhite);
ColorButtons[11].onClick.AddListener(SelectYellow);
startButton.onClick.AddListener(startGame);
disable();
SelectHotrod();
}
@@ -62,6 +66,11 @@ public class Garage : MonoBehaviour
CurrentCar.transform.rotation = currentRotation;
}
void startGame()
{
SceneManager.LoadScene("Racetrack mini");
}
void SelectHotrod()
{
SelectCar(0);

View File

@@ -0,0 +1,25 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class CarLoader : MonoBehaviour
{
public GameObject Hotrod;
GameObject playerCar;
void Start()
{
playerCar = GameObject.Find("Car Data").GetComponent<CarData>().playerCar;
replaceCar(Hotrod);
}
void replaceCar(GameObject car)
{
Transform carTransform = car.transform;
playerCar.transform.position = carTransform.position;
playerCar.transform.rotation = carTransform.rotation;
playerCar.transform.localScale = carTransform.localScale;
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 7750762847caa7b4bbc035455344adf9
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,11 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class CarData : MonoBehaviour
{
public GameObject playerCar;
private void Awake() {
DontDestroyOnLoad(gameObject);
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: eb30df1407c4e1348a03c058cb70c8ff
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@@ -10,8 +10,7 @@ AnimatorState:
m_Name: Fall
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 6812994496983608102}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -65,7 +64,7 @@ AnimatorController:
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_DefaultBool: 1
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
@@ -105,28 +104,6 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 7207422066676919104}
--- !u!1101 &6812994496983608102
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 0}
m_Solo: 0
m_Mute: 0
m_IsExit: 1
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.93775934
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &7207422066676919104
AnimatorState:
serializedVersion: 6