diff --git a/.gitignore b/.gitignore index b1ab82b..ef3ddc5 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ venv .venv +/MLAgents/Timers/ # MemoryCaptures can get excessive in size. # They also could contain extremely sensitive data diff --git a/Assets/Brains/BensonV7.onnx b/Assets/Brains/BensonV7.onnx new file mode 100644 index 0000000..20da0af Binary files /dev/null and b/Assets/Brains/BensonV7.onnx differ diff --git a/Assets/Brains/BensonV7.onnx.meta b/Assets/Brains/BensonV7.onnx.meta new file mode 100644 index 0000000..bba1844 --- /dev/null +++ b/Assets/Brains/BensonV7.onnx.meta @@ -0,0 +1,16 @@ +fileFormatVersion: 2 +guid: 32480f119eb42a149a893e96102e1fed +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 683b6cb6d0a474744822c888b46772c9, type: 3} + optimizeModel: 1 + forceArbitraryBatchSize: 1 + treatErrorsAsWarnings: 0 + importMode: 1 + weightsTypeMode: 0 + activationTypeMode: 0 diff --git a/Assets/ML-Agents/Timers/Car Customization_timers.json b/Assets/ML-Agents/Timers/Car Customization_timers.json index c03daa8..b8e816d 100644 --- a/Assets/ML-Agents/Timers/Car Customization_timers.json +++ b/Assets/ML-Agents/Timers/Car Customization_timers.json @@ -1 +1,9 @@ +<<<<<<< HEAD +<<<<<<< HEAD +{"count":1,"self":9.7942816,"total":9.9178692,"children":{"InitializeActuators":{"count":3,"self":0.0020459,"total":0.0020459,"children":null},"InitializeSensors":{"count":3,"self":0.0030012,"total":0.0030012,"children":null},"AgentSendState":{"count":1,"self":0.0055818,"total":0.0235843,"children":{"CollectObservations":{"count":3,"self":0.0020201,"total":0.0020201,"children":null},"WriteActionMask":{"count":3,"self":0,"total":0,"children":null},"RequestDecision":{"count":3,"self":0.0159824,"total":0.0159824,"children":null}}},"DecideAction":{"count":1,"self":0.091910999999999993,"total":0.09295479999999999,"children":{"RayPerceptionSensor.Perceive":{"count":6,"self":0.0010438,"total":0.0010438,"children":null}}},"AgentAct":{"count":1,"self":0.0020017,"total":0.0020017,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713939645","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 985081e8-b814-4bc7-8736-608aea67ce7e -accessToken fMKSu_LeJtSMMwbIluJ0HvaiatLXHDxWic8X4MA6BEQ005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Car Customization","end_time_seconds":"1713939655"}} +======= {"count":1,"self":107.2838656,"total":107.4925277,"children":{"InitializeActuators":{"count":3,"self":0.0009975,"total":0.0009975,"children":null},"InitializeSensors":{"count":3,"self":0.0025054,"total":0.0025054,"children":null},"AgentSendState":{"count":456,"self":0.011536999999999999,"total":0.026688,"children":{"CollectObservations":{"count":276,"self":0.0020269,"total":0.0020269,"children":null},"WriteActionMask":{"count":276,"self":0,"total":0,"children":null},"RequestDecision":{"count":276,"self":0.0131241,"total":0.0131241,"children":null}}},"DecideAction":{"count":456,"self":0.1577449,"total":0.1597336,"children":{"RayPerceptionSensor.Perceive":{"count":552,"self":0.0019887,"total":0.0019887,"children":null}}},"AgentAct":{"count":456,"self":0.018735099999999998,"total":0.018735099999999998,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713938404","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\\UnityStuf\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId 8870a2b5-eb85-482c-9f97-a69682ef9b2b -accessToken U1Q6bPAeMgVc12tgfRzGzGVn7bYVzdxATeIOIKVjt3o005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Car Customization","end_time_seconds":"1713938511"}} +>>>>>>> e5ca63e64be4e6649cff2239dddc8b93f8132a10 +======= +{"count":1,"self":107.2838656,"total":107.4925277,"children":{"InitializeActuators":{"count":3,"self":0.0009975,"total":0.0009975,"children":null},"InitializeSensors":{"count":3,"self":0.0025054,"total":0.0025054,"children":null},"AgentSendState":{"count":456,"self":0.011536999999999999,"total":0.026688,"children":{"CollectObservations":{"count":276,"self":0.0020269,"total":0.0020269,"children":null},"WriteActionMask":{"count":276,"self":0,"total":0,"children":null},"RequestDecision":{"count":276,"self":0.0131241,"total":0.0131241,"children":null}}},"DecideAction":{"count":456,"self":0.1577449,"total":0.1597336,"children":{"RayPerceptionSensor.Perceive":{"count":552,"self":0.0019887,"total":0.0019887,"children":null}}},"AgentAct":{"count":456,"self":0.018735099999999998,"total":0.018735099999999998,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713938404","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\\UnityStuf\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId 8870a2b5-eb85-482c-9f97-a69682ef9b2b -accessToken U1Q6bPAeMgVc12tgfRzGzGVn7bYVzdxATeIOIKVjt3o005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Car Customization","end_time_seconds":"1713938511"}} +>>>>>>> 6da99da8c2f8207a43f20c59211df05003d51cb1 diff --git a/Assets/ML-Agents/Timers/Racetrack mini_timers.json b/Assets/ML-Agents/Timers/Racetrack mini_timers.json index 045286d..cf56280 100644 --- a/Assets/ML-Agents/Timers/Racetrack mini_timers.json +++ b/Assets/ML-Agents/Timers/Racetrack mini_timers.json @@ -1 +1,9 @@ +<<<<<<< HEAD +<<<<<<< HEAD +{"count":1,"self":159.4891264,"total":161.4726944,"children":{"InitializeActuators":{"count":3,"self":0.0017177,"total":0.0017177,"children":null},"InitializeSensors":{"count":3,"self":0.0035045999999999996,"total":0.0035045999999999996,"children":null},"AgentSendState":{"count":7823,"self":0.21347139999999998,"total":0.3103626,"children":{"CollectObservations":{"count":4695,"self":0.0624739,"total":0.0624739,"children":null},"WriteActionMask":{"count":4695,"self":0.0065712999999999995,"total":0.0065712999999999995,"children":null},"RequestDecision":{"count":4695,"self":0.027846,"total":0.027846,"children":null}}},"DecideAction":{"count":7823,"self":1.3662385,"total":1.3839671,"children":{"RayPerceptionSensor.Perceive":{"count":9390,"self":0.0177286,"total":0.0177286,"children":null}}},"AgentAct":{"count":7823,"self":0.28402109999999997,"total":0.28402109999999997,"children":null}},"gauges":{"BensonV6.1.CumulativeReward":{"count":14,"max":-0.163073957,"min":-0.244621739,"runningAverage":-0.203467548,"value":-0.166420355,"weightedAverage":-0.199763283}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713940415","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 985081e8-b814-4bc7-8736-608aea67ce7e -accessToken fMKSu_LeJtSMMwbIluJ0HvaiatLXHDxWic8X4MA6BEQ005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1713940577"}} +======= {"count":1,"self":13.0702272,"total":13.2399828,"children":{"InitializeActuators":{"count":2,"self":0.00099739999999999985,"total":0.00099739999999999985,"children":null},"InitializeSensors":{"count":2,"self":0.0015034,"total":0.0015034,"children":null},"AgentSendState":{"count":394,"self":0.0077031999999999995,"total":0.0247832,"children":{"CollectObservations":{"count":158,"self":0.004493,"total":0.004493,"children":null},"WriteActionMask":{"count":158,"self":0,"total":0,"children":null},"RequestDecision":{"count":158,"self":0.012587,"total":0.012587,"children":null}}},"DecideAction":{"count":394,"self":0.1281029,"total":0.1290791,"children":{"RayPerceptionSensor.Perceive":{"count":316,"self":0.0009762,"total":0.0009762,"children":null}}},"AgentAct":{"count":394,"self":0.0108823,"total":0.0108823,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713938654","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\\UnityStuf\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId 8870a2b5-eb85-482c-9f97-a69682ef9b2b -accessToken U1Q6bPAeMgVc12tgfRzGzGVn7bYVzdxATeIOIKVjt3o005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1713938667"}} +>>>>>>> e5ca63e64be4e6649cff2239dddc8b93f8132a10 +======= +{"count":1,"self":13.0702272,"total":13.2399828,"children":{"InitializeActuators":{"count":2,"self":0.00099739999999999985,"total":0.00099739999999999985,"children":null},"InitializeSensors":{"count":2,"self":0.0015034,"total":0.0015034,"children":null},"AgentSendState":{"count":394,"self":0.0077031999999999995,"total":0.0247832,"children":{"CollectObservations":{"count":158,"self":0.004493,"total":0.004493,"children":null},"WriteActionMask":{"count":158,"self":0,"total":0,"children":null},"RequestDecision":{"count":158,"self":0.012587,"total":0.012587,"children":null}}},"DecideAction":{"count":394,"self":0.1281029,"total":0.1290791,"children":{"RayPerceptionSensor.Perceive":{"count":316,"self":0.0009762,"total":0.0009762,"children":null}}},"AgentAct":{"count":394,"self":0.0108823,"total":0.0108823,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713938654","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\\UnityStuf\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId 8870a2b5-eb85-482c-9f97-a69682ef9b2b -accessToken U1Q6bPAeMgVc12tgfRzGzGVn7bYVzdxATeIOIKVjt3o005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1713938667"}} +>>>>>>> 6da99da8c2f8207a43f20c59211df05003d51cb1 diff --git a/Assets/Prefabs/Cars/Hotrod (Benson) Variant.prefab b/Assets/Prefabs/Cars/Hotrod (Benson) Variant.prefab index b9ecdcf..883dbf2 100644 --- a/Assets/Prefabs/Cars/Hotrod (Benson) Variant.prefab +++ b/Assets/Prefabs/Cars/Hotrod (Benson) Variant.prefab @@ -252,6 +252,18 @@ PrefabInstance: propertyPath: m_CenterOfMass.y value: 0.05 objectReference: {fileID: 0} + - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3} propertyPath: m_LocalPosition.x value: 60 @@ -296,6 +308,18 @@ PrefabInstance: propertyPath: m_Name value: Hotrod (Benson) Variant objectReference: {fileID: 0} + - target: {fileID: 7953198523918571078, guid: 5851f609a58dc884a99030da0105c6db, type: 3} + propertyPath: m_LocalScale.x + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 7953198523918571078, guid: 5851f609a58dc884a99030da0105c6db, type: 3} + propertyPath: m_LocalScale.y + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 7953198523918571078, guid: 5851f609a58dc884a99030da0105c6db, type: 3} + propertyPath: m_LocalScale.z + value: 0.25 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 5418785709807611868, guid: 5851f609a58dc884a99030da0105c6db, type: 3} m_RemovedGameObjects: @@ -399,6 +423,7 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} - {fileID: 0} + checkpointsCollected: 0 maxStepsPerCheckpoint: 400 distanceBetweenCheckpoints: 20 ignoreMentalPain: 1 diff --git a/Assets/Prefabs/CheckPoint.prefab b/Assets/Prefabs/CheckPoint.prefab index 037a2c6..a162c05 100644 --- a/Assets/Prefabs/CheckPoint.prefab +++ b/Assets/Prefabs/CheckPoint.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 1915818325675539370} - component: {fileID: 3466260334280045808} - component: {fileID: 5655726606384773670} + - component: {fileID: 7221852830714037971} m_Layer: 2 m_Name: CheckPoint m_TagString: Checkpoint @@ -120,3 +121,30 @@ MonoBehaviour: m_EditorClassIdentifier: isCollected: 0 isVisible: 1 +--- !u!54 &7221852830714037971 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7234834637752836426} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 diff --git a/Assets/Scenes/Racetrack mini.unity b/Assets/Scenes/Racetrack mini.unity index 75fc80d..e061bcd 100644 --- a/Assets/Scenes/Racetrack mini.unity +++ b/Assets/Scenes/Racetrack mini.unity @@ -1487,8 +1487,8 @@ MonoBehaviour: m_StreamingVersion: 20170927 m_Priority: 10 m_StandbyUpdate: 2 - m_LookAt: {fileID: 1254528597} - m_Follow: {fileID: 1254528597} + m_LookAt: {fileID: 0} + m_Follow: {fileID: 0} m_Lens: FieldOfView: 60.000004 OrthographicSize: 5 @@ -6010,65 +6010,6 @@ MonoBehaviour: animator: {fileID: 407855494} npcPrefab: {fileID: 153506, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3} audio: {fileID: 0} ---- !u!1 &408902593 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 408902594} - - component: {fileID: 408902595} - m_Layer: 0 - m_Name: RaysForward - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &408902594 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 408902593} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.9100001, y: 0, z: 0.13000083} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 788662683} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &408902595 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 408902593} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6bb6b867a41448888c1cd4f99643ad71, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SensorName: RaysForward - m_DetectableTags: - - Wall - m_RaysPerDirection: 1 - m_MaxRayDegrees: 30 - m_SphereCastRadius: 0 - m_RayLength: 10 - m_RayLayerMask: - serializedVersion: 2 - m_Bits: 4294967291 - m_ObservationStacks: 1 - rayHitColor: {r: 1, g: 0, b: 0, a: 1} - rayMissColor: {r: 1, g: 1, b: 1, a: 1} - m_StartVerticalOffset: 0.2 - m_EndVerticalOffset: 0.2 --- !u!1001 &434643104 PrefabInstance: m_ObjectHideFlags: 0 @@ -9410,7 +9351,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &741699578 Transform: m_ObjectHideFlags: 0 @@ -10389,221 +10330,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1288577159706020061, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} m_PrefabInstance: {fileID: 787070680} m_PrefabAsset: {fileID: 0} ---- !u!1001 &788662682 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1017151060} - m_Modifications: - - target: {fileID: 3850042300170401570, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8102326441070962310, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} - propertyPath: m_Constraints - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 8102326441070962310, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} - propertyPath: m_CenterOfMass.y - value: 0.07 - objectReference: {fileID: 0} - - target: {fileID: 9044108803436088291, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} - propertyPath: m_Name - value: SchoolBus - objectReference: {fileID: 0} - - target: {fileID: 9044108803436088291, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} - propertyPath: m_LocalPosition.x - value: 61.27 - objectReference: {fileID: 0} - - target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} - propertyPath: m_LocalPosition.z - value: 15.1 - 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: 0 - 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: - - targetCorrespondingSourceObject: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} - insertIndex: -1 - addedObject: {fileID: 408902594} - - targetCorrespondingSourceObject: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} - insertIndex: -1 - addedObject: {fileID: 1818576489} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 9044108803436088291, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} - insertIndex: -1 - addedObject: {fileID: 788662686} - - targetCorrespondingSourceObject: {fileID: 9044108803436088291, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} - insertIndex: -1 - addedObject: {fileID: 788662685} - - targetCorrespondingSourceObject: {fileID: 9044108803436088291, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} - insertIndex: -1 - addedObject: {fileID: 788662688} - - targetCorrespondingSourceObject: {fileID: 9044108803436088291, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} - insertIndex: -1 - addedObject: {fileID: 788662687} - m_SourcePrefab: {fileID: 100100000, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} ---- !u!4 &788662683 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 9048518517659192843, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} - m_PrefabInstance: {fileID: 788662682} - m_PrefabAsset: {fileID: 0} ---- !u!1 &788662684 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 9044108803436088291, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} - m_PrefabInstance: {fileID: 788662682} - m_PrefabAsset: {fileID: 0} ---- !u!114 &788662685 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 788662684} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e504560e573e8634db5ced380452680f, type: 3} - m_Name: - m_EditorClassIdentifier: - agentParameters: - maxStep: 0 - hasUpgradedFromAgentParameters: 1 - MaxStep: 0 - motorTorque: 300 - brakeTorque: 500 - maxSpeed: 400 - steeringRange: 9 - steeringRangeAtMaxSpeed: 7 - autoBrake: 100 - checkpoints: - - {fileID: 1131200526} - - {fileID: 1131200525} - - {fileID: 1131200524} - - {fileID: 1131200523} - - {fileID: 1131200522} - - {fileID: 1131200521} - - {fileID: 1131200520} - - {fileID: 1131200519} - - {fileID: 1131200518} - - {fileID: 1131200517} - - {fileID: 1131200516} - - {fileID: 1131200515} - - {fileID: 1131200514} - - {fileID: 1131200513} - - {fileID: 1131200512} - - {fileID: 1131200511} - maxStepsPerCheckpoint: 1000 - distanceBetweenCheckpoints: 20 - ignoreMentalPain: 1 ---- !u!114 &788662686 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 788662684} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5d1c4e0b1822b495aa52bc52839ecb30, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BrainParameters: - VectorObservationSize: 6 - NumStackedVectorObservations: 1 - m_ActionSpec: - m_NumContinuousActions: 0 - BranchSizes: 0300000003000000 - VectorActionSize: 0300000003000000 - VectorActionDescriptions: [] - VectorActionSpaceType: 0 - hasUpgradedBrainParametersWithActionSpec: 1 - m_Model: {fileID: 5022602860645237092, guid: 5f6df22bf205b4e4c8a67843cc705a0f, type: 3} - m_InferenceDevice: 0 - m_BehaviorType: 2 - m_BehaviorName: BensonV6.1 - TeamId: 0 - m_UseChildSensors: 1 - m_UseChildActuators: 1 - m_ObservableAttributeHandling: 0 ---- !u!114 &788662687 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 788662684} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3a5c9d521e5ef4759a8246a07d52221e, type: 3} - m_Name: - m_EditorClassIdentifier: - DecisionPeriod: 5 - TakeActionsBetweenDecisions: 1 ---- !u!114 &788662688 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 788662684} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0ee5992a8d68a894cba0612b0c18c3db, type: 3} - m_Name: - m_EditorClassIdentifier: - materialParts: - - {fileID: 1493536274} - defaultColors: - - {fileID: 2100000, guid: 290dcb9964b00e94bb0debc820182e71, type: 2} --- !u!1001 &802211941 PrefabInstance: m_ObjectHideFlags: 0 @@ -13604,7 +13330,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 396140330680532875, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: isVisible - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 412752423574035104, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_IsTrigger @@ -13624,7 +13350,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1234340044873012413, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: isVisible - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1538308268628703026, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_IsTrigger @@ -13636,7 +13362,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1782845334259341203, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: isVisible - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1821257461652563359, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_Enabled @@ -13660,7 +13386,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2841995830362743840, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: isVisible - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2923142518193870472, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_Constraints @@ -13684,7 +13410,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3430823091347191092, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: isVisible - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3731957927503702725, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_IsTrigger @@ -13720,7 +13446,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4931592534409690396, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: isVisible - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5028891603338188081, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_Enabled @@ -13728,7 +13454,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5206757801600008171, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: isVisible - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5413340004314508697, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_Name @@ -13736,7 +13462,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5413340004314508697, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5413340004314508697, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_TagString @@ -13788,7 +13514,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5597165083144512531, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: isVisible - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5717467054321889237, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_LocalPosition.x @@ -13808,7 +13534,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6248371655047305591, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: isVisible - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6408542808343726725, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_IsActive @@ -13820,11 +13546,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6698349112800946072, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6825457734151485959, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: isVisible - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6858205825073773017, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_Model @@ -13836,11 +13562,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6914191039406937843, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: isVisible - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6992985478128746580, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: isVisible - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7411372923421612357, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_IsTrigger @@ -13848,11 +13574,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7573854107059249206, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: isVisible - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7727797847984912868, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: isVisible - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7923332692670229905, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_Enabled @@ -13880,60 +13606,25 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8925545324421583990, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: isVisible - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9074506238497988532, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: isVisible - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 6408542808343726725, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} + - {fileID: 5413340004314508697, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: 5516939357876673302, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} - insertIndex: 1 + insertIndex: -1 addedObject: {fileID: 2123726295} - targetCorrespondingSourceObject: {fileID: 5516939357876673302, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} insertIndex: -1 - addedObject: {fileID: 788662683} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 5413340004314508697, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} - insertIndex: -1 - addedObject: {fileID: 1254528598} - - targetCorrespondingSourceObject: {fileID: 5413340004314508697, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} - insertIndex: -1 - addedObject: {fileID: 1254528599} + addedObject: {fileID: 1495477531} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} ---- !u!1 &998358591 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5413340004314508697, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} - m_PrefabInstance: {fileID: 998358590} - m_PrefabAsset: {fileID: 0} ---- !u!1 &998358592 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6235113497169645281, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} - m_PrefabInstance: {fileID: 998358590} - m_PrefabAsset: {fileID: 0} ---- !u!1 &998358593 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8419307906876345836, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} - m_PrefabInstance: {fileID: 998358590} - m_PrefabAsset: {fileID: 0} ---- !u!1 &998358594 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2746454166668562168, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} - m_PrefabInstance: {fileID: 998358590} - m_PrefabAsset: {fileID: 0} ---- !u!1 &998358595 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1603004104710297414, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} - m_PrefabInstance: {fileID: 998358590} - m_PrefabAsset: {fileID: 0} ---- !u!1 &998358596 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7906983941244195887, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} - m_PrefabInstance: {fileID: 998358590} - m_PrefabAsset: {fileID: 0} --- !u!1 &1000391391 GameObject: m_ObjectHideFlags: 3 @@ -16841,57 +16532,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 7862065244346366242, guid: 3b4743a43e04ed145b531ab0f1ae828b, type: 3} m_PrefabInstance: {fileID: 1228275738} m_PrefabAsset: {fileID: 0} ---- !u!4 &1254528597 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5717467054321889237, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} - m_PrefabInstance: {fileID: 998358590} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1254528598 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 998358591} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 58d3a2623a4164b4bb25683edc176b03, type: 3} - m_Name: - m_EditorClassIdentifier: - motorTorque: 300 - brakeTorque: 500 - maxSpeed: 400 - steeringRange: 9 - steeringRangeAtMaxSpeed: 7 - autoBrake: 100 - audio: {fileID: 0} - rigidBody: {fileID: 0} - checkpointsCollected: 0 - checkpoints: [] ---- !u!114 &1254528599 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 998358591} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0ee5992a8d68a894cba0612b0c18c3db, type: 3} - m_Name: - m_EditorClassIdentifier: - materialParts: - - {fileID: 998358596} - - {fileID: 998358595} - - {fileID: 998358594} - - {fileID: 998358593} - - {fileID: 998358592} - defaultColors: - - {fileID: 2100000, guid: aa4a216a2af73e349a061c3b08f04fca, type: 2} - - {fileID: 2100000, guid: 860d6251349fddd48b946fcba9793104, type: 2} - - {fileID: 2100000, guid: 860d6251349fddd48b946fcba9793104, type: 2} - - {fileID: 2100000, guid: 860d6251349fddd48b946fcba9793104, type: 2} - - {fileID: 2100000, guid: 860d6251349fddd48b946fcba9793104, type: 2} --- !u!1001 &1272047316 PrefabInstance: m_ObjectHideFlags: 0 @@ -19048,11 +18688,6 @@ MonoBehaviour: animator: {fileID: 1480005367} npcPrefab: {fileID: 153506, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3} audio: {fileID: 0} ---- !u!1 &1493536274 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3636523566108256591, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} - m_PrefabInstance: {fileID: 788662682} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1495114367 PrefabInstance: m_ObjectHideFlags: 0 @@ -19118,6 +18753,145 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} +--- !u!1001 &1495477530 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1017151060} + m_Modifications: + - target: {fileID: 2267504697065412416, guid: 1debb6b1b9a0b9d4ea4191642f19fe15, type: 3} + propertyPath: maxStepsPerCheckpoint + value: 2000 + objectReference: {fileID: 0} + - target: {fileID: 6461281435351799366, guid: 1debb6b1b9a0b9d4ea4191642f19fe15, type: 3} + propertyPath: m_Name + value: Hotrod (Benson) Variant + objectReference: {fileID: 0} + - target: {fileID: 6760919851603153930, guid: 1debb6b1b9a0b9d4ea4191642f19fe15, type: 3} + propertyPath: m_LocalPosition.x + value: 61.4 + objectReference: {fileID: 0} + - target: {fileID: 6760919851603153930, guid: 1debb6b1b9a0b9d4ea4191642f19fe15, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6760919851603153930, guid: 1debb6b1b9a0b9d4ea4191642f19fe15, type: 3} + propertyPath: m_LocalPosition.z + value: 17.01 + objectReference: {fileID: 0} + - target: {fileID: 6760919851603153930, guid: 1debb6b1b9a0b9d4ea4191642f19fe15, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6760919851603153930, guid: 1debb6b1b9a0b9d4ea4191642f19fe15, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6760919851603153930, guid: 1debb6b1b9a0b9d4ea4191642f19fe15, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6760919851603153930, guid: 1debb6b1b9a0b9d4ea4191642f19fe15, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6760919851603153930, guid: 1debb6b1b9a0b9d4ea4191642f19fe15, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6760919851603153930, guid: 1debb6b1b9a0b9d4ea4191642f19fe15, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6760919851603153930, guid: 1debb6b1b9a0b9d4ea4191642f19fe15, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6461281435351799366, guid: 1debb6b1b9a0b9d4ea4191642f19fe15, type: 3} + insertIndex: -1 + addedObject: {fileID: 1495477534} + - targetCorrespondingSourceObject: {fileID: 6461281435351799366, guid: 1debb6b1b9a0b9d4ea4191642f19fe15, type: 3} + insertIndex: -1 + addedObject: {fileID: 1495477533} + m_SourcePrefab: {fileID: 100100000, guid: 1debb6b1b9a0b9d4ea4191642f19fe15, type: 3} +--- !u!4 &1495477531 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6760919851603153930, guid: 1debb6b1b9a0b9d4ea4191642f19fe15, type: 3} + m_PrefabInstance: {fileID: 1495477530} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1495477532 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6461281435351799366, guid: 1debb6b1b9a0b9d4ea4191642f19fe15, type: 3} + m_PrefabInstance: {fileID: 1495477530} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1495477533 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1495477532} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 58d3a2623a4164b4bb25683edc176b03, type: 3} + m_Name: + m_EditorClassIdentifier: + motorTorque: 300 + brakeTorque: 500 + maxSpeed: 400 + steeringRange: 9 + steeringRangeAtMaxSpeed: 7 + autoBrake: 100 + audio: {fileID: 0} + rigidBody: {fileID: 0} + checkpointsCollected: 0 + checkpoints: + - {fileID: 1131200526} + - {fileID: 1131200525} + - {fileID: 1131200524} + - {fileID: 1131200523} + - {fileID: 1131200522} + - {fileID: 1131200521} + - {fileID: 1131200520} + - {fileID: 1131200519} + - {fileID: 1131200518} + - {fileID: 1131200517} + - {fileID: 1131200516} + - {fileID: 1131200515} + - {fileID: 1131200514} + - {fileID: 1131200513} + - {fileID: 1131200512} + - {fileID: 1131200511} +--- !u!114 &1495477534 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1495477532} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0ee5992a8d68a894cba0612b0c18c3db, type: 3} + m_Name: + m_EditorClassIdentifier: + materialParts: + - {fileID: 923561437} + - {fileID: 923561435} + - {fileID: 923561436} + - {fileID: 923561434} + - {fileID: 923561433} + defaultColors: + - {fileID: 2100000, guid: 860d6251349fddd48b946fcba9793104, type: 2} + - {fileID: 2100000, guid: 975703bb1a02ae64d9964e703202734f, type: 2} + - {fileID: 2100000, guid: 975703bb1a02ae64d9964e703202734f, type: 2} + - {fileID: 2100000, guid: 975703bb1a02ae64d9964e703202734f, type: 2} + - {fileID: 2100000, guid: 975703bb1a02ae64d9964e703202734f, type: 2} --- !u!1001 &1508352113 PrefabInstance: m_ObjectHideFlags: 0 @@ -24135,65 +23909,6 @@ MonoBehaviour: animator: {fileID: 1805894429} npcPrefab: {fileID: 153506, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3} audio: {fileID: 0} ---- !u!1 &1818576488 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1818576489} - - component: {fileID: 1818576490} - m_Layer: 0 - m_Name: RaysBackward - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1818576489 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1818576488} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} - m_LocalPosition: {x: -1.9100001, y: 0, z: 0.13000083} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 788662683} - m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} ---- !u!114 &1818576490 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1818576488} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6bb6b867a41448888c1cd4f99643ad71, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SensorName: RaysBackward - m_DetectableTags: - - Wall - m_RaysPerDirection: 0 - m_MaxRayDegrees: 70 - m_SphereCastRadius: 0 - m_RayLength: 10 - m_RayLayerMask: - serializedVersion: 2 - m_Bits: 4294967291 - m_ObservationStacks: 1 - rayHitColor: {r: 1, g: 0, b: 0, a: 1} - rayMissColor: {r: 1, g: 1, b: 1, a: 1} - m_StartVerticalOffset: 0.25 - m_EndVerticalOffset: 0.25 --- !u!1001 &1822499611 PrefabInstance: m_ObjectHideFlags: 0 @@ -27463,6 +27178,74 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 2357909291779874818, guid: d5caff8338f793c4eb4490cc52546faf, type: 3} + propertyPath: checkpoints.Array.size + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 2357909291779874818, guid: d5caff8338f793c4eb4490cc52546faf, type: 3} + propertyPath: checkpoints.Array.data[0] + value: + objectReference: {fileID: 1131200526} + - target: {fileID: 2357909291779874818, guid: d5caff8338f793c4eb4490cc52546faf, type: 3} + propertyPath: checkpoints.Array.data[1] + value: + objectReference: {fileID: 1131200525} + - target: {fileID: 2357909291779874818, guid: d5caff8338f793c4eb4490cc52546faf, type: 3} + propertyPath: checkpoints.Array.data[2] + value: + objectReference: {fileID: 1131200524} + - target: {fileID: 2357909291779874818, guid: d5caff8338f793c4eb4490cc52546faf, type: 3} + propertyPath: checkpoints.Array.data[3] + value: + objectReference: {fileID: 1131200523} + - target: {fileID: 2357909291779874818, guid: d5caff8338f793c4eb4490cc52546faf, type: 3} + propertyPath: checkpoints.Array.data[4] + value: + objectReference: {fileID: 1131200522} + - target: {fileID: 2357909291779874818, guid: d5caff8338f793c4eb4490cc52546faf, type: 3} + propertyPath: checkpoints.Array.data[5] + value: + objectReference: {fileID: 1131200521} + - target: {fileID: 2357909291779874818, guid: d5caff8338f793c4eb4490cc52546faf, type: 3} + propertyPath: checkpoints.Array.data[6] + value: + objectReference: {fileID: 1131200520} + - target: {fileID: 2357909291779874818, guid: d5caff8338f793c4eb4490cc52546faf, type: 3} + propertyPath: checkpoints.Array.data[7] + value: + objectReference: {fileID: 1131200519} + - target: {fileID: 2357909291779874818, guid: d5caff8338f793c4eb4490cc52546faf, type: 3} + propertyPath: checkpoints.Array.data[8] + value: + objectReference: {fileID: 1131200518} + - target: {fileID: 2357909291779874818, guid: d5caff8338f793c4eb4490cc52546faf, type: 3} + propertyPath: checkpoints.Array.data[9] + value: + objectReference: {fileID: 1131200517} + - target: {fileID: 2357909291779874818, guid: d5caff8338f793c4eb4490cc52546faf, type: 3} + propertyPath: checkpoints.Array.data[10] + value: + objectReference: {fileID: 1131200516} + - target: {fileID: 2357909291779874818, guid: d5caff8338f793c4eb4490cc52546faf, type: 3} + propertyPath: checkpoints.Array.data[11] + value: + objectReference: {fileID: 1131200515} + - target: {fileID: 2357909291779874818, guid: d5caff8338f793c4eb4490cc52546faf, type: 3} + propertyPath: checkpoints.Array.data[12] + value: + objectReference: {fileID: 1131200514} + - target: {fileID: 2357909291779874818, guid: d5caff8338f793c4eb4490cc52546faf, type: 3} + propertyPath: checkpoints.Array.data[13] + value: + objectReference: {fileID: 1131200513} + - target: {fileID: 2357909291779874818, guid: d5caff8338f793c4eb4490cc52546faf, type: 3} + propertyPath: checkpoints.Array.data[14] + value: + objectReference: {fileID: 1131200512} + - target: {fileID: 2357909291779874818, guid: d5caff8338f793c4eb4490cc52546faf, type: 3} + propertyPath: checkpoints.Array.data[15] + value: + objectReference: {fileID: 1131200511} - target: {fileID: 4284629084863024120, guid: d5caff8338f793c4eb4490cc52546faf, type: 3} propertyPath: m_LocalScale.x value: 0.25 @@ -28123,7 +27906,7 @@ PrefabInstance: - target: {fileID: 4615150776958234185, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} propertyPath: Cars.Array.data[0] value: - objectReference: {fileID: 998358591} + objectReference: {fileID: 0} - target: {fileID: 4615150776958234185, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} propertyPath: Cars.Array.data[1] value: @@ -28131,7 +27914,7 @@ PrefabInstance: - target: {fileID: 4615150776958234185, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} propertyPath: Cars.Array.data[2] value: - objectReference: {fileID: 788662684} + objectReference: {fileID: 0} - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} propertyPath: lapAmount value: 1 @@ -28147,11 +27930,11 @@ PrefabInstance: - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} propertyPath: players.Array.data[1] value: - objectReference: {fileID: 998358591} + objectReference: {fileID: 0} - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} propertyPath: players.Array.data[2] value: - objectReference: {fileID: 788662684} + objectReference: {fileID: 0} - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} propertyPath: checkpoints.Array.size value: 16 diff --git a/Assets/Scripts/AgentControllerV7.cs b/Assets/Scripts/AgentControllerV7.cs index b7ca79a..09f92bd 100644 --- a/Assets/Scripts/AgentControllerV7.cs +++ b/Assets/Scripts/AgentControllerV7.cs @@ -11,7 +11,7 @@ using Unity.VisualScripting; using System.Reflection; using System; -public class AgentControllerV7 : Agent +public class AgentController: Agent { public float motorTorque = 300; public float brakeTorque = 500; @@ -32,8 +32,13 @@ public class AgentControllerV7 : Agent public int maxStepsPerCheckpoint = 300; public int distanceBetweenCheckpoints = 5; public bool ignoreMentalPain = true; + bool isEnabled = true; - // Start is called before the first frame update + protected override void OnDisable() + { + isEnabled = false; + return; + } void Start() { rb = GetComponent(); @@ -47,6 +52,9 @@ public class AgentControllerV7 : Agent public override void OnEpisodeBegin() { + if (!isEnabled) + return; + stepsSinceCheckpoint = 0; checkpointsCollected = 0; totalReward = 0; @@ -84,6 +92,7 @@ public class AgentControllerV7 : Agent public override void CollectObservations(VectorSensor sensor) { + Transform currentCheckpoint = checkpoints[checkpointsCollected].transform; // distance to next checkpoint @@ -124,7 +133,9 @@ public class AgentControllerV7 : Agent } public override void OnActionReceived(ActionBuffers actions) - { + { + if (!isEnabled) + return; // 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; @@ -265,6 +276,9 @@ public class AgentControllerV7 : Agent public override void Heuristic(in ActionBuffers actionsOut) { + if (!isEnabled) + return; + var discreteActionsOut = actionsOut.DiscreteActions; discreteActionsOut[0] = 2; @@ -298,6 +312,9 @@ public class AgentControllerV7 : Agent } private void OnCollisionEnter(Collision other) { + if (!isEnabled) + return; + // if (other.gameObject.tag == "NPC") // { // AddReward(0.1f); diff --git a/Assets/Scripts/Car Customization/Car Loader.cs b/Assets/Scripts/Car Customization/Car Loader.cs index e5177bb..7bf76be 100644 --- a/Assets/Scripts/Car Customization/Car Loader.cs +++ b/Assets/Scripts/Car Customization/Car Loader.cs @@ -30,7 +30,7 @@ public class CarLoader : MonoBehaviour void replaceCar(GameObject car, string color) { car.GetComponent().enabled = true; - car.GetComponent().enabled = false; + car.GetComponent().enabled = false; cam.GetComponent().getCar(car); //LookAt = car.transform; diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index e747105..c8e77b8 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.Linq; using UnityEngine; public class GameManager : MonoBehaviour @@ -8,10 +9,16 @@ public class GameManager : MonoBehaviour public GameObject[] checkpoints; public GameObject[] players; - int currentLap = 1; + int[] playerLaps; void Start() { - + // reset laps + playerLaps = new int[players.Count()]; + + for (int i = 0; i < playerLaps.Count(); i++) + { + playerLaps[i] = 1; + } } // Update is called once per frame @@ -19,7 +26,14 @@ public class GameManager : MonoBehaviour { foreach (GameObject player in players) { - + try + { + int checkpointsCollected = player.GetComponent().checkpointsCollected; + } + catch + { + int checkpointsCollected = player.GetComponent().checkpointsCollected; + } } } } diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 14a0926..26b41dc 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -121,21 +121,27 @@ public class PlayerController : MonoBehaviour } + private void Update() { + Transform currentCheckpoint = checkpoints[checkpointsCollected].transform; + float checkpintDistance = distanceToCheckpoint(currentCheckpoint); + + if (checkpintDistance < 0.1f) + { + checkpointsCollected += 1; + } + } + private void OnCollisionEnter(Collision other) { - if (other.gameObject.tag == "Wall") { // audio.Play(); } } - private void OnTriggerEnter(Collider other) { - print(checkpointsCollected); - Transform currentCheckpoint = checkpoints[checkpointsCollected].transform; - if (other.gameObject == currentCheckpoint) - { - checkpointsCollected += 1; - print(checkpointsCollected); - } + float distanceToCheckpoint(Transform checkpoint) + { + var closestPoint = checkpoint.GetComponent().ClosestPointOnBounds(transform.position); + var distanceToCheckpoint = Vector3.Distance(transform.position, closestPoint); + return distanceToCheckpoint; } } diff --git a/Assets/Scripts/Unused/AgentController (old).cs b/Assets/Scripts/Unused/AgentController (old).cs index 424dbb8..3cca119 100644 --- a/Assets/Scripts/Unused/AgentController (old).cs +++ b/Assets/Scripts/Unused/AgentController (old).cs @@ -11,7 +11,7 @@ using Unity.VisualScripting; using System.Reflection; using System; -public class AgentController : Agent +public class AgentControllerOld : Agent { public float motorTorque = 300; public float brakeTorque = 500; diff --git a/Assets/Scripts/Unused/AgentControllerV6 (old).cs b/Assets/Scripts/Unused/AgentControllerV6 (old).cs index a6dc55e..cc354e7 100644 --- a/Assets/Scripts/Unused/AgentControllerV6 (old).cs +++ b/Assets/Scripts/Unused/AgentControllerV6 (old).cs @@ -32,6 +32,7 @@ public class AgentControllerV6 : Agent public int maxStepsPerCheckpoint = 300; public int distanceBetweenCheckpoints = 5; public bool ignoreMentalPain = false; + bool isEnabled = true; void Awake() { @@ -45,11 +46,15 @@ public class AgentControllerV6 : Agent protected override void OnDisable() { + isEnabled = false; return; } public override void OnEpisodeBegin() { + if (!isEnabled) + return; + stepsSinceCheckpoint = 0; checkpointsReached = 0; totalReward = 0; @@ -130,6 +135,9 @@ public class AgentControllerV6 : Agent public override void OnActionReceived(ActionBuffers actions) { + if (!isEnabled) + return; + // 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; @@ -285,6 +293,9 @@ public class AgentControllerV6 : Agent public override void Heuristic(in ActionBuffers actionsOut) { + if (!isEnabled) + return; + var discreteActionsOut = actionsOut.DiscreteActions; discreteActionsOut[0] = 2;