diff --git a/Assets/Imported Assets/PolygonCity/Prefabs/Characters/Character_BusinessMan_Shirt_01.prefab b/Assets/Imported Assets/PolygonCity/Prefabs/Characters/Character_BusinessMan_Shirt_01.prefab index c1159e6..0ac8513 100644 --- a/Assets/Imported Assets/PolygonCity/Prefabs/Characters/Character_BusinessMan_Shirt_01.prefab +++ b/Assets/Imported Assets/PolygonCity/Prefabs/Characters/Character_BusinessMan_Shirt_01.prefab @@ -1758,7 +1758,7 @@ Transform: m_GameObject: {fileID: 153506} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -901.4196, y: 0, z: 100.35948} + m_LocalPosition: {x: -908.4101, y: 0, z: 100.35948} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/ML-Agents/Timers/Car Customization_timers.json b/Assets/ML-Agents/Timers/Car Customization_timers.json index b96912b..47a659e 100644 --- a/Assets/ML-Agents/Timers/Car Customization_timers.json +++ b/Assets/ML-Agents/Timers/Car Customization_timers.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"count":1,"self":15.063121599999999,"total":15.0706487,"children":{"InitializeActuators":{"count":1,"self":0.0010012999999999999,"total":0.0010012999999999999,"children":null},"InitializeSensors":{"count":1,"self":0.0010003,"total":0.0010003,"children":null},"AgentSendState":{"count":3,"self":0.0010002,"total":0.0045245,"children":{"CollectObservations":{"count":1,"self":0.0025239999999999998,"total":0.0025239999999999998,"children":null},"WriteActionMask":{"count":1,"self":0,"total":0,"children":null},"RequestDecision":{"count":1,"self":0.0010003,"total":0.0010003,"children":null}}},"DecideAction":{"count":3,"self":0,"total":0,"children":null},"AgentAct":{"count":3,"self":0.0010012,"total":0.0010012,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713870271","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":"Car Customization","end_time_seconds":"1713870286"}} -======= -{"count":1,"self":51.735008,"total":53.396893,"children":{"InitializeActuators":{"count":3,"self":0.0019952999999999998,"total":0.0019952999999999998,"children":null},"InitializeSensors":{"count":3,"self":0.0020442,"total":0.0020442,"children":null},"AgentSendState":{"count":2301,"self":0.1271256,"total":0.21599829999999998,"children":{"CollectObservations":{"count":1383,"self":0.0622806,"total":0.0622806,"children":null},"WriteActionMask":{"count":1383,"self":0.0059897,"total":0.0059897,"children":null},"RequestDecision":{"count":1383,"self":0.0206024,"total":0.0206024,"children":null}}},"DecideAction":{"count":2301,"self":1.155031,"total":1.1703040999999998,"children":{"RayPerceptionSensor.Perceive":{"count":2766,"self":0.0152731,"total":0.0152731,"children":null}}},"AgentAct":{"count":2301,"self":0.271543,"total":0.271543,"children":null}},"gauges":{"BensonV6.1.CumulativeReward":{"count":4,"max":3.61319017,"min":-1.19209957,"runningAverage":0.7079615,"value":-0.3016693,"weightedAverage":0.19932358}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713879447","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 EEPtwPFiPvta5ZqQMsucb3gRCkHIFV3-eB85wNbfCdI005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Car Customization","end_time_seconds":"1713879501"}} ->>>>>>> 784bfaff4d1e5d2fa2a37110d4a8ce407f40dc4f +{"count":1,"self":70.2579392,"total":70.3330284,"children":{"InitializeActuators":{"count":3,"self":0.0010026,"total":0.0010026,"children":null},"InitializeSensors":{"count":3,"self":0.0025307,"total":0.0025307,"children":null},"AgentSendState":{"count":1,"self":0.0035307999999999997,"total":0.0137626,"children":{"CollectObservations":{"count":3,"self":0.0021752,"total":0.0021752,"children":null},"WriteActionMask":{"count":3,"self":0,"total":0,"children":null},"RequestDecision":{"count":3,"self":0.0080565999999999988,"total":0.0080565999999999988,"children":null}}},"DecideAction":{"count":1,"self":0.0567943,"total":0.0567943,"children":{"RayPerceptionSensor.Perceive":{"count":6,"self":0,"total":0,"children":null}}},"AgentAct":{"count":1,"self":0.0010012999999999999,"total":0.0010012999999999999,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713938032","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":"1713938102"}} \ No newline at end of file diff --git a/Assets/ML-Agents/Timers/Racetrack mini_timers.json b/Assets/ML-Agents/Timers/Racetrack mini_timers.json index 282f02f..8dbf8e2 100644 --- a/Assets/ML-Agents/Timers/Racetrack mini_timers.json +++ b/Assets/ML-Agents/Timers/Racetrack mini_timers.json @@ -1 +1 @@ -{"count":1,"self":11.436417599999999,"total":11.5803967,"children":{"InitializeActuators":{"count":3,"self":0.0015189,"total":0.0015189,"children":null},"InitializeSensors":{"count":3,"self":0.0009987,"total":0.0009987,"children":null},"AgentSendState":{"count":346,"self":0.0115626,"total":0.023475799999999998,"children":{"CollectObservations":{"count":210,"self":0.0038948,"total":0.0038948,"children":null},"WriteActionMask":{"count":210,"self":0.0010044,"total":0.0010044,"children":null},"RequestDecision":{"count":210,"self":0.0070139999999999994,"total":0.0070139999999999994,"children":null}}},"DecideAction":{"count":346,"self":0.1094216,"total":0.1094216,"children":{"RayPerceptionSensor.Perceive":{"count":420,"self":0,"total":0,"children":null}}},"AgentAct":{"count":346,"self":0.0070523999999999995,"total":0.0070523999999999995,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713936336","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":"1713936347"}} \ No newline at end of file +{"count":1,"self":16.1454432,"total":16.313347399999998,"children":{"InitializeActuators":{"count":3,"self":0.0010000999999999999,"total":0.0010000999999999999,"children":null},"InitializeSensors":{"count":3,"self":0.001504,"total":0.001504,"children":null},"AgentSendState":{"count":576,"self":0.0117816,"total":0.025026999999999997,"children":{"CollectObservations":{"count":348,"self":0.0055518999999999994,"total":0.0055518999999999994,"children":null},"WriteActionMask":{"count":348,"self":0.0005117,"total":0.0005117,"children":null},"RequestDecision":{"count":348,"self":0.0071817999999999995,"total":0.0071817999999999995,"children":null}}},"DecideAction":{"count":576,"self":0.1277645,"total":0.1287651,"children":{"RayPerceptionSensor.Perceive":{"count":696,"self":0.0010006,"total":0.0010006,"children":null}}},"AgentAct":{"count":576,"self":0.010591999999999999,"total":0.010591999999999999,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713938155","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":"1713938171"}} \ No newline at end of file diff --git a/Assets/Prefabs/CheckPoint.prefab b/Assets/Prefabs/CheckPoint.prefab index a568e0c..037a2c6 100644 --- a/Assets/Prefabs/CheckPoint.prefab +++ b/Assets/Prefabs/CheckPoint.prefab @@ -15,7 +15,7 @@ GameObject: - component: {fileID: 5655726606384773670} m_Layer: 2 m_Name: CheckPoint - m_TagString: Untagged + m_TagString: Checkpoint m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -100,7 +100,7 @@ BoxCollider: serializedVersion: 2 m_Bits: 4294967295 m_LayerOverridePriority: 0 - m_IsTrigger: 0 + m_IsTrigger: 1 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 @@ -119,3 +119,4 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: isCollected: 0 + isVisible: 1 diff --git a/Assets/Prefabs/GameController.prefab b/Assets/Prefabs/GameController.prefab deleted file mode 100644 index 9f7d350..0000000 --- a/Assets/Prefabs/GameController.prefab +++ /dev/null @@ -1,49 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &2362900685038639990 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6970569131258301195} - - component: {fileID: 281105538288573982} - m_Layer: 0 - m_Name: GameController - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6970569131258301195 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2362900685038639990} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 31.220337, y: 14.231196, z: 14.108478} - 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 &281105538288573982 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2362900685038639990} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b00fe924fac7ccc488443310caf9e5b9, type: 3} - m_Name: - m_EditorClassIdentifier: - NextCarKey: 110 - NextCarButton: {fileID: 0} - PlayerCar: {fileID: 0} diff --git a/Assets/Prefabs/GameController.prefab.meta b/Assets/Prefabs/GameController.prefab.meta deleted file mode 100644 index e7c4921..0000000 --- a/Assets/Prefabs/GameController.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 420cdad33b21c264392db22c65595f6d -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/GameManager.prefab b/Assets/Prefabs/GameManager.prefab index 09cb423..cda068c 100644 --- a/Assets/Prefabs/GameManager.prefab +++ b/Assets/Prefabs/GameManager.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &3730747174356696648 +--- !u!1 &820120218557562435 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,8 +8,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6654786458191517942} - - component: {fileID: 5081994082839948773} + - component: {fileID: 69798472485455694} + - component: {fileID: 4615150776958234185} + - component: {fileID: 5365138393421743302} + - component: {fileID: 5539949921570205737} m_Layer: 0 m_Name: GameManager m_TagString: Untagged @@ -17,13 +19,13 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6654786458191517942 +--- !u!4 &69798472485455694 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3730747174356696648} + m_GameObject: {fileID: 820120218557562435} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 973.61975, y: 433.16608, z: 10.137479} @@ -32,16 +34,64 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5081994082839948773 +--- !u!114 &4615150776958234185 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3730747174356696648} + m_GameObject: {fileID: 820120218557562435} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eb30df1407c4e1348a03c058cb70c8ff, type: 3} + m_Script: {fileID: 11500000, guid: 7750762847caa7b4bbc035455344adf9, type: 3} m_Name: m_EditorClassIdentifier: - playerCar: {fileID: 0} + Cars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + Colors: + - {fileID: 2100000, guid: aa4a216a2af73e349a061c3b08f04fca, type: 2} + - {fileID: 2100000, guid: 6519c0a548fad8541a36cb66f9201d08, type: 2} + - {fileID: 2100000, guid: 464e06004019889468c38fe7df524993, type: 2} + - {fileID: 2100000, guid: 1b1db4d214fc72e4092f6744c00f745f, type: 2} + - {fileID: 2100000, guid: 681c7ff4e44c3bb48823d409dfd25dd1, type: 2} + - {fileID: 2100000, guid: 975703bb1a02ae64d9964e703202734f, type: 2} + - {fileID: 2100000, guid: 09dbb87d6674be741b80fa8cefe11b0e, type: 2} + - {fileID: 2100000, guid: 860d6251349fddd48b946fcba9793104, type: 2} + - {fileID: 2100000, guid: 7b7e1bd35dddd1845a0109f7a9ce27ce, type: 2} + - {fileID: 2100000, guid: de683385749d77b49a1cc4d8876323d8, type: 2} + - {fileID: 2100000, guid: cb13a603242ea654885b9973cf7c97c0, type: 2} + - {fileID: 2100000, guid: 290dcb9964b00e94bb0debc820182e71, type: 2} + cam: {fileID: 0} + targetcar: {fileID: 0} +--- !u!114 &5365138393421743302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 820120218557562435} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4ad347dab55166f40a93601eb1733707, type: 3} + m_Name: + m_EditorClassIdentifier: + lapAmount: 0 + checkpoints: [] + players: [] +--- !u!114 &5539949921570205737 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 820120218557562435} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b00fe924fac7ccc488443310caf9e5b9, type: 3} + m_Name: + m_EditorClassIdentifier: + NextCarKey: 110 + NextCarButton: {fileID: 0} + PlayerCar: {fileID: 0} diff --git a/Assets/Scenes/Car Customization.unity b/Assets/Scenes/Car Customization.unity index b2444af..df1cb54 100644 --- a/Assets/Scenes/Car Customization.unity +++ b/Assets/Scenes/Car Customization.unity @@ -1034,11 +1034,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 5471432146962600635, guid: 72f36551c0bfff14fa73ab0c8bb3b28f, type: 3} m_PrefabInstance: {fileID: 319703284} m_PrefabAsset: {fileID: 0} ---- !u!1 &358447329 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3730747174356696648, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} - m_PrefabInstance: {fileID: 637686386} - m_PrefabAsset: {fileID: 0} --- !u!1 &426378878 GameObject: m_ObjectHideFlags: 0 @@ -1242,7 +1237,7 @@ MonoBehaviour: - {fileID: 2100000, guid: cb13a603242ea654885b9973cf7c97c0, type: 2} - {fileID: 2100000, guid: 290dcb9964b00e94bb0debc820182e71, type: 2} startButton: {fileID: 1240586970} - carData: {fileID: 358447329} + carData: {fileID: 1607325861} --- !u!81 &481224848 AudioListener: m_ObjectHideFlags: 0 @@ -1562,10 +1557,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3730747174356696648, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + - target: {fileID: 820120218557562435, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} propertyPath: m_Name value: Car Data objectReference: {fileID: 0} + - target: {fileID: 3730747174356696648, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: m_Name + value: GameManager + objectReference: {fileID: 0} - target: {fileID: 3730747174356696648, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} propertyPath: m_IsActive value: 1 @@ -1618,10 +1617,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 4615150776958234185, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + - {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + - {fileID: 5539949921570205737, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 820120218557562435, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + insertIndex: -1 + addedObject: {fileID: 1607325866} m_SourcePrefab: {fileID: 100100000, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} --- !u!1001 &691379311 PrefabInstance: @@ -4662,6 +4667,25 @@ MonoBehaviour: - {fileID: 1557708817} defaultColors: - {fileID: 2100000, guid: 290dcb9964b00e94bb0debc820182e71, type: 2} +--- !u!1 &1607325861 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 820120218557562435, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + m_PrefabInstance: {fileID: 637686386} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1607325866 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1607325861} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eb30df1407c4e1348a03c058cb70c8ff, type: 3} + m_Name: + m_EditorClassIdentifier: + carType: + carColor: --- !u!1 &1671445827 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Racetrack mini.unity b/Assets/Scenes/Racetrack mini.unity index 2d303c9..4ca5d3e 100644 --- a/Assets/Scenes/Racetrack mini.unity +++ b/Assets/Scenes/Racetrack mini.unity @@ -4912,6 +4912,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3466260334280045808, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5655726606384773670, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} propertyPath: isVisible value: 0 @@ -4920,6 +4924,10 @@ PrefabInstance: propertyPath: m_Name value: CheckPoint objectReference: {fileID: 0} + - target: {fileID: 7234834637752836426, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} + propertyPath: m_TagString + value: Checkpoint + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -7049,6 +7057,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3466260334280045808, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5655726606384773670, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} propertyPath: isVisible value: 0 @@ -7201,98 +7213,11 @@ MonoBehaviour: animator: {fileID: 546157697} npcPrefab: {fileID: 153506, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3} audio: {fileID: 0} ---- !u!1 &556260502 +--- !u!1 &556260502 stripped GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 820120218557562435, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + m_PrefabInstance: {fileID: 8684226825208193988} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 556260504} - - component: {fileID: 556260503} - - component: {fileID: 556260505} - - component: {fileID: 556260506} - m_Layer: 0 - m_Name: GameManager - 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: - Cars: - - {fileID: 998358591} - - {fileID: 2123726296} - - {fileID: 788662684} - Colors: - - {fileID: 2100000, guid: aa4a216a2af73e349a061c3b08f04fca, type: 2} - - {fileID: 2100000, guid: 6519c0a548fad8541a36cb66f9201d08, type: 2} - - {fileID: 2100000, guid: 464e06004019889468c38fe7df524993, type: 2} - - {fileID: 2100000, guid: 1b1db4d214fc72e4092f6744c00f745f, type: 2} - - {fileID: 2100000, guid: 681c7ff4e44c3bb48823d409dfd25dd1, type: 2} - - {fileID: 2100000, guid: 975703bb1a02ae64d9964e703202734f, type: 2} - - {fileID: 2100000, guid: 09dbb87d6674be741b80fa8cefe11b0e, type: 2} - - {fileID: 2100000, guid: 860d6251349fddd48b946fcba9793104, type: 2} - - {fileID: 2100000, guid: 7b7e1bd35dddd1845a0109f7a9ce27ce, type: 2} - - {fileID: 2100000, guid: de683385749d77b49a1cc4d8876323d8, type: 2} - - {fileID: 2100000, guid: cb13a603242ea654885b9973cf7c97c0, type: 2} - - {fileID: 2100000, guid: 290dcb9964b00e94bb0debc820182e71, type: 2} - cam: {fileID: 454865285} - targetcar: {fileID: 0} ---- !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!114 &556260505 -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: 4ad347dab55166f40a93601eb1733707, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &556260506 -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: b00fe924fac7ccc488443310caf9e5b9, type: 3} - m_Name: - m_EditorClassIdentifier: - NextCarKey: 110 - NextCarButton: {fileID: 0} - PlayerCar: {fileID: 350793952} --- !u!4 &559703698 stripped Transform: m_CorrespondingSourceObject: {fileID: 43625883235569613, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3} @@ -9831,6 +9756,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3466260334280045808, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5655726606384773670, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} propertyPath: isVisible value: 0 @@ -10438,6 +10367,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3466260334280045808, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5655726606384773670, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} propertyPath: isVisible value: 0 @@ -10468,6 +10401,10 @@ PrefabInstance: 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 @@ -11122,6 +11059,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3466260334280045808, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5655726606384773670, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} propertyPath: isVisible value: 0 @@ -11729,6 +11670,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3466260334280045808, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5655726606384773670, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} propertyPath: isVisible value: 0 @@ -13294,6 +13239,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3466260334280045808, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5655726606384773670, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} propertyPath: isVisible value: 0 @@ -13649,10 +13598,18 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 254615363407237474, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 396140330680532875, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: isVisible value: 0 objectReference: {fileID: 0} + - target: {fileID: 412752423574035104, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 744099280936139659, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_Enabled value: 1 @@ -13669,6 +13626,14 @@ PrefabInstance: propertyPath: isVisible value: 0 objectReference: {fileID: 0} + - target: {fileID: 1538308268628703026, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1692280491235192544, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1782845334259341203, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: isVisible value: 0 @@ -13681,14 +13646,34 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 2264078297410801282, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2368728132884198609, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2419462231474952229, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2841995830362743840, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: isVisible value: 0 objectReference: {fileID: 0} + - target: {fileID: 2923142518193870472, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} + propertyPath: m_Constraints + value: 10 + objectReference: {fileID: 0} - target: {fileID: 2923142518193870472, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_CenterOfMass.y value: 0.05 objectReference: {fileID: 0} + - target: {fileID: 2941168180513806241, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2955602324714020408, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_Enabled value: 1 @@ -13701,6 +13686,10 @@ PrefabInstance: propertyPath: isVisible value: 0 objectReference: {fileID: 0} + - target: {fileID: 3731957927503702725, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3797832664772287022, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_Name value: Cars @@ -13713,6 +13702,14 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 3901685906202915133, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4185820162608788426, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4463291330637767098, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_Enabled value: 1 @@ -13805,6 +13802,10 @@ PrefabInstance: propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 5907376248349735906, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6248371655047305591, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: isVisible value: 0 @@ -13813,6 +13814,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6419670355227077366, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6698349112800946072, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_IsActive value: 0 @@ -13837,6 +13842,10 @@ PrefabInstance: propertyPath: isVisible value: 0 objectReference: {fileID: 0} + - target: {fileID: 7411372923421612357, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7573854107059249206, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: isVisible value: 0 @@ -13853,10 +13862,18 @@ PrefabInstance: propertyPath: maxStepsPerCheckpoint value: 1000 objectReference: {fileID: 0} + - target: {fileID: 8018322348974398059, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8330458478811375020, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 8870072023568150877, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8896804522281415864, guid: b341ab9d1c90ec94ca57298c7d0a4eeb, type: 3} propertyPath: m_Enabled value: 1 @@ -15683,6 +15700,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3466260334280045808, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5655726606384773670, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} propertyPath: isVisible value: 0 @@ -16845,6 +16866,8 @@ MonoBehaviour: autoBrake: 100 audio: {fileID: 0} rigidBody: {fileID: 0} + checkpointsCollected: 0 + checkpoints: [] --- !u!114 &1254528599 MonoBehaviour: m_ObjectHideFlags: 0 @@ -19078,6 +19101,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3466260334280045808, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5655726606384773670, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} propertyPath: isVisible value: 0 @@ -19943,6 +19970,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3466260334280045808, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5655726606384773670, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} propertyPath: isVisible value: 0 @@ -21063,6 +21094,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3466260334280045808, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5655726606384773670, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} propertyPath: isVisible value: 0 @@ -21129,6 +21164,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3466260334280045808, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5655726606384773670, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} propertyPath: isVisible value: 0 @@ -25268,6 +25307,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3466260334280045808, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5655726606384773670, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} propertyPath: isVisible value: 0 @@ -25376,6 +25419,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3466260334280045808, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} + propertyPath: m_IsTrigger + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5655726606384773670, guid: a5cc261231f5a6a4c88239b1dab368cb, type: 3} propertyPath: isVisible value: 0 @@ -28017,6 +28064,171 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9a80cc25f1296554a92f05347d4a024e, type: 3} +--- !u!1001 &8684226825208193988 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 69798472485455694, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: m_LocalPosition.x + value: 973.61975 + objectReference: {fileID: 0} + - target: {fileID: 69798472485455694, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: m_LocalPosition.y + value: 433.16608 + objectReference: {fileID: 0} + - target: {fileID: 69798472485455694, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: m_LocalPosition.z + value: 10.137479 + objectReference: {fileID: 0} + - target: {fileID: 69798472485455694, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 69798472485455694, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 69798472485455694, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 69798472485455694, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 69798472485455694, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 69798472485455694, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 69798472485455694, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 820120218557562435, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: m_Name + value: GameManager + objectReference: {fileID: 0} + - target: {fileID: 4615150776958234185, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: cam + value: + objectReference: {fileID: 454865285} + - target: {fileID: 4615150776958234185, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: Cars.Array.data[0] + value: + objectReference: {fileID: 998358591} + - target: {fileID: 4615150776958234185, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: Cars.Array.data[1] + value: + objectReference: {fileID: 2123726296} + - target: {fileID: 4615150776958234185, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: Cars.Array.data[2] + value: + objectReference: {fileID: 788662684} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: lapAmount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: players.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: players.Array.data[0] + value: + objectReference: {fileID: 2123726296} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: players.Array.data[1] + value: + objectReference: {fileID: 998358591} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: players.Array.data[2] + value: + objectReference: {fileID: 788662684} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: checkpoints.Array.size + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: checkpoints.Array.data[0] + value: + objectReference: {fileID: 1131200526} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: checkpoints.Array.data[1] + value: + objectReference: {fileID: 1131200525} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: checkpoints.Array.data[2] + value: + objectReference: {fileID: 1131200524} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: checkpoints.Array.data[3] + value: + objectReference: {fileID: 1131200523} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: checkpoints.Array.data[4] + value: + objectReference: {fileID: 1131200522} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: checkpoints.Array.data[5] + value: + objectReference: {fileID: 1131200521} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: checkpoints.Array.data[6] + value: + objectReference: {fileID: 1131200520} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: checkpoints.Array.data[7] + value: + objectReference: {fileID: 1131200519} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: checkpoints.Array.data[8] + value: + objectReference: {fileID: 1131200518} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: checkpoints.Array.data[9] + value: + objectReference: {fileID: 1131200517} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: checkpoints.Array.data[10] + value: + objectReference: {fileID: 1131200516} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: checkpoints.Array.data[11] + value: + objectReference: {fileID: 1131200515} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: checkpoints.Array.data[12] + value: + objectReference: {fileID: 1131200514} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: checkpoints.Array.data[13] + value: + objectReference: {fileID: 1131200513} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: checkpoints.Array.data[14] + value: + objectReference: {fileID: 1131200512} + - target: {fileID: 5365138393421743302, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: checkpoints.Array.data[15] + value: + objectReference: {fileID: 1131200511} + - target: {fileID: 5539949921570205737, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} + propertyPath: PlayerCar + value: + objectReference: {fileID: 350793952} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -28031,4 +28243,4 @@ SceneRoots: - {fileID: 998358590} - {fileID: 323815922} - {fileID: 454865284} - - {fileID: 556260504} + - {fileID: 8684226825208193988} diff --git a/Assets/Scripts/AgentControllerV7.cs b/Assets/Scripts/AgentControllerV7.cs index a4698a4..b7ca79a 100644 --- a/Assets/Scripts/AgentControllerV7.cs +++ b/Assets/Scripts/AgentControllerV7.cs @@ -28,7 +28,7 @@ public class AgentControllerV7 : Agent float totalReward = 0; float totalMentalPain = 0; int stepsSinceCheckpoint = 0; - int checkpointsReached = 0; + [HideInInspector] public int checkpointsCollected = 0; public int maxStepsPerCheckpoint = 300; public int distanceBetweenCheckpoints = 5; public bool ignoreMentalPain = true; @@ -48,7 +48,7 @@ public class AgentControllerV7 : Agent public override void OnEpisodeBegin() { stepsSinceCheckpoint = 0; - checkpointsReached = 0; + checkpointsCollected = 0; totalReward = 0; totalMentalPain = 0; @@ -84,7 +84,7 @@ public class AgentControllerV7 : Agent public override void CollectObservations(VectorSensor sensor) { - Transform currentCheckpoint = checkpoints[checkpointsReached].transform; + Transform currentCheckpoint = checkpoints[checkpointsCollected].transform; // distance to next checkpoint sensor.AddObservation(distanceToCheckpoint(currentCheckpoint)); @@ -213,7 +213,7 @@ public class AgentControllerV7 : Agent } // rewards - Transform currentCheckpoint = checkpoints[checkpointsReached].transform; + Transform currentCheckpoint = checkpoints[checkpointsCollected].transform; float checkpintDistance = distanceToCheckpoint(currentCheckpoint); float reward = (1 - Mathf.InverseLerp(0, distanceBetweenCheckpoints, checkpintDistance)) / 500; @@ -235,13 +235,13 @@ public class AgentControllerV7 : Agent stepsSinceCheckpoint = 0; // If last checkpoint - if (checkpointsReached == checkpoints.Count - 1) + if (checkpointsCollected == checkpoints.Count - 1) { AddReward(10f); EndEpisode(); } - checkpointsReached += 1; + checkpointsCollected += 1; //TODO fix variable names diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index ca3faa2..e747105 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -17,6 +17,9 @@ public class GameManager : MonoBehaviour // Update is called once per frame void Update() { - + foreach (GameObject player in players) + { + + } } } diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 3ffdb30..14a0926 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -9,14 +9,12 @@ public class PlayerController : MonoBehaviour public float maxSpeed = 20; public float steeringRange = 30; public float steeringRangeAtMaxSpeed = 10; - public float autoBrake; - - //public GameObject lookat; public AudioSource audio; - WheelControl[] wheels; public Rigidbody rigidBody; + [HideInInspector] public int checkpointsCollected = 0; + public GameObject[] checkpoints; // Start is called before the first frame update void Start() @@ -123,7 +121,6 @@ public class PlayerController : MonoBehaviour } - private void OnCollisionEnter(Collision other) { if (other.gameObject.tag == "Wall") @@ -131,4 +128,14 @@ public class PlayerController : MonoBehaviour // audio.Play(); } } + + private void OnTriggerEnter(Collider other) { + print(checkpointsCollected); + Transform currentCheckpoint = checkpoints[checkpointsCollected].transform; + if (other.gameObject == currentCheckpoint) + { + checkpointsCollected += 1; + print(checkpointsCollected); + } + } } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index c4f2cb4..c6e777f 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,10 +5,10 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 0 + - enabled: 1 path: Assets/Scenes/Car Customization.unity guid: 46fb4d69ffddef24abd332313bb5f4d8 - - enabled: 0 + - enabled: 1 path: Assets/Scenes/Racetrack mini.unity guid: 9b5f77be9dfb7c14cba3af351597ec83 m_configObjects: {} diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 5c92b3f..89acc9d 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -6,6 +6,7 @@ TagManager: tags: - Wall - NPC + - Checkpoint layers: - Default - TransparentFX