From 75d677442d7e4ca873df49bf68a0346a1b3bded5 Mon Sep 17 00:00:00 2001 From: magn9775 Date: Tue, 23 Apr 2024 14:43:20 +0200 Subject: [PATCH] Crazy camera --- .../Timers/Racetrack mini_timers.json | 2 +- Assets/Prefabs/Camera.prefab | 560 +++++++++++------- Assets/Prefabs/Camera.prefab.meta | 2 +- Assets/Prefabs/GameController.prefab | 49 ++ Assets/Prefabs/GameController.prefab.meta | 7 + Assets/Scenes/Racetrack mini.unity | 492 +++++---------- Assets/Scenes/SampleScene.unity | 483 ++++----------- Assets/Scripts/CameraControl.cs | 135 +++++ Assets/Scripts/CameraControl.cs.meta | 11 + Assets/Scripts/GameController.cs | 97 +++ Assets/Scripts/GameController.cs.meta | 11 + Assets/Scripts/car control v2.cs | 10 +- Assets/Scripts/gameController1.cs | 93 +++ Assets/Scripts/gameController1.cs.meta | 11 + 14 files changed, 1037 insertions(+), 926 deletions(-) create mode 100644 Assets/Prefabs/GameController.prefab create mode 100644 Assets/Prefabs/GameController.prefab.meta create mode 100644 Assets/Scripts/CameraControl.cs create mode 100644 Assets/Scripts/CameraControl.cs.meta create mode 100644 Assets/Scripts/GameController.cs create mode 100644 Assets/Scripts/GameController.cs.meta create mode 100644 Assets/Scripts/gameController1.cs create mode 100644 Assets/Scripts/gameController1.cs.meta diff --git a/Assets/ML-Agents/Timers/Racetrack mini_timers.json b/Assets/ML-Agents/Timers/Racetrack mini_timers.json index f2cffd1..343ffcd 100644 --- a/Assets/ML-Agents/Timers/Racetrack mini_timers.json +++ b/Assets/ML-Agents/Timers/Racetrack mini_timers.json @@ -1 +1 @@ -{"count":1,"self":67.02152319999999,"total":68.75985519999999,"children":{"InitializeActuators":{"count":1,"self":0.00099969999999999985,"total":0.00099969999999999985,"children":null},"InitializeSensors":{"count":1,"self":0.0029919,"total":0.0029919,"children":null},"AgentSendState":{"count":3173,"self":0.0853182,"total":0.146277,"children":{"CollectObservations":{"count":635,"self":0.0375563,"total":0.0375563,"children":null},"WriteActionMask":{"count":635,"self":0.0019976,"total":0.0019976,"children":null},"RequestDecision":{"count":635,"self":0.021404899999999998,"total":0.021404899999999998,"children":null}}},"DecideAction":{"count":3173,"self":1.3692536,"total":1.3805634,"children":{"RayPerceptionSensor.Perceive":{"count":1270,"self":0.0113098,"total":0.0113098,"children":null}}},"AgentAct":{"count":3173,"self":0.20445629999999998,"total":0.20445629999999998,"children":null}},"gauges":{"BensonV6.1.CumulativeReward":{"count":2,"max":25.4223919,"min":12.8763666,"runningAverage":19.14938,"value":12.8763666,"weightedAverage":22.2858849}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713860886","unity_version":"2022.3.11f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.11f1\\Editor\\Unity.exe -projectpath C:\\Users\\Magnus\\Desktop\\Ny unityting\\Racesm -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-Magnus -hubSessionId 85628495-4bbf-4ebf-9a76-a3f42df70699 -accessToken SYITqeuCKSOmslEUEeguWUuVHsXrKJl43gox_St5y34005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Racetrack mini","end_time_seconds":"1713860954"}} \ No newline at end of file +{"count":1,"self":153.1085824,"total":156.9964003,"children":{"InitializeActuators":{"count":1,"self":0.005389,"total":0.005389,"children":null},"InitializeSensors":{"count":1,"self":0.002791,"total":0.002791,"children":null},"AgentSendState":{"count":7588,"self":0.22169339999999998,"total":0.3273192,"children":{"CollectObservations":{"count":1518,"self":0.0730971,"total":0.0730971,"children":null},"WriteActionMask":{"count":1518,"self":0.0070043,"total":0.0070043,"children":null},"RequestDecision":{"count":1518,"self":0.0255244,"total":0.0255244,"children":null}}},"DecideAction":{"count":7588,"self":3.0653175999999998,"total":3.0896298,"children":{"RayPerceptionSensor.Perceive":{"count":3036,"self":0.0243121,"total":0.0243121,"children":null}}},"AgentAct":{"count":7588,"self":0.4597014,"total":0.4597014,"children":null}},"gauges":{"BensonV6.1.CumulativeReward":{"count":5,"max":25.4343758,"min":11.6925583,"runningAverage":17.688221,"value":25.4338017,"weightedAverage":17.183569}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713876023","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":"Racetrack mini","end_time_seconds":"1713876180"}} \ No newline at end of file diff --git a/Assets/Prefabs/Camera.prefab b/Assets/Prefabs/Camera.prefab index f83bb49..097f801 100644 --- a/Assets/Prefabs/Camera.prefab +++ b/Assets/Prefabs/Camera.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1387890555408215438 +--- !u!1 &189981945369711235 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,226 +8,37 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6331817402021486753} + - component: {fileID: 7059073999057063159} + - component: {fileID: 6473159864475415274} m_Layer: 0 m_Name: Camera - m_TagString: Untagged + m_TagString: MainCamera m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6331817402021486753 +--- !u!4 &7059073999057063159 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1387890555408215438} + m_GameObject: {fileID: 189981945369711235} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.5158076, y: 1.9205093, z: -6.9411907} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 320316327550477191} - - {fileID: 8890610309520933432} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3737921037825940745 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 320316327550477191} - - component: {fileID: 8858152487650577344} - m_Layer: 0 - m_Name: Virtual Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &320316327550477191 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3737921037825940745} - serializedVersion: 2 - m_LocalRotation: {x: 0.24253564, y: -0, z: -0, w: 0.97014254} - m_LocalPosition: {x: 86.31581, y: -1.0605093, z: -50.95881} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5074368049883446301} - m_Father: {fileID: 6331817402021486753} - m_LocalEulerAnglesHint: {x: 25.641, y: 0, z: 0} ---- !u!114 &8858152487650577344 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3737921037825940745} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - m_LockStageInInspector: - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 60.000004 - OrthographicSize: 5 - NearClipPlane: 0.3 - FarClipPlane: 500 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 5074368049883446301} ---- !u!1 &4840733166066636179 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5074368049883446301} - - component: {fileID: 2165901318259190681} - - component: {fileID: 2100622393876020061} - - component: {fileID: 4849827436373015423} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5074368049883446301 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4840733166066636179} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 1, z: -3} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 320316327550477191} + m_Father: {fileID: 6752154105574841300} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2165901318259190681 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4840733166066636179} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2100622393876020061 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4840733166066636179} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd6043bde05a7fc4cba197d06915c1e3, type: 3} - m_Name: - m_EditorClassIdentifier: - Damping: {x: 1, y: 0.4, z: 1} - ShoulderOffset: {x: 0, y: 0.5, z: 0} - VerticalArmLength: 0.3 - CameraSide: 0.5 - CameraDistance: 1.5 - CameraCollisionFilter: - serializedVersion: 2 - m_Bits: 0 - IgnoreTag: - CameraRadius: 0.494 - DampingIntoCollision: 4.6 - DampingFromCollision: 2 ---- !u!114 &4849827436373015423 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4840733166066636179} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1e8b78ac948f05a46a6d8339a503172b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &5810170567460595970 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8890610309520933432} - - component: {fileID: 679652745285801860} - - component: {fileID: 5810259084109237748} - - component: {fileID: 2604980817903369847} - m_Layer: 0 - m_Name: Main Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8890610309520933432 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5810170567460595970} - serializedVersion: 2 - m_LocalRotation: {x: 0.24253564, y: -0, z: -0, w: 0.97014254} - m_LocalPosition: {x: 86.31581, y: -1.0605093, z: -50.95881} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6331817402021486753} - m_LocalEulerAnglesHint: {x: 10.641, y: 0, z: 0} ---- !u!20 &679652745285801860 +--- !u!20 &6473159864475415274 Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5810170567460595970} + m_GameObject: {fileID: 189981945369711235} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 @@ -253,11 +64,11 @@ Camera: width: 1 height: 1 near clip plane: 0.3 - far clip plane: 500 - field of view: 60.000004 + far clip plane: 1000 + field of view: 60 orthographic: 0 orthographic size: 5 - m_Depth: 0 + m_Depth: -1 m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 @@ -272,45 +83,334 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!81 &5810259084109237748 -AudioListener: +--- !u!1 &1614353836979767215 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5810170567460595970} + serializedVersion: 6 + m_Component: + - component: {fileID: 3506080139786068794} + - component: {fileID: 754815824581087393} + m_Layer: 0 + m_Name: Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3506080139786068794 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1614353836979767215} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -7} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8374097587722584818} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &754815824581087393 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1614353836979767215} m_Enabled: 1 ---- !u!114 &2604980817903369847 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!1 &2025976239374287140 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6752154105574841300} + m_Layer: 0 + m_Name: Preset2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6752154105574841300 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025976239374287140} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7059073999057063159} + m_Father: {fileID: 5259896103893455903} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2798154674700588336 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1267931134940687248} + m_Layer: 0 + m_Name: Preset1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1267931134940687248 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2798154674700588336} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7687668299152237563} + m_Father: {fileID: 5259896103893455903} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3877521471854004054 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8374097587722584818} + m_Layer: 0 + m_Name: Preset3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8374097587722584818 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3877521471854004054} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3506080139786068794} + m_Father: {fileID: 5259896103893455903} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &5442577508303945574 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5259896103893455903} + - component: {fileID: 1742803291406415280} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5259896103893455903 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5442577508303945574} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1267931134940687248} + - {fileID: 6752154105574841300} + - {fileID: 8374097587722584818} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1742803291406415280 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5810170567460595970} + m_GameObject: {fileID: 5442577508303945574} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} + m_Script: {fileID: 11500000, guid: aa5b7c6348736da45b5cb01d41f7b6fe, type: 3} m_Name: m_EditorClassIdentifier: - m_ShowDebugText: 0 - m_ShowCameraFrustum: 1 - m_IgnoreTimeScale: 0 - m_WorldUpOverride: {fileID: 0} - m_UpdateMethod: 2 - m_BlendUpdateMethod: 1 - m_DefaultBlend: - m_Style: 1 - m_Time: 2 - m_CustomCurve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_CustomBlends: {fileID: 0} - m_CameraCutEvent: - m_PersistentCalls: - m_Calls: [] - m_CameraActivatedEvent: - m_PersistentCalls: - m_Calls: [] + SetCameraKey: 99 + NextCameraButton: {fileID: 0} + CamerasPreset: + - CameraHolder: {fileID: 2798154674700588336} + SetPositionSpeed: 4 + VelocityMultiplier: 1 + EnableRotation: 1 + MinDistanceForRotation: 0.01 + SetRotationSpeed: 5 + - CameraHolder: {fileID: 2025976239374287140} + SetPositionSpeed: 1 + VelocityMultiplier: 0.75 + EnableRotation: 1 + MinDistanceForRotation: 0.01 + SetRotationSpeed: 5 + - CameraHolder: {fileID: 3877521471854004054} + SetPositionSpeed: 10 + VelocityMultiplier: 1 + EnableRotation: 0 + MinDistanceForRotation: 0.01 + SetRotationSpeed: 5 + TargetCar: {fileID: 0} +--- !u!1 &5710954322334381951 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7687668299152237563} + - component: {fileID: 1013464927818154313} + m_Layer: 0 + m_Name: Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7687668299152237563 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5710954322334381951} + serializedVersion: 2 + m_LocalRotation: {x: 0.17364816, y: 0, z: 0, w: 0.9848078} + m_LocalPosition: {x: 0, y: 2, z: -3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1267931134940687248} + m_LocalEulerAnglesHint: {x: 20, y: 0, z: 0} +--- !u!20 &1013464927818154313 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5710954322334381951} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 diff --git a/Assets/Prefabs/Camera.prefab.meta b/Assets/Prefabs/Camera.prefab.meta index c9e0f3f..323bcfb 100644 --- a/Assets/Prefabs/Camera.prefab.meta +++ b/Assets/Prefabs/Camera.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 80c5f8bcfe7e033419638b39d9a278c4 +guid: 4d2790a368af4c4458fc4dc8130f8b19 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/GameController.prefab b/Assets/Prefabs/GameController.prefab new file mode 100644 index 0000000..9f7d350 --- /dev/null +++ b/Assets/Prefabs/GameController.prefab @@ -0,0 +1,49 @@ +%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 new file mode 100644 index 0000000..e7c4921 --- /dev/null +++ b/Assets/Prefabs/GameController.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 420cdad33b21c264392db22c65595f6d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Racetrack mini.unity b/Assets/Scenes/Racetrack mini.unity index 2dad6d9..7797ef7 100644 --- a/Assets/Scenes/Racetrack mini.unity +++ b/Assets/Scenes/Racetrack mini.unity @@ -3918,103 +3918,6 @@ MonoBehaviour: animator: {fileID: 270400185} npcPrefab: {fileID: 153506, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3} audio: {fileID: 0} ---- !u!1 &279243547 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 279243548} - - component: {fileID: 279243551} - - component: {fileID: 279243552} - - component: {fileID: 279243553} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &279243548 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 279243547} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1438942458} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &279243551 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 279243547} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &279243552 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 279243547} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd6043bde05a7fc4cba197d06915c1e3, type: 3} - m_Name: - m_EditorClassIdentifier: - Damping: {x: 0, y: 0, z: 0} - ShoulderOffset: {x: 0, y: 0, z: 0} - VerticalArmLength: 1 - CameraSide: 0.5 - CameraDistance: 2 - CameraCollisionFilter: - serializedVersion: 2 - m_Bits: 0 - IgnoreTag: - CameraRadius: 0.001 - DampingIntoCollision: 0 - DampingFromCollision: 0 ---- !u!114 &279243553 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 279243547} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0.265 - m_LookaheadSmoothing: 6.2 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 4.8 - m_VerticalDamping: 0.5 - m_ScreenX: 0.5 - m_ScreenY: 0.62 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.04 - m_SoftZoneHeight: 0.11 - m_BiasX: 0 - m_BiasY: -0.12 - m_CenterOnActivate: 1 --- !u!1001 &287427410 PrefabInstance: m_ObjectHideFlags: 0 @@ -6026,11 +5929,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3} ---- !u!4 &440836397 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3} - m_PrefabInstance: {fileID: 1205272008} - m_PrefabAsset: {fileID: 0} --- !u!1001 &443573514 PrefabInstance: m_ObjectHideFlags: 0 @@ -6088,6 +5986,91 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8e14ccd68551a1a4e93b83808515b996, type: 3} +--- !u!1001 &454865284 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1742803291406415280, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: TargetCar + value: + objectReference: {fileID: 1427960685} + - target: {fileID: 1742803291406415280, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: CamerasPreset.Array.data[1].SetPositionSpeed + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1742803291406415280, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: CamerasPreset.Array.data[1].VelocityMultiplier + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_LocalPosition.x + value: 55 + objectReference: {fileID: 0} + - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_LocalPosition.z + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + 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 + objectReference: {fileID: 0} + - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5442577508303945574, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_Name + value: Camera + objectReference: {fileID: 0} + - target: {fileID: 7059073999057063159, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_LocalPosition.z + value: -1.5 + objectReference: {fileID: 0} + - target: {fileID: 7059073999057063159, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9914449 + objectReference: {fileID: 0} + - target: {fileID: 7059073999057063159, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_LocalRotation.x + value: 0.13052616 + objectReference: {fileID: 0} + - target: {fileID: 7059073999057063159, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 15 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} --- !u!1001 &464917649 PrefabInstance: m_ObjectHideFlags: 0 @@ -17197,39 +17180,6 @@ MonoBehaviour: animator: {fileID: 1372193550} npcPrefab: {fileID: 153506, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3} audio: {fileID: 0} ---- !u!1 &1375563098 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1375563099} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1375563099 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1375563098} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 50.819103, y: 36.67663, z: -84.32594} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2049722135} - - {fileID: 1438942458} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1427960684 PrefabInstance: m_ObjectHideFlags: 0 @@ -17287,6 +17237,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5851f609a58dc884a99030da0105c6db, type: 3} +--- !u!1 &1427960685 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5711380006811689493, guid: 5851f609a58dc884a99030da0105c6db, type: 3} + m_PrefabInstance: {fileID: 1427960684} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1430263216 PrefabInstance: m_ObjectHideFlags: 0 @@ -17421,78 +17376,6 @@ MonoBehaviour: animator: {fileID: 1430263220} npcPrefab: {fileID: 153506, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3} audio: {fileID: 0} ---- !u!1 &1438942457 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1438942458} - - component: {fileID: 1438942459} - m_Layer: 0 - m_Name: Virtual Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1438942458 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1438942457} - serializedVersion: 2 - m_LocalRotation: {x: 0.11473485, y: 0.6977363, z: -0.11473485, w: 0.6977363} - m_LocalPosition: {x: 9.25079, y: -35.426, z: 97.42711} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 279243548} - m_Father: {fileID: 1375563099} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1438942459 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1438942457} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - m_LockStageInInspector: - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 440836397} - m_Follow: {fileID: 440836397} - m_Lens: - FieldOfView: 60.000004 - OrthographicSize: 5 - NearClipPlane: 0.05 - FarClipPlane: 1000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 279243548} --- !u!1001 &1466850059 PrefabInstance: m_ObjectHideFlags: 0 @@ -18029,6 +17912,71 @@ MonoBehaviour: animator: {fileID: 1480005367} npcPrefab: {fileID: 153506, guid: 5e488cfd825ce044395037d93a9d8eb6, type: 3} audio: {fileID: 0} +--- !u!1001 &1492327422 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 281105538288573982, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: PlayerCar + value: + objectReference: {fileID: 1427960685} + - target: {fileID: 2362900685038639990, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_Name + value: GameController + objectReference: {fileID: 0} + - target: {fileID: 2362900685038639990, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6970569131258301195, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_LocalPosition.x + value: 31.220337 + objectReference: {fileID: 0} + - target: {fileID: 6970569131258301195, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_LocalPosition.y + value: 14.231196 + objectReference: {fileID: 0} + - target: {fileID: 6970569131258301195, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_LocalPosition.z + value: 14.108478 + objectReference: {fileID: 0} + - target: {fileID: 6970569131258301195, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6970569131258301195, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6970569131258301195, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6970569131258301195, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6970569131258301195, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6970569131258301195, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6970569131258301195, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 420cdad33b21c264392db22c65595f6d, type: 3} --- !u!1001 &1495114367 PrefabInstance: m_ObjectHideFlags: 0 @@ -25094,133 +25042,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9f63749b266355c4c8f8f5a8529d34cb, type: 3} ---- !u!1 &2049722134 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2049722135} - - component: {fileID: 2049722137} - - component: {fileID: 2049722136} - - component: {fileID: 2049722138} - m_Layer: 0 - m_Name: Virtual cam - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2049722135 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2049722134} - serializedVersion: 2 - m_LocalRotation: {x: 0.11473485, y: 0.6977363, z: -0.11473485, w: 0.6977363} - m_LocalPosition: {x: 9.25079, y: -35.426, z: 97.42711} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1375563099} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!81 &2049722136 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2049722134} - m_Enabled: 1 ---- !u!20 &2049722137 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2049722134} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.05 - far clip plane: 1000 - field of view: 60.000004 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!114 &2049722138 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2049722134} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowDebugText: 0 - m_ShowCameraFrustum: 1 - m_IgnoreTimeScale: 0 - m_WorldUpOverride: {fileID: 0} - m_UpdateMethod: 2 - m_BlendUpdateMethod: 1 - m_DefaultBlend: - m_Style: 1 - m_Time: 2 - m_CustomCurve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_CustomBlends: {fileID: 0} - m_CameraCutEvent: - m_PersistentCalls: - m_Calls: [] - m_CameraActivatedEvent: - m_PersistentCalls: - m_Calls: [] --- !u!1001 &2053969745 PrefabInstance: m_ObjectHideFlags: 0 @@ -26559,10 +26380,11 @@ SceneRoots: - {fileID: 1427960684} - {fileID: 1495114367} - {fileID: 1077232721} - - {fileID: 1375563099} - {fileID: 587494461} - {fileID: 5211344267139555828} - {fileID: 998358590} - {fileID: 323815922} - {fileID: 1205272008} - {fileID: 2047826617} + - {fileID: 454865284} + - {fileID: 1492327422} diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index ee49cab..ec06bb0 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -123,133 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &419924744 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 419924745} - - component: {fileID: 419924747} - - component: {fileID: 419924746} - - component: {fileID: 419924748} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &419924745 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 419924744} - serializedVersion: 2 - m_LocalRotation: {x: 0.15869996, y: -0.000000081903686, z: 0.000000013164952, w: 0.98732686} - m_LocalPosition: {x: 8.988994, y: 3.006153, z: -8.624642} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1803867430} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!81 &419924746 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 419924744} - m_Enabled: 1 ---- !u!20 &419924747 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 419924744} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60.000004 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!114 &419924748 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 419924744} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowDebugText: 0 - m_ShowCameraFrustum: 1 - m_IgnoreTimeScale: 0 - m_WorldUpOverride: {fileID: 0} - m_UpdateMethod: 2 - m_BlendUpdateMethod: 1 - m_DefaultBlend: - m_Style: 1 - m_Time: 2 - m_CustomCurve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_CustomBlends: {fileID: 0} - m_CameraCutEvent: - m_PersistentCalls: - m_Calls: [] - m_CameraActivatedEvent: - m_PersistentCalls: - m_Calls: [] --- !u!1 &449437553 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1144658963992784436, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3} @@ -375,116 +248,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!4 &1449092683 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1090221803596404863, guid: 6fc8c7c09bd68874aa576b39459428cb, type: 3} - m_PrefabInstance: {fileID: 80741412746491736} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1543181689 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1543181690} - - component: {fileID: 1543181691} - m_Layer: 0 - m_Name: Virtual Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1543181690 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1543181689} - serializedVersion: 2 - m_LocalRotation: {x: 0.15869996, y: -0.000000081903686, z: 0.000000013164952, w: 0.98732686} - m_LocalPosition: {x: 8.988994, y: 3.006153, z: -8.624642} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2060868858} - m_Father: {fileID: 1803867430} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1543181691 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1543181689} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - m_LockStageInInspector: - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 1449092683} - m_Follow: {fileID: 1449092683} - m_Lens: - FieldOfView: 60.000004 - OrthographicSize: 5 - NearClipPlane: 0.3 - FarClipPlane: 1000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 2060868858} ---- !u!1 &1803867429 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1803867430} - m_Layer: 0 - m_Name: Camera V2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1803867430 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1803867429} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.0110084, y: 0.6276216, z: -0.8716441} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 419924745} - - {fileID: 1543181690} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1915174277 GameObject: m_ObjectHideFlags: 0 @@ -647,122 +410,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b7391613e08a1e4419083635391e73ec, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &2060868857 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2060868858} - - component: {fileID: 2060868861} - - component: {fileID: 2060868860} - - component: {fileID: 2060868862} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2060868858 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2060868857} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1543181690} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2060868860 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2060868857} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: -0.66, z: 2} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0.5 - m_VerticalDamping: 0.5 - m_ScreenX: 0.5 - m_ScreenY: 0.5 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 ---- !u!114 &2060868861 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2060868857} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2060868862 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2060868857} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6ad980451443d70438faac0bc6c235a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_TargetMovementOnly: 1 - m_ScreenX: 0.5 - m_ScreenY: 0.5 - m_CameraDistance: 10 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_DeadZoneDepth: 0 - m_UnlimitedSoftZone: 1 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 - m_GroupFramingMode: 2 - m_AdjustmentMode: 0 - m_GroupFramingSize: 0.8 - m_MaxDollyIn: 5000 - m_MaxDollyOut: 5000 - m_MinimumDistance: 1 - m_MaximumDistance: 5000 - m_MinimumFOV: 3 - m_MaximumFOV: 60 - m_MinimumOrthoSize: 1 - m_MaximumOrthoSize: 5000 --- !u!1001 &80741412746491736 PrefabInstance: m_ObjectHideFlags: 0 @@ -949,6 +596,11 @@ AudioSource: m_CorrespondingSourceObject: {fileID: 7321855203641968658, guid: 5851f609a58dc884a99030da0105c6db, type: 3} m_PrefabInstance: {fileID: 1328367594557032345} m_PrefabAsset: {fileID: 0} +--- !u!1 &1328367594557032347 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5711380006811689493, guid: 5851f609a58dc884a99030da0105c6db, type: 3} + m_PrefabInstance: {fileID: 1328367594557032345} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5664739312409415817 PrefabInstance: m_ObjectHideFlags: 0 @@ -2157,6 +1809,67 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 2057961604} m_SourcePrefab: {fileID: 100100000, guid: 9ffbbbe0f32e84c418118cfd82141aa5, type: 3} +--- !u!1001 &6340921078669887300 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1742803291406415280, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: TargetCar + value: + objectReference: {fileID: 1328367594557032347} + - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + 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 + objectReference: {fileID: 0} + - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5259896103893455903, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5442577508303945574, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} + propertyPath: m_Name + value: Camera + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4d2790a368af4c4458fc4dc8130f8b19, type: 3} --- !u!1001 &6691047895503368176 PrefabInstance: m_ObjectHideFlags: 0 @@ -2355,6 +2068,67 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d5caff8338f793c4eb4490cc52546faf, type: 3} +--- !u!1001 &8038237492944088795 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 281105538288573982, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: PlayerCar + value: + objectReference: {fileID: 1328367594557032347} + - target: {fileID: 2362900685038639990, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_Name + value: GameController + objectReference: {fileID: 0} + - target: {fileID: 6970569131258301195, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_LocalPosition.x + value: 31.220337 + objectReference: {fileID: 0} + - target: {fileID: 6970569131258301195, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_LocalPosition.y + value: 14.231196 + objectReference: {fileID: 0} + - target: {fileID: 6970569131258301195, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_LocalPosition.z + value: 14.108478 + objectReference: {fileID: 0} + - target: {fileID: 6970569131258301195, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6970569131258301195, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6970569131258301195, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6970569131258301195, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6970569131258301195, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6970569131258301195, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6970569131258301195, guid: 420cdad33b21c264392db22c65595f6d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 420cdad33b21c264392db22c65595f6d, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -2366,5 +2140,6 @@ SceneRoots: - {fileID: 6862354766440944207} - {fileID: 5664739312409415817} - {fileID: 80741412746491736} - - {fileID: 1803867430} - {fileID: 6691047895503368176} + - {fileID: 6340921078669887300} + - {fileID: 8038237492944088795} diff --git a/Assets/Scripts/CameraControl.cs b/Assets/Scripts/CameraControl.cs new file mode 100644 index 0000000..53ef26a --- /dev/null +++ b/Assets/Scripts/CameraControl.cs @@ -0,0 +1,135 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using Unity.VisualScripting; +using UnityEngine; + + +//script from FREAKINGREX, but minor changes to integrate it proberly +//https://assetstore.unity.com/packages/templates/systems/arcade-car-controller-lite-version-145489 + +public class CameraControl :MonoBehaviour +{ + + [SerializeField] KeyCode SetCameraKey = KeyCode.C; //Set next camore on PC hotkey. + [SerializeField] UnityEngine.UI.Button NextCameraButton; + [SerializeField] List CamerasPreset = new List(); //Camera presets + + int ActivePresetIndex = 0; + CameraPreset ActivePreset; + + public GameObject TargetCar; + GameController GameController { get { return GameController.Instance; } } + + float SqrMinDistance; + + + + Vector3 TargetPoint + { + get + { + if (TargetCar == null) + { + return transform.position; + } + Rigidbody carRB = TargetCar.GetComponent(); + Vector3 result = carRB.velocity * ActivePreset.VelocityMultiplier*0.05f; + result += TargetCar.transform.position; + result.y = 0; + return result; + } + } + + private void Awake() { + CamerasPreset.ForEach (c => c.CameraHolder.SetActive(false)); + UpdateActiveCamera (); + + if (NextCameraButton) + { + NextCameraButton.onClick.AddListener (SetNextCamera); + } + } + + private void FixedUpdate () + { + if (ActivePreset.EnableRotation && (TargetPoint - transform.position).sqrMagnitude >= SqrMinDistance) + { + Quaternion rotation = Quaternion.LookRotation (TargetPoint - transform.position, Vector3.up); + ActivePreset.CameraHolder.transform.rotation = Quaternion.Lerp (ActivePreset.CameraHolder.transform.rotation, rotation, Time.deltaTime * ActivePreset.SetRotationSpeed); + } + + transform.position = Vector3.LerpUnclamped (transform.position, TargetPoint, Time.deltaTime * ActivePreset.SetPositionSpeed); + + if (Input.GetKeyDown (SetCameraKey)) + { + SetNextCamera (); + } + } + + private IEnumerator Start () + { + while (GameController == null) + { + yield return null; + } + transform.position = TargetPoint; + } + + public void SetNextCamera () + { + ActivePresetIndex = LoopClamp (ActivePresetIndex + 1, 0, CamerasPreset.Count); + UpdateActiveCamera (); + } + + public static int LoopClamp (int value, int minValue, int maxValue) + { + while (value < minValue || value >= maxValue) + { + if (value < minValue) + { + value += maxValue - minValue; + } + else if (value >= maxValue) + { + value -= maxValue - minValue; + } + } + return value; + } + + public void UpdateActiveCamera () + { + if (ActivePreset != null) + { + ActivePreset.CameraHolder.SetActive(false); + } + + ActivePreset = CamerasPreset[ActivePresetIndex]; + ActivePreset.CameraHolder.SetActive(true); + + SqrMinDistance = ActivePreset.MinDistanceForRotation * 2; + + if (ActivePreset.EnableRotation && (TargetPoint - transform.position).sqrMagnitude >= SqrMinDistance) + { + Quaternion rotation = Quaternion.LookRotation (TargetPoint - transform.position, Vector3.up); + ActivePreset.CameraHolder.transform.rotation = rotation; + } + } + + + + + [System.Serializable] + + class CameraPreset + { + public GameObject CameraHolder; + public float SetPositionSpeed = 1; //Change position speed. + public float VelocityMultiplier; //Velocity of car multiplier. + + public bool EnableRotation; + public float MinDistanceForRotation = 0.1f; //Min distance for potation, To avoid uncontrolled rotation. + public float SetRotationSpeed = 1; //Change rotation speed. + } +} diff --git a/Assets/Scripts/CameraControl.cs.meta b/Assets/Scripts/CameraControl.cs.meta new file mode 100644 index 0000000..f034314 --- /dev/null +++ b/Assets/Scripts/CameraControl.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: aa5b7c6348736da45b5cb01d41f7b6fe +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GameController.cs b/Assets/Scripts/GameController.cs new file mode 100644 index 0000000..a102574 --- /dev/null +++ b/Assets/Scripts/GameController.cs @@ -0,0 +1,97 @@ +using System; +using System.Linq; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// Base class game controller. +/// +public class GameController :MonoBehaviour +{ + [SerializeField] KeyCode NextCarKey = KeyCode.N; + [SerializeField] UnityEngine.UI.Button NextCarButton; + public static GameController Instance; + public GameObject PlayerCar; + public static bool RaceIsStarted { get { return true; } } + public static bool RaceIsEnded { get { return false; } } + + carcontrolv2 m_PlayerCar; + List Cars = new List(); + int CurrentCarIndex = 0; + + protected virtual void Awake () + { + + Instance = this; + + //Find all cars in current game. + Cars.AddRange (GameObject.FindObjectsOfType ()); + Cars = Cars.OrderBy (c => c.name).ToList(); + + foreach (var car in Cars) + { + var userControl = car.GetComponent(); + var audioListener = car.GetComponent(); + + if (userControl == null) + { + userControl = car.gameObject.AddComponent (); + } + + if (audioListener == null) + { + audioListener = car.gameObject.AddComponent (); + } + + userControl.enabled = false; + audioListener.enabled = false; + } + + m_PlayerCar = Cars[0]; + m_PlayerCar.GetComponent ().enabled = true; + m_PlayerCar.GetComponent ().enabled = true; + + if (NextCarButton) + { + NextCarButton.onClick.AddListener (NextCar); + } + } + + void Update () + { + if (Input.GetKeyDown (NextCarKey)) + { + NextCar (); + } + + } + + private void NextCar () + { + m_PlayerCar.GetComponent ().enabled = false; + m_PlayerCar.GetComponent ().enabled = false; + + CurrentCarIndex = LoopClamp (CurrentCarIndex + 1, 0, Cars.Count); + + m_PlayerCar = Cars[CurrentCarIndex]; + m_PlayerCar.GetComponent ().enabled = true; + m_PlayerCar.GetComponent ().enabled = true; + } + + public static int LoopClamp (int value, int minValue, int maxValue) + { + while (value < minValue || value >= maxValue) + { + if (value < minValue) + { + value += maxValue - minValue; + } + else if (value >= maxValue) + { + value -= maxValue - minValue; + } + } + return value; + } +} diff --git a/Assets/Scripts/GameController.cs.meta b/Assets/Scripts/GameController.cs.meta new file mode 100644 index 0000000..2dbdd45 --- /dev/null +++ b/Assets/Scripts/GameController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b00fe924fac7ccc488443310caf9e5b9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/car control v2.cs b/Assets/Scripts/car control v2.cs index fe7207c..d1d8ab6 100644 --- a/Assets/Scripts/car control v2.cs +++ b/Assets/Scripts/car control v2.cs @@ -111,11 +111,11 @@ public class carcontrolv2 : MonoBehaviour } //idk camera mobning rammer hårdt - float THINP = hInput/10; - if (THINP != hInput) - { - THINP+=hInput/10; - } + // float THINP = hInput/10; + // if (THINP != hInput) + // { + // THINP+=hInput/10; + // } //lookat.transform.localPosition = new Vector3 (THINP*1.5f,1,4); diff --git a/Assets/Scripts/gameController1.cs b/Assets/Scripts/gameController1.cs new file mode 100644 index 0000000..a46c282 --- /dev/null +++ b/Assets/Scripts/gameController1.cs @@ -0,0 +1,93 @@ +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; + +public class gameController1 : MonoBehaviour +{ + [SerializeField] KeyCode NextCarKey = KeyCode.N; + [SerializeField] UnityEngine.UI.Button NextCarButton; + public static gameController1 Instance; + public GameObject PlayerCar; + public static bool RaceIsStarted { get { return true; } } + public static bool RaceIsEnded { get { return false; } } + + carcontrolv2 m_PlayerCar; + List Cars = new List(); + int CurrentCarIndex = 0; + + protected virtual void Awake () + { + + Instance = this; + + //Find all cars in current game. + Cars.AddRange (GameObject.FindObjectsOfType ()); + Cars = Cars.OrderBy(c => c.name).ToList(); + + foreach (var car in Cars) + { + var userControl = car.GetComponent(); + var audioListener = car.GetComponent(); + + if (userControl == null) + { + userControl = car.gameObject.AddComponent (); + } + + if (audioListener == null) + { + audioListener = car.gameObject.AddComponent (); + } + + userControl.enabled = false; + audioListener.enabled = false; + } + + m_PlayerCar = Cars[0]; + m_PlayerCar.GetComponent ().enabled = true; + m_PlayerCar.GetComponent ().enabled = true; + + if (NextCarButton) + { + NextCarButton.onClick.AddListener (NextCar); + } + } + + void Update () + { + if (Input.GetKeyDown (NextCarKey)) + { + NextCar (); + } + + } + + private void NextCar () + { + m_PlayerCar.GetComponent ().enabled = false; + m_PlayerCar.GetComponent ().enabled = false; + + CurrentCarIndex = LoopClamp (CurrentCarIndex + 1, 0, Cars.Count); + + m_PlayerCar = Cars[CurrentCarIndex]; + m_PlayerCar.GetComponent ().enabled = true; + m_PlayerCar.GetComponent ().enabled = true; + } + + public static int LoopClamp (int value, int minValue, int maxValue) + { + while (value < minValue || value >= maxValue) + { + if (value < minValue) + { + value += maxValue - minValue; + } + else if (value >= maxValue) + { + value -= maxValue - minValue; + } + } + return value; + } +} diff --git a/Assets/Scripts/gameController1.cs.meta b/Assets/Scripts/gameController1.cs.meta new file mode 100644 index 0000000..e2b23a4 --- /dev/null +++ b/Assets/Scripts/gameController1.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 00a8679451d95a34bb31f80049ae6415 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: