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 58ef437..b21ad3f 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: -936.6627, y: 0, z: 100.35948} + m_LocalPosition: {x: -944.4919, 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/Racetrack mini_timers.json b/Assets/ML-Agents/Timers/Racetrack mini_timers.json index 8ba0e54..5594eeb 100644 --- a/Assets/ML-Agents/Timers/Racetrack mini_timers.json +++ b/Assets/ML-Agents/Timers/Racetrack mini_timers.json @@ -1,5 +1 @@ -<<<<<<< HEAD -{"count":1,"self":16.238459199999998,"total":16.4519137,"children":{"InitializeActuators":{"count":3,"self":0.0015067,"total":0.0015067,"children":null},"InitializeSensors":{"count":3,"self":0.0014154999999999999,"total":0.0014154999999999999,"children":null},"AgentSendState":{"count":515,"self":0.015192299999999999,"total":0.03709,"children":{"CollectObservations":{"count":309,"self":0.0078677,"total":0.0078677,"children":null},"WriteActionMask":{"count":309,"self":0,"total":0,"children":null},"RequestDecision":{"count":309,"self":0.014029999999999999,"total":0.014029999999999999,"children":null}}},"DecideAction":{"count":515,"self":0.1521744,"total":0.1547357,"children":{"RayPerceptionSensor.Perceive":{"count":618,"self":0.0025613,"total":0.0025613,"children":null}}},"AgentAct":{"count":515,"self":0.0176591,"total":0.0176591,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713946661","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":"1713946677"}} -======= -{"count":1,"self":260.8801792,"total":263.71180169999997,"children":{"InitializeActuators":{"count":2,"self":0.0012793,"total":0.0012793,"children":null},"InitializeSensors":{"count":2,"self":0.0020053,"total":0.0020053,"children":null},"AgentSendState":{"count":12917,"self":0.3768938,"total":0.4890713,"children":{"CollectObservations":{"count":5168,"self":0.058553799999999996,"total":0.058553799999999996,"children":null},"WriteActionMask":{"count":5168,"self":0.0059936999999999994,"total":0.0059936999999999994,"children":null},"RequestDecision":{"count":5168,"self":0.0429868,"total":0.04763,"children":{"RayPerceptionSensor.Perceive":{"count":5168,"self":0.0046432,"total":0.0046432,"children":null}}}}},"DecideAction":{"count":12917,"self":2.0233914,"total":2.0547198,"children":{"RayPerceptionSensor.Perceive":{"count":10336,"self":0.0313284,"total":0.0313284,"children":null}}},"AgentAct":{"count":12917,"self":0.2830542,"total":0.2830542,"children":null}},"gauges":{"BensonV7.CumulativeReward":{"count":1,"max":25.1733932,"min":25.1733932,"runningAverage":25.1733932,"value":25.1733932,"weightedAverage":25.1733932}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713945905","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":"1713946168"}} ->>>>>>> 5d9eab1801256febfab096297604d8577dd44a9f +{"count":1,"self":9.5370144,"total":9.6568762,"children":{"InitializeActuators":{"count":2,"self":0.0010314,"total":0.0010314,"children":null},"InitializeSensors":{"count":2,"self":0.0023714,"total":0.0023714,"children":null},"AgentSendState":{"count":212,"self":0.0090765,"total":0.0228877,"children":{"CollectObservations":{"count":86,"self":0.0015991999999999998,"total":0.0015991999999999998,"children":null},"WriteActionMask":{"count":86,"self":0,"total":0,"children":null},"RequestDecision":{"count":86,"self":0.012211999999999999,"total":0.012211999999999999,"children":{"RayPerceptionSensor.Perceive":{"count":86,"self":0,"total":0,"children":null}}}}},"DecideAction":{"count":212,"self":0.0874686,"total":0.0884751,"children":{"RayPerceptionSensor.Perceive":{"count":172,"self":0.0010065,"total":0.0010065,"children":null}}},"AgentAct":{"count":212,"self":0.0040986,"total":0.0040986,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713950271","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 bzgvRbOYucyzh7SN49GEtq72W2SGxkT2it-FtzLbNHM005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1713950281"}} \ No newline at end of file diff --git a/Assets/ML-Agents/Timers/mini_racetrack3_timers.json b/Assets/ML-Agents/Timers/mini_racetrack3_timers.json index 684291f..c4ec80e 100644 --- a/Assets/ML-Agents/Timers/mini_racetrack3_timers.json +++ b/Assets/ML-Agents/Timers/mini_racetrack3_timers.json @@ -1 +1 @@ -{"count":1,"self":52.4120576,"total":52.5793021,"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":"mini_racetrack3","end_time_seconds":"1713938706"}} +{"count":1,"self":57.9887808,"total":58.107647899999996,"children":{"InitializeActuators":{"count":2,"self":0.0010314,"total":0.0010314,"children":null},"InitializeSensors":{"count":2,"self":0.0023714,"total":0.0023714,"children":null},"AgentSendState":{"count":212,"self":0.0090765,"total":0.0228877,"children":{"CollectObservations":{"count":86,"self":0.0015991999999999998,"total":0.0015991999999999998,"children":null},"WriteActionMask":{"count":86,"self":0,"total":0,"children":null},"RequestDecision":{"count":86,"self":0.012211999999999999,"total":0.012211999999999999,"children":{"RayPerceptionSensor.Perceive":{"count":86,"self":0,"total":0,"children":null}}}}},"DecideAction":{"count":212,"self":0.0874686,"total":0.0884751,"children":{"RayPerceptionSensor.Perceive":{"count":172,"self":0.0010065,"total":0.0010065,"children":null}}},"AgentAct":{"count":212,"self":0.0040986,"total":0.0040986,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713950271","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 bzgvRbOYucyzh7SN49GEtq72W2SGxkT2it-FtzLbNHM005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"mini_racetrack3","end_time_seconds":"1713950329"}} \ No newline at end of file diff --git a/Assets/Prefabs/Cars/MuscleCar.prefab b/Assets/Prefabs/Cars/MuscleCar.prefab new file mode 100644 index 0000000..66508b3 --- /dev/null +++ b/Assets/Prefabs/Cars/MuscleCar.prefab @@ -0,0 +1,560 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &683285375456476784 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7367229649172121288} + - component: {fileID: 8947798677317855350} + - component: {fileID: 6361859234845247363} + m_Layer: 0 + m_Name: Wheel_BL (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7367229649172121288 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 683285375456476784} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.886, y: 0.353, z: -1.281} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6674300198561310492} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!146 &8947798677317855350 +WheelCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 683285375456476784} + serializedVersion: 2 + m_Center: {x: 0, y: 0, z: 0} + m_Radius: 0.3555168 + m_SuspensionSpring: + spring: 35000 + damper: 4500 + targetPosition: 1 + m_SuspensionDistance: 0.25 + m_ForceAppPointDistance: 0 + m_Mass: 20 + m_WheelDampingRate: 0.01 + m_ForwardFriction: + m_ExtremumSlip: 0.4 + m_ExtremumValue: 1 + m_AsymptoteSlip: 0.8 + m_AsymptoteValue: 0.5 + m_Stiffness: 1 + m_SidewaysFriction: + m_ExtremumSlip: 0.2 + m_ExtremumValue: 1 + m_AsymptoteSlip: 0.5 + m_AsymptoteValue: 0.75 + m_Stiffness: 2 + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_Enabled: 1 + m_ProvidesContacts: 0 +--- !u!114 &6361859234845247363 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 683285375456476784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9901c050a200da94bbc65da2891b7708, type: 3} + m_Name: + m_EditorClassIdentifier: + wheelModel: {fileID: 7176424512299206691} + WheelCollider: {fileID: 0} + steerable: 0 + motorized: 1 +--- !u!1 &940385969005609503 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 549194101895180084} + - component: {fileID: 6247996953015795539} + - component: {fileID: 6976651510570107572} + m_Layer: 0 + m_Name: Wheel_FL (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &549194101895180084 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 940385969005609503} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.886, y: 0.353, z: 1.27} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6674300198561310492} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!146 &6247996953015795539 +WheelCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 940385969005609503} + serializedVersion: 2 + m_Center: {x: 0, y: 0, z: 0} + m_Radius: 0.3555168 + m_SuspensionSpring: + spring: 35000 + damper: 4500 + targetPosition: 1 + m_SuspensionDistance: 0.25 + m_ForceAppPointDistance: 0 + m_Mass: 20 + m_WheelDampingRate: 0.01 + m_ForwardFriction: + m_ExtremumSlip: 0.4 + m_ExtremumValue: 1 + m_AsymptoteSlip: 0.8 + m_AsymptoteValue: 0.5 + m_Stiffness: 1 + m_SidewaysFriction: + m_ExtremumSlip: 0.2 + m_ExtremumValue: 1 + m_AsymptoteSlip: 0.5 + m_AsymptoteValue: 0.75 + m_Stiffness: 1 + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_Enabled: 1 + m_ProvidesContacts: 0 +--- !u!114 &6976651510570107572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 940385969005609503} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9901c050a200da94bbc65da2891b7708, type: 3} + m_Name: + m_EditorClassIdentifier: + wheelModel: {fileID: 3487819692661873983} + WheelCollider: {fileID: 0} + steerable: 1 + motorized: 0 +--- !u!1 &2106440785211624687 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1221408032842957360} + - component: {fileID: 3618113066602919031} + - component: {fileID: 1614757719467490600} + m_Layer: 0 + m_Name: MuscleCar + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1221408032842957360 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2106440785211624687} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6674300198561310492} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &3618113066602919031 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2106440785211624687} + serializedVersion: 4 + m_Mass: 1500 + m_Drag: 0.01 + m_AngularDrag: 0 + 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: 0 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1614757719467490600 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2106440785211624687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 58d3a2623a4164b4bb25683edc176b03, type: 3} + m_Name: + m_EditorClassIdentifier: + motorTorque: 600 + brakeTorque: 800 + maxSpeed: 140 + steeringRange: 17.5 + steeringRangeAtMaxSpeed: 12.5 + autoBrake: 100 + audio: {fileID: 0} + rigidBody: {fileID: 0} + checkpointsCollected: 0 + checkpoints: [] +--- !u!1 &4409436263845365305 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 451668143428041558} + - component: {fileID: 4311002844589887538} + - component: {fileID: 4229755468263487995} + m_Layer: 0 + m_Name: Wheel_FR (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &451668143428041558 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4409436263845365305} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0.884, y: 0.353, z: 1.2670001} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6674300198561310492} + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!146 &4311002844589887538 +WheelCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4409436263845365305} + serializedVersion: 2 + m_Center: {x: 0, y: 0, z: 0} + m_Radius: 0.3555168 + m_SuspensionSpring: + spring: 35000 + damper: 4500 + targetPosition: 1 + m_SuspensionDistance: 0.25 + m_ForceAppPointDistance: 0 + m_Mass: 20 + m_WheelDampingRate: 0.01 + m_ForwardFriction: + m_ExtremumSlip: 0.4 + m_ExtremumValue: 1 + m_AsymptoteSlip: 0.8 + m_AsymptoteValue: 0.5 + m_Stiffness: 1 + m_SidewaysFriction: + m_ExtremumSlip: 0.2 + m_ExtremumValue: 1 + m_AsymptoteSlip: 0.5 + m_AsymptoteValue: 0.75 + m_Stiffness: 1 + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_Enabled: 1 + m_ProvidesContacts: 0 +--- !u!114 &4229755468263487995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4409436263845365305} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9901c050a200da94bbc65da2891b7708, type: 3} + m_Name: + m_EditorClassIdentifier: + wheelModel: {fileID: 866779258367097958} + WheelCollider: {fileID: 0} + steerable: 1 + motorized: 0 +--- !u!1 &6985576283446033134 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5225564877360494685} + - component: {fileID: 3985587579150572548} + - component: {fileID: 859360135347275981} + m_Layer: 0 + m_Name: Wheel_BR (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5225564877360494685 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6985576283446033134} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0.884, y: 0.353, z: -1.281} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6674300198561310492} + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!146 &3985587579150572548 +WheelCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6985576283446033134} + serializedVersion: 2 + m_Center: {x: 0, y: 0, z: 0} + m_Radius: 0.3555168 + m_SuspensionSpring: + spring: 35000 + damper: 4500 + targetPosition: 1 + m_SuspensionDistance: 0.25 + m_ForceAppPointDistance: 0 + m_Mass: 20 + m_WheelDampingRate: 0.01 + m_ForwardFriction: + m_ExtremumSlip: 0.4 + m_ExtremumValue: 1 + m_AsymptoteSlip: 0.8 + m_AsymptoteValue: 0.5 + m_Stiffness: 1 + m_SidewaysFriction: + m_ExtremumSlip: 0.2 + m_ExtremumValue: 1 + m_AsymptoteSlip: 0.5 + m_AsymptoteValue: 0.75 + m_Stiffness: 2 + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_Enabled: 1 + m_ProvidesContacts: 0 +--- !u!114 &859360135347275981 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6985576283446033134} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9901c050a200da94bbc65da2891b7708, type: 3} + m_Name: + m_EditorClassIdentifier: + wheelModel: {fileID: 4596498946618046498} + WheelCollider: {fileID: 0} + steerable: 0 + motorized: 1 +--- !u!1001 &4265491425259954180 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1221408032842957360} + m_Modifications: + - target: {fileID: 7470892825056954136, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7470892825056954136, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7470892825056954136, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7470892825056954136, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7470892825056954136, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7470892825056954136, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7470892825056954136, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7470892825056954136, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7470892825056954136, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7470892825056954136, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7901767874985557191, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + propertyPath: m_Name + value: Muscle + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7470892825056954136, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + insertIndex: -1 + addedObject: {fileID: 549194101895180084} + - targetCorrespondingSourceObject: {fileID: 7470892825056954136, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + insertIndex: -1 + addedObject: {fileID: 451668143428041558} + - targetCorrespondingSourceObject: {fileID: 7470892825056954136, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + insertIndex: -1 + addedObject: {fileID: 7367229649172121288} + - targetCorrespondingSourceObject: {fileID: 7470892825056954136, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + insertIndex: -1 + addedObject: {fileID: 5225564877360494685} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3790365209299199642, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + insertIndex: -1 + addedObject: {fileID: 925172737091834510} + m_SourcePrefab: {fileID: 100100000, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} +--- !u!4 &866779258367097958 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3978221080056536162, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + m_PrefabInstance: {fileID: 4265491425259954180} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1128156969440315038 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3790365209299199642, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + m_PrefabInstance: {fileID: 4265491425259954180} + m_PrefabAsset: {fileID: 0} +--- !u!65 &925172737091834510 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1128156969440315038} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 2.2533257, y: 1.3846825, z: 4.740247} + m_Center: {x: 0.00000023841858, y: 0.9853044, z: 0.014804006} +--- !u!4 &3487819692661873983 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 816603291472444731, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + m_PrefabInstance: {fileID: 4265491425259954180} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4596498946618046498 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 358065488908523558, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + m_PrefabInstance: {fileID: 4265491425259954180} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6674300198561310492 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7470892825056954136, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + m_PrefabInstance: {fileID: 4265491425259954180} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7176424512299206691 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6387751101090244647, guid: bc0a042892918bd40902ac2fff6495b2, type: 3} + m_PrefabInstance: {fileID: 4265491425259954180} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Cars/MuscleCar.prefab.meta b/Assets/Prefabs/Cars/MuscleCar.prefab.meta new file mode 100644 index 0000000..d18e6d8 --- /dev/null +++ b/Assets/Prefabs/Cars/MuscleCar.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 21578c15f92da4b4d96697315edfc546 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Racetrack mini.unity b/Assets/Scenes/Racetrack mini.unity index 0075dfa..556a417 100644 --- a/Assets/Scenes/Racetrack mini.unity +++ b/Assets/Scenes/Racetrack mini.unity @@ -5261,6 +5261,84 @@ MonoBehaviour: animator: {fileID: 388371159} npcPrefab: {fileID: 153506, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3} audio: {fileID: 0} +--- !u!1001 &392623382 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalPosition.x + value: 64.98537 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalPosition.y + value: 0.00062897056 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalPosition.z + value: 15.267399 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2106440785211624687, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_Name + value: MuscleCar + objectReference: {fileID: 0} + - target: {fileID: 3985587579150572548, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_SuspensionSpring.damper + value: 1500 + objectReference: {fileID: 0} + - target: {fileID: 4311002844589887538, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_SuspensionSpring.damper + value: 1500 + objectReference: {fileID: 0} + - target: {fileID: 6247996953015795539, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_SuspensionSpring.damper + value: 1500 + objectReference: {fileID: 0} + - target: {fileID: 8947798677317855350, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_SuspensionSpring.damper + value: 1500 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 21578c15f92da4b4d96697315edfc546, type: 3} +--- !u!1 &392623383 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2106440785211624687, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + m_PrefabInstance: {fileID: 392623382} + m_PrefabAsset: {fileID: 0} --- !u!1001 &395250118 PrefabInstance: m_ObjectHideFlags: 0 @@ -6060,7 +6138,7 @@ PrefabInstance: - target: {fileID: 1742803291406415280, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} propertyPath: TargetCar value: - objectReference: {fileID: 0} + objectReference: {fileID: 392623383} - target: {fileID: 1742803291406415280, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} propertyPath: CamerasPreset.Array.data[1].SetPositionSpeed value: 4 @@ -27239,7 +27317,7 @@ PrefabInstance: - target: {fileID: 5539949921570205737, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} propertyPath: PlayerCar value: - objectReference: {fileID: 0} + objectReference: {fileID: 392623383} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -27260,3 +27338,4 @@ SceneRoots: - {fileID: 454865284} - {fileID: 8684226825208193988} - {fileID: 1513738220} + - {fileID: 392623382} diff --git a/Assets/Scenes/Racetrack.unity b/Assets/Scenes/Racetrack.unity index 8f271cc..3004b51 100644 --- a/Assets/Scenes/Racetrack.unity +++ b/Assets/Scenes/Racetrack.unity @@ -221,7 +221,7 @@ PrefabInstance: - target: {fileID: 1742803291406415280, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} propertyPath: TargetCar value: - objectReference: {fileID: 1729844490} + objectReference: {fileID: 1774155204} - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -1338,6 +1338,10 @@ PrefabInstance: propertyPath: m_Name value: Icecream objectReference: {fileID: 0} + - target: {fileID: 1447150825068379945, guid: d47f31fce875d154eb63afabb58dfa3a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7925133782295764798, guid: d47f31fce875d154eb63afabb58dfa3a, type: 3} propertyPath: m_LocalPosition.x value: 7.972975 @@ -1383,11 +1387,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d47f31fce875d154eb63afabb58dfa3a, type: 3} ---- !u!1 &1729844490 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1447150825068379945, guid: d47f31fce875d154eb63afabb58dfa3a, type: 3} - m_PrefabInstance: {fileID: 1729844489} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1761406195 PrefabInstance: m_ObjectHideFlags: 0 @@ -1449,6 +1448,68 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4435507071ba5724db20dbc77834939d, type: 3} +--- !u!1001 &1774155203 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalPosition.x + value: 6.545304 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalPosition.y + value: 0.099 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalPosition.z + value: -382.06882 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2106440785211624687, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_Name + value: MuscleCar + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 21578c15f92da4b4d96697315edfc546, type: 3} +--- !u!1 &1774155204 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2106440785211624687, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + m_PrefabInstance: {fileID: 1774155203} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1952287231 PrefabInstance: m_ObjectHideFlags: 0 @@ -1786,3 +1847,5 @@ SceneRoots: - {fileID: 1952287231} - {fileID: 949405388} - {fileID: 1729844489} + - {fileID: 4833200516469304011} + - {fileID: 1774155203} diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index ce9d62a..8a78e8b 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -817,6 +817,63 @@ AudioSource: m_CorrespondingSourceObject: {fileID: 7321855203641968658, guid: 5851f609a58dc884a99030da0105c6db, type: 3} m_PrefabInstance: {fileID: 1328367594557032345} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1565700212821217781 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2106440785211624687, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_Name + value: MuscleCar + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 21578c15f92da4b4d96697315edfc546, type: 3} --- !u!1001 &5664739312409415817 PrefabInstance: m_ObjectHideFlags: 0 @@ -2316,3 +2373,4 @@ SceneRoots: - {fileID: 1726413938} - {fileID: 1069827985} - {fileID: 1807081644} + - {fileID: 1565700212821217781} diff --git a/Assets/Scenes/mini_racetrack3.unity b/Assets/Scenes/mini_racetrack3.unity index d6d9739..7aacd16 100644 --- a/Assets/Scenes/mini_racetrack3.unity +++ b/Assets/Scenes/mini_racetrack3.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.29684305, g: 0.63376737, b: 0.9937157, a: 1} + m_IndirectSpecularColor: {r: 0.29684302, g: 0.6337671, b: 0.9937157, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -293,7 +293,7 @@ PrefabInstance: - target: {fileID: 1742803291406415280, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} propertyPath: TargetCar value: - objectReference: {fileID: 610747978} + objectReference: {fileID: 1532760504} - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} propertyPath: m_LocalPosition.x value: 0.8158076 @@ -338,46 +338,6 @@ PrefabInstance: propertyPath: m_Name value: Camera objectReference: {fileID: 0} - - target: {fileID: 1742803291406415280, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} - propertyPath: Loader - value: - objectReference: {fileID: 776505354} - - target: {fileID: 1742803291406415280, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} - propertyPath: TargetCar - value: - objectReference: {fileID: 1852564513} - - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} - propertyPath: m_LocalPosition.x - value: 0.8158076 - objectReference: {fileID: 0} - - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} - propertyPath: m_LocalPosition.y - value: -1.1205094 - objectReference: {fileID: 0} - - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} - propertyPath: m_LocalPosition.z - value: 63.561188 - objectReference: {fileID: 0} - - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} - propertyPath: m_LocalRotation.y - value: 0.97014254 - objectReference: {fileID: 0} - - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} - propertyPath: m_LocalRotation.z - value: -0.24253564 - objectReference: {fileID: 0} - - target: {fileID: 5442577508303945574, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} - propertyPath: m_Name - value: Camera - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -457,11 +417,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 479420, guid: 8e6be04d8370d1c4fa754d22592984f1, type: 3} m_PrefabInstance: {fileID: 530169025} m_PrefabAsset: {fileID: 0} ---- !u!1 &610747978 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3343305849921024470, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3} - m_PrefabInstance: {fileID: 1562443880} - m_PrefabAsset: {fileID: 0} --- !u!1 &776505354 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5711380006811689493, guid: 5851f609a58dc884a99030da0105c6db, type: 3} @@ -15493,6 +15448,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 7984375907914713465, guid: 63afb34a2c116fe498ae42967d35d805, type: 3} m_PrefabInstance: {fileID: 993115565} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1532760503 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalPosition.x + value: -1.813 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalPosition.y + value: 0.015249968 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalPosition.z + value: -1.718 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1221408032842957360, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2106440785211624687, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + propertyPath: m_Name + value: MuscleCar + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 21578c15f92da4b4d96697315edfc546, type: 3} +--- !u!1 &1532760504 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2106440785211624687, guid: 21578c15f92da4b4d96697315edfc546, type: 3} + m_PrefabInstance: {fileID: 1532760503} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1562443880 PrefabInstance: m_ObjectHideFlags: 0 @@ -15547,7 +15564,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3343305849921024470, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -15645,8 +15662,7 @@ Transform: m_LocalPosition: {x: 0.561, y: 0.1, z: 1.304} m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1691573825} + m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1852564515 @@ -15710,26 +15726,86 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 1343942738810352354, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1469675059208726835, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 97942cb5527e6f24eb8b8f5c86f8744d, type: 2} + - target: {fileID: 1997646110503820959, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2226169939592596516, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3022191931717917784, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3425266780126093186, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: ac4517348fefb604bbf10afeb378a491, type: 2} + - target: {fileID: 3446889489251159559, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3949292162884599890, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4706597169299759970, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5361385526453860773, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 97942cb5527e6f24eb8b8f5c86f8744d, type: 2} + - target: {fileID: 5938590487780353885, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5993338697970663431, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6038226736092541883, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6042017897603408828, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6112896674576239621, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6468709298929742289, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 97942cb5527e6f24eb8b8f5c86f8744d, type: 2} + - target: {fileID: 6838100718802891394, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7591343556757434636, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7708173528503215869, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} propertyPath: m_Name value: Racetrack3 objectReference: {fileID: 0} + - target: {fileID: 7967632219792475599, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8440853621307243318, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} propertyPath: m_LocalScale.x value: 0.25 @@ -15782,6 +15858,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8460728282651437807, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8839090541742178523, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9013004020710306357, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 9053630949307204883, guid: 9a6052ce7b65c814285a6cb4659dab3c, type: 3} propertyPath: m_LocalPosition.y value: 0.061 @@ -20964,3 +21052,5 @@ SceneRoots: - {fileID: 7464252934433038775} - {fileID: 7454404101320817533} - {fileID: 1348978421} + - {fileID: 1852564514} + - {fileID: 1532760503} diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 26b41dc..8bbf084 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -122,13 +122,13 @@ public class PlayerController : MonoBehaviour } private void Update() { - Transform currentCheckpoint = checkpoints[checkpointsCollected].transform; - float checkpintDistance = distanceToCheckpoint(currentCheckpoint); + // Transform currentCheckpoint = checkpoints[checkpointsCollected].transform; + // float checkpintDistance = distanceToCheckpoint(currentCheckpoint); - if (checkpintDistance < 0.1f) - { - checkpointsCollected += 1; - } + // if (checkpintDistance < 0.1f) + // { + // checkpointsCollected += 1; + // } } private void OnCollisionEnter(Collision other) {