From a1e8d6ae96eed6fafd8ad98f7e2bb505f6a094c0 Mon Sep 17 00:00:00 2001 From: Gregory Labute Date: Fri, 17 Jan 2025 16:35:06 -0500 Subject: [PATCH] Restore the legacy inputs in the prefabs and scenes --- .../Samples~/3D Samples/Lock-on Target.unity | 54 +++-- .../Samples~/3D Samples/SplitScreenCar.unity | 59 ++--- .../3D Samples/ThirdPersonWithAimMode.unity | 204 +---------------- .../3D Samples/ThirdPersonWithRoadieRun.unity | 206 +----------------- .../Split Screen Multiplayer.unity | 128 ++++------- .../Shared Assets/Prefabs/CapsuleCar.prefab | 58 ++--- .../Shared Assets/Prefabs/Player 2D.prefab | 15 +- .../Shared Assets/Prefabs/Player.prefab | 8 +- 8 files changed, 161 insertions(+), 571 deletions(-) diff --git a/com.unity.cinemachine/Samples~/3D Samples/Lock-on Target.unity b/com.unity.cinemachine/Samples~/3D Samples/Lock-on Target.unity index e18e121d0..3782e02f1 100644 --- a/com.unity.cinemachine/Samples~/3D Samples/Lock-on Target.unity +++ b/com.unity.cinemachine/Samples~/3D Samples/Lock-on Target.unity @@ -38,7 +38,6 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -319,13 +318,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 737942603} + serializedVersion: 2 m_LocalRotation: {x: 0.037952796, y: 0.0000000021492599, z: -8.1629224e-11, w: 0.99927956} m_LocalPosition: {x: 0, y: 2.25, z: -29} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &838339814 GameObject: @@ -364,7 +363,7 @@ MonoBehaviour: m_Value: 0 OutputChannel: 1 StandbyUpdate: 2 - m_StreamingVersion: 20230301 + m_StreamingVersion: 20241001 m_LegacyPriority: 10 Target: TrackingTarget: {fileID: 1519050427} @@ -397,13 +396,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 838339814} + serializedVersion: 2 m_LocalRotation: {x: 0.037952796, y: 0.0000000021492599, z: -8.1629224e-11, w: 0.99927956} m_LocalPosition: {x: 0, y: 2.25, z: -29} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &838339820 MonoBehaviour: @@ -417,13 +416,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f38bda98361e1de48a4ca2bd86ea3c17, type: 3} m_Name: m_EditorClassIdentifier: - TargetOffset: {x: 0, y: 1, z: 0} - Lookahead: - Enabled: 0 - Time: 0 - Smoothing: 0 - IgnoreY: 0 - Damping: {x: 0.5, y: 0.5} Composition: ScreenPosition: {x: 0, y: 0.2} DeadZone: @@ -434,6 +426,13 @@ MonoBehaviour: Size: {x: 0.8, y: 0.8} Offset: {x: 0, y: 0} CenterOnActivate: 1 + TargetOffset: {x: 0, y: 1, z: 0} + Damping: {x: 0.5, y: 0.5} + Lookahead: + Enabled: 0 + Time: 0 + Smoothing: 0 + IgnoreY: 0 --- !u!114 &838339821 MonoBehaviour: m_ObjectHideFlags: 0 @@ -448,6 +447,7 @@ MonoBehaviour: m_EditorClassIdentifier: ScanRecursively: 1 SuppressInputWhileBlending: 1 + IgnoreTimeScale: 0 m_ControllerManager: Controllers: - Name: Look Orbit X @@ -503,6 +503,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3b5d7c088409d9a40b7b09aa707777f8, type: 3} m_Name: m_EditorClassIdentifier: + TargetOffset: {x: 0, y: 0, z: 0} TrackerSettings: BindingMode: 4 PositionDamping: {x: 1, y: 1, z: 1} @@ -622,13 +623,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1106812490} + serializedVersion: 2 m_LocalRotation: {x: 0.018435882, y: -0.000000018095653, z: 3.3366604e-10, w: 0.99983007} m_LocalPosition: {x: 0, y: 2.75, z: -29} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1106812495 MonoBehaviour: @@ -642,13 +643,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f38bda98361e1de48a4ca2bd86ea3c17, type: 3} m_Name: m_EditorClassIdentifier: - TargetOffset: {x: 0, y: 0, z: 0} - Lookahead: - Enabled: 0 - Time: 0 - Smoothing: 0 - IgnoreY: 0 - Damping: {x: 0.5, y: 0.5} Composition: ScreenPosition: {x: 0, y: 0.05} DeadZone: @@ -659,6 +653,13 @@ MonoBehaviour: Size: {x: 0.1, y: 0.2} Offset: {x: 0, y: 0} CenterOnActivate: 1 + TargetOffset: {x: 0, y: 0, z: 0} + Damping: {x: 0.5, y: 0.5} + Lookahead: + Enabled: 0 + Time: 0 + Smoothing: 0 + IgnoreY: 0 --- !u!114 &1106812496 MonoBehaviour: m_ObjectHideFlags: 0 @@ -671,13 +672,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b617507da6d07e749b7efdb34e1173e1, type: 3} m_Name: m_EditorClassIdentifier: - FollowOffset: {x: 0, y: 2, z: -4} TrackerSettings: BindingMode: 1 PositionDamping: {x: 0.5, y: 0.5, z: 0.5} AngularDampingMode: 1 RotationDamping: {x: 1, y: 1, z: 1} QuaternionDamping: 0.5 + FollowOffset: {x: 0, y: 2, z: -4} --- !u!4 &1445711055 stripped Transform: m_CorrespondingSourceObject: {fileID: 358930478696116476, guid: a93965bc906a245c49b8905bf8b48fec, type: 3} @@ -849,13 +850,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2072584704} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.4285714, z: 0} m_LocalScale: {x: 0.57142854, y: 0.57142854, z: 0.57142854} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1519050427} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2072584706 MonoBehaviour: @@ -966,3 +967,14 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a93965bc906a245c49b8905bf8b48fec, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 2064093838} + - {fileID: 443530339} + - {fileID: 737942607} + - {fileID: 1519050426} + - {fileID: 3813926105656355491} + - {fileID: 838339818} + - {fileID: 1106812492} diff --git a/com.unity.cinemachine/Samples~/3D Samples/SplitScreenCar.unity b/com.unity.cinemachine/Samples~/3D Samples/SplitScreenCar.unity index 1d2bf9be4..04aa7924d 100644 --- a/com.unity.cinemachine/Samples~/3D Samples/SplitScreenCar.unity +++ b/com.unity.cinemachine/Samples~/3D Samples/SplitScreenCar.unity @@ -38,7 +38,6 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -270,13 +269,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f38bda98361e1de48a4ca2bd86ea3c17, type: 3} m_Name: m_EditorClassIdentifier: - TargetOffset: {x: 0, y: 0, z: 0} - Lookahead: - Enabled: 1 - Time: 0.6 - Smoothing: 5 - IgnoreY: 0 - Damping: {x: 0.5, y: 0.5} Composition: ScreenPosition: {x: 0, y: 0.1} DeadZone: @@ -287,6 +279,13 @@ MonoBehaviour: Size: {x: 0.38, y: 0.47} Offset: {x: 0, y: -0.68} CenterOnActivate: 1 + TargetOffset: {x: 0, y: 0, z: 0} + Damping: {x: 0.5, y: 0.5} + Lookahead: + Enabled: 1 + Time: 0.6 + Smoothing: 5 + IgnoreY: 0 --- !u!114 &491555737 MonoBehaviour: m_ObjectHideFlags: 0 @@ -299,13 +298,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b617507da6d07e749b7efdb34e1173e1, type: 3} m_Name: m_EditorClassIdentifier: - FollowOffset: {x: 0, y: 2.06, z: -6.71} TrackerSettings: BindingMode: 5 PositionDamping: {x: 1, y: 1, z: 1} AngularDampingMode: 0 RotationDamping: {x: 1, y: 1, z: 1} QuaternionDamping: 1 + FollowOffset: {x: 0, y: 2.06, z: -6.71} --- !u!114 &491555738 MonoBehaviour: m_ObjectHideFlags: 0 @@ -323,7 +322,7 @@ MonoBehaviour: m_Value: 0 OutputChannel: 4 StandbyUpdate: 2 - m_StreamingVersion: 20230301 + m_StreamingVersion: 20241001 m_LegacyPriority: 10 Target: TrackingTarget: {fileID: 598891875} @@ -498,7 +497,7 @@ PrefabInstance: objectReference: {fileID: -5630151704836100654, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} - target: {fileID: 878341184440332471, guid: 1ae780fa68e1a2d4fbf8ccd042067f66, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[0].Input.LegacyInput - value: + value: Mouse X objectReference: {fileID: 0} - target: {fileID: 878341184440332471, guid: 1ae780fa68e1a2d4fbf8ccd042067f66, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[1].Input.InputAction @@ -506,7 +505,7 @@ PrefabInstance: objectReference: {fileID: 1120369429361536294, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} - target: {fileID: 878341184440332471, guid: 1ae780fa68e1a2d4fbf8ccd042067f66, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[1].Input.LegacyInput - value: + value: Fire1 objectReference: {fileID: 0} - target: {fileID: 878341184440332471, guid: 1ae780fa68e1a2d4fbf8ccd042067f66, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[2].Input.InputAction @@ -514,7 +513,7 @@ PrefabInstance: objectReference: {fileID: -1608118824973676762, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} - target: {fileID: 878341184440332471, guid: 1ae780fa68e1a2d4fbf8ccd042067f66, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[2].Input.LegacyInput - value: + value: Fire2 objectReference: {fileID: 0} - target: {fileID: 1570214454041857243, guid: 1ae780fa68e1a2d4fbf8ccd042067f66, type: 3} propertyPath: m_Materials.Array.data[0] @@ -831,13 +830,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f38bda98361e1de48a4ca2bd86ea3c17, type: 3} m_Name: m_EditorClassIdentifier: - TargetOffset: {x: 0, y: 0, z: 0} - Lookahead: - Enabled: 1 - Time: 0.6 - Smoothing: 5 - IgnoreY: 0 - Damping: {x: 0.5, y: 0.5} Composition: ScreenPosition: {x: 0, y: 0.1} DeadZone: @@ -848,6 +840,13 @@ MonoBehaviour: Size: {x: 0.38, y: 0.47} Offset: {x: 0, y: -0.68} CenterOnActivate: 1 + TargetOffset: {x: 0, y: 0, z: 0} + Damping: {x: 0.5, y: 0.5} + Lookahead: + Enabled: 1 + Time: 0.6 + Smoothing: 5 + IgnoreY: 0 --- !u!114 &1967210316 MonoBehaviour: m_ObjectHideFlags: 0 @@ -860,13 +859,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b617507da6d07e749b7efdb34e1173e1, type: 3} m_Name: m_EditorClassIdentifier: - FollowOffset: {x: 0, y: 2.06, z: -6.71} TrackerSettings: BindingMode: 5 PositionDamping: {x: 1, y: 1, z: 1} AngularDampingMode: 0 RotationDamping: {x: 1, y: 1, z: 1} QuaternionDamping: 1 + FollowOffset: {x: 0, y: 2.06, z: -6.71} --- !u!114 &1967210317 MonoBehaviour: m_ObjectHideFlags: 0 @@ -884,7 +883,7 @@ MonoBehaviour: m_Value: 0 OutputChannel: 2 StandbyUpdate: 2 - m_StreamingVersion: 20230301 + m_StreamingVersion: 20241001 m_LegacyPriority: 10 Target: TrackingTarget: {fileID: 1868264081772963616} @@ -981,22 +980,6 @@ PrefabInstance: propertyPath: m_Name value: RedCar objectReference: {fileID: 0} - - target: {fileID: 878341184440332471, guid: 1ae780fa68e1a2d4fbf8ccd042067f66, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[0].Input.LegacyInput - value: - objectReference: {fileID: 0} - - target: {fileID: 878341184440332471, guid: 1ae780fa68e1a2d4fbf8ccd042067f66, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[1].Input.LegacyInput - value: - objectReference: {fileID: 0} - - target: {fileID: 878341184440332471, guid: 1ae780fa68e1a2d4fbf8ccd042067f66, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[2].Input.InputAction - value: - objectReference: {fileID: 6539296782897260151, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} - - target: {fileID: 878341184440332471, guid: 1ae780fa68e1a2d4fbf8ccd042067f66, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[2].Input.LegacyInput - value: - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/com.unity.cinemachine/Samples~/3D Samples/ThirdPersonWithAimMode.unity b/com.unity.cinemachine/Samples~/3D Samples/ThirdPersonWithAimMode.unity index 29d5630c9..f7c02bdf3 100644 --- a/com.unity.cinemachine/Samples~/3D Samples/ThirdPersonWithAimMode.unity +++ b/com.unity.cinemachine/Samples~/3D Samples/ThirdPersonWithAimMode.unity @@ -381,7 +381,7 @@ MonoBehaviour: m_Value: 0 OutputChannel: 1 StandbyUpdate: 2 - m_StreamingVersion: 20230301 + m_StreamingVersion: 20241001 m_LegacyPriority: 10 Target: TrackingTarget: {fileID: 1525634691} @@ -1381,7 +1381,7 @@ MonoBehaviour: m_Value: 0 OutputChannel: 1 StandbyUpdate: 2 - m_StreamingVersion: 20230301 + m_StreamingVersion: 20241001 m_LegacyPriority: 10 Target: TrackingTarget: {fileID: 1525634691} @@ -2358,134 +2358,10 @@ PrefabInstance: propertyPath: Controllers.Array.data[6].Recentering.Enabled value: 1 objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.size - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[4].Name - value: Horizontal Look - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[5].Name - value: Vertical Look - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[6].Name - value: Fire - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[4].Owner - value: - objectReference: {fileID: 1525634693} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[5].Owner - value: - objectReference: {fileID: 1525634693} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[6].Owner - value: - objectReference: {fileID: 1525634694} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[4].Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[5].Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[6].Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[4].Input.Gain - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[5].Input.Gain - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[6].Input.Gain - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[4].Driver.AccelTime - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[4].Driver.DecelTime - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[4].Input.LegacyGain - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[5].Driver.AccelTime - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[5].Driver.DecelTime - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[5].Input.LegacyGain - value: -100 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[6].Input.LegacyGain - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.size value: 7 objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[4].Input.InputAction - value: - objectReference: {fileID: -5630151704836100654, guid: cb572737576f6df4182085d6bbea2294, type: 3} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[4].Input.LegacyInput - value: Mouse X - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[5].Input.InputAction - value: - objectReference: {fileID: -5630151704836100654, guid: cb572737576f6df4182085d6bbea2294, type: 3} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[5].Input.LegacyInput - value: Mouse Y - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[6].Input.InputAction - value: - objectReference: {fileID: 1120369429361536294, guid: cb572737576f6df4182085d6bbea2294, type: 3} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[6].Input.LegacyInput - value: Fire1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[0].Name - value: Move X - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[1].Name - value: Move Z - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[2].Name - value: Jump - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[3].Name - value: Sprint - objectReference: {fileID: 0} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[4].Name value: Horizontal Look @@ -2510,22 +2386,6 @@ PrefabInstance: propertyPath: m_ControllerManager.Controllers.Array.data[6].Owner value: objectReference: {fileID: 1525634694} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[0].Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[1].Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[2].Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[3].Enabled - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[4].Enabled value: 1 @@ -2538,22 +2398,6 @@ PrefabInstance: propertyPath: m_ControllerManager.Controllers.Array.data[6].Enabled value: 1 objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[0].Input.Gain - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[1].Input.Gain - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[2].Input.Gain - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[3].Input.Gain - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[4].Input.Gain value: 1 @@ -2566,22 +2410,6 @@ PrefabInstance: propertyPath: m_ControllerManager.Controllers.Array.data[6].Input.Gain value: 1 objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[0].Input.LegacyGain - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[1].Input.LegacyGain - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[2].Input.LegacyGain - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[3].Input.LegacyGain - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[4].Driver.AccelTime value: 0.2 @@ -2610,29 +2438,13 @@ PrefabInstance: propertyPath: m_ControllerManager.Controllers.Array.data[6].Input.LegacyGain value: 1 objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[0].Input.LegacyInput - value: - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[1].Input.LegacyInput - value: - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[2].Input.LegacyInput - value: - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[3].Input.LegacyInput - value: - objectReference: {fileID: 0} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[4].Input.InputAction value: objectReference: {fileID: -5630151704836100654, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[4].Input.LegacyInput - value: + value: Mouse X objectReference: {fileID: 0} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[5].Input.InputAction @@ -2640,7 +2452,7 @@ PrefabInstance: objectReference: {fileID: -5630151704836100654, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[5].Input.LegacyInput - value: + value: Mouse Y objectReference: {fileID: 0} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[6].Input.InputAction @@ -2648,7 +2460,7 @@ PrefabInstance: objectReference: {fileID: 1120369429361536294, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[6].Input.LegacyInput - value: + value: Jump objectReference: {fileID: 0} - target: {fileID: 8077383552022060413, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: Strafe @@ -2909,7 +2721,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 1802572047} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 89875cdc57c54474a8a74efd9b2a3b5d, type: 3} m_Name: @@ -3010,7 +2822,7 @@ MonoBehaviour: m_Value: 10 OutputChannel: 1 StandbyUpdate: 2 - m_StreamingVersion: 20230301 + m_StreamingVersion: 20241001 m_LegacyPriority: 0 DefaultTarget: Enabled: 0 @@ -3078,7 +2890,7 @@ MonoBehaviour: Input: InputAction: {fileID: -1608118824973676762, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} Gain: 1 - LegacyInput: + LegacyInput: Fire3 LegacyGain: 1 CancelDeltaTime: 0 InputValue: 0 diff --git a/com.unity.cinemachine/Samples~/3D Samples/ThirdPersonWithRoadieRun.unity b/com.unity.cinemachine/Samples~/3D Samples/ThirdPersonWithRoadieRun.unity index 3cbeea8a8..e5a5b8b46 100644 --- a/com.unity.cinemachine/Samples~/3D Samples/ThirdPersonWithRoadieRun.unity +++ b/com.unity.cinemachine/Samples~/3D Samples/ThirdPersonWithRoadieRun.unity @@ -363,7 +363,7 @@ MonoBehaviour: PivotOffset: {x: 0, y: 0, z: 1} AmplitudeGain: 0.5 FrequencyGain: 0.5 - mNoiseOffsets: {x: -765.3436, y: 412.4553, z: 513.0689} + m_NoiseOffsets: {x: -765.3436, y: 412.4553, z: 513.0689} --- !u!114 &334051334 MonoBehaviour: m_ObjectHideFlags: 0 @@ -381,7 +381,7 @@ MonoBehaviour: m_Value: 0 OutputChannel: 1 StandbyUpdate: 2 - m_StreamingVersion: 20230301 + m_StreamingVersion: 20241001 m_LegacyPriority: 10 Target: TrackingTarget: {fileID: 1525634691} @@ -2256,134 +2256,10 @@ PrefabInstance: propertyPath: Controllers.Array.data[6].Recentering.Enabled value: 1 objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.size - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[4].Name - value: Horizontal Look - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[5].Name - value: Vertical Look - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[6].Name - value: Fire - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[4].Owner - value: - objectReference: {fileID: 1525634693} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[5].Owner - value: - objectReference: {fileID: 1525634693} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[6].Owner - value: - objectReference: {fileID: 1525634694} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[4].Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[5].Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[6].Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[4].Input.Gain - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[5].Input.Gain - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[6].Input.Gain - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[4].Driver.AccelTime - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[4].Driver.DecelTime - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[4].Input.LegacyGain - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[5].Driver.AccelTime - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[5].Driver.DecelTime - value: 0.2 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[5].Input.LegacyGain - value: -100 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[6].Input.LegacyGain - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.size value: 7 objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[4].Input.InputAction - value: - objectReference: {fileID: -5630151704836100654, guid: cb572737576f6df4182085d6bbea2294, type: 3} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[4].Input.LegacyInput - value: Mouse X - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[5].Input.InputAction - value: - objectReference: {fileID: -5630151704836100654, guid: cb572737576f6df4182085d6bbea2294, type: 3} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[5].Input.LegacyInput - value: Mouse Y - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[6].Input.InputAction - value: - objectReference: {fileID: 1120369429361536294, guid: cb572737576f6df4182085d6bbea2294, type: 3} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: Controllers.Array.data[6].Input.LegacyInput - value: Fire1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[0].Name - value: Move X - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[1].Name - value: Move Z - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[2].Name - value: Jump - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[3].Name - value: Sprint - objectReference: {fileID: 0} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[4].Name value: Horizontal Look @@ -2408,22 +2284,6 @@ PrefabInstance: propertyPath: m_ControllerManager.Controllers.Array.data[6].Owner value: objectReference: {fileID: 1525634694} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[0].Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[1].Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[2].Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[3].Enabled - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[4].Enabled value: 1 @@ -2436,22 +2296,6 @@ PrefabInstance: propertyPath: m_ControllerManager.Controllers.Array.data[6].Enabled value: 1 objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[0].Input.Gain - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[1].Input.Gain - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[2].Input.Gain - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[3].Input.Gain - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[4].Input.Gain value: 1 @@ -2464,22 +2308,6 @@ PrefabInstance: propertyPath: m_ControllerManager.Controllers.Array.data[6].Input.Gain value: 1 objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[0].Input.LegacyGain - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[1].Input.LegacyGain - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[2].Input.LegacyGain - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[3].Input.LegacyGain - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[4].Driver.AccelTime value: 0.2 @@ -2508,29 +2336,13 @@ PrefabInstance: propertyPath: m_ControllerManager.Controllers.Array.data[6].Input.LegacyGain value: 1 objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[0].Input.LegacyInput - value: - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[1].Input.LegacyInput - value: - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[2].Input.LegacyInput - value: - objectReference: {fileID: 0} - - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} - propertyPath: m_ControllerManager.Controllers.Array.data[3].Input.LegacyInput - value: - objectReference: {fileID: 0} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[4].Input.InputAction value: objectReference: {fileID: -5630151704836100654, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[4].Input.LegacyInput - value: + value: Mouse X objectReference: {fileID: 0} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[5].Input.InputAction @@ -2538,7 +2350,7 @@ PrefabInstance: objectReference: {fileID: -5630151704836100654, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[5].Input.LegacyInput - value: + value: Mouse Y objectReference: {fileID: 0} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[6].Input.InputAction @@ -2546,7 +2358,7 @@ PrefabInstance: objectReference: {fileID: 1120369429361536294, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} - target: {fileID: 7804758404662293724, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_ControllerManager.Controllers.Array.data[6].Input.LegacyInput - value: + value: Jump objectReference: {fileID: 0} - target: {fileID: 8077383552022060413, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: Strafe @@ -2812,7 +2624,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 1802572047} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 89875cdc57c54474a8a74efd9b2a3b5d, type: 3} m_Name: @@ -3071,7 +2883,7 @@ MonoBehaviour: m_Value: 0 OutputChannel: 1 StandbyUpdate: 2 - m_StreamingVersion: 20230301 + m_StreamingVersion: 20241001 m_LegacyPriority: 10 Target: TrackingTarget: {fileID: 1525634691} @@ -3128,7 +2940,7 @@ MonoBehaviour: PivotOffset: {x: 0, y: 0, z: 2} AmplitudeGain: 0.5 FrequencyGain: 3 - mNoiseOffsets: {x: -736.27356, y: -0.11553955, z: 165.45901} + m_NoiseOffsets: {x: -736.27356, y: -0.11553955, z: 165.45901} --- !u!114 &2076565716644322346 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3190,7 +3002,7 @@ MonoBehaviour: m_Value: 0 OutputChannel: 1 StandbyUpdate: 2 - m_StreamingVersion: 20230301 + m_StreamingVersion: 20241001 m_LegacyPriority: 10 DefaultTarget: Enabled: 0 diff --git a/com.unity.cinemachine/Samples~/Input System Samples/Split Screen Multiplayer/Split Screen Multiplayer.unity b/com.unity.cinemachine/Samples~/Input System Samples/Split Screen Multiplayer/Split Screen Multiplayer.unity index 34d388885..67b72a0f5 100644 --- a/com.unity.cinemachine/Samples~/Input System Samples/Split Screen Multiplayer/Split Screen Multiplayer.unity +++ b/com.unity.cinemachine/Samples~/Input System Samples/Split Screen Multiplayer/Split Screen Multiplayer.unity @@ -38,7 +38,6 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481676, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -633,63 +632,51 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 2451271811042757136, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: HelpText value: "This is a sample split-screen game with Cinemachine and the Input package. Press the left mouse button or the right trigger on a controller to add a @@ -697,58 +684,47 @@ PrefabInstance: Cinemachine Brain and a Cinemachine Camera.\n- How to create a custom Input handler that works with the Player Input Component.\n" objectReference: {fileID: 0} - - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: HelpTitle value: objectReference: {fileID: 0} - - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: VisibleAtStart value: 0 objectReference: {fileID: 0} - - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: OnHelpDismissed.m_PersistentCalls.m_Calls.Array.size value: 1 objectReference: {fileID: 0} - - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: OnHelpDismissed.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 6 objectReference: {fileID: 0} - - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: OnHelpDismissed.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 1823073127} - - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: OnHelpDismissed.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 objectReference: {fileID: 0} - - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: OnHelpDismissed.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: SetActive objectReference: {fileID: 0} - - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: OnHelpDismissed.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: UnityEngine.GameObject, UnityEngine objectReference: {fileID: 0} - - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: OnHelpDismissed.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument value: 1 objectReference: {fileID: 0} - - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 6668015293666917239, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: OnHelpDismissed.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - - target: {fileID: 9138370430051789472, guid: d7425ed2047e64d8ea6ff79f20bd46f6, - type: 3} + - target: {fileID: 9138370430051789472, guid: d7425ed2047e64d8ea6ff79f20bd46f6, type: 3} propertyPath: m_Name value: HelpUI objectReference: {fileID: 0} @@ -765,63 +741,51 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, - type: 3} + - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, - type: 3} + - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, - type: 3} + - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, - type: 3} + - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, - type: 3} + - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, - type: 3} + - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, - type: 3} + - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, - type: 3} + - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, - type: 3} + - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, - type: 3} + - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, - type: 3} + - target: {fileID: 4436525663902916665, guid: c97e1248c10cd3549b3d18c1eb1c3722, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4436525663902916670, guid: c97e1248c10cd3549b3d18c1eb1c3722, - type: 3} + - target: {fileID: 4436525663902916670, guid: c97e1248c10cd3549b3d18c1eb1c3722, type: 3} propertyPath: m_Name value: Checkerboard Stage objectReference: {fileID: 0} @@ -944,10 +908,8 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 1120369429361536294, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_PlayerPrefab: {fileID: 8899812594330443548, guid: 33f863ca3153d440d84eccc416174573, - type: 3} + m_Reference: {fileID: 1120369429361536294, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_PlayerPrefab: {fileID: 8899812594330443548, guid: 33f863ca3153d440d84eccc416174573, type: 3} m_SplitScreen: 1 m_MaintainAspectRatioInSplitScreen: 0 m_FixedNumberOfSplitScreens: -1 @@ -1018,13 +980,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f38bda98361e1de48a4ca2bd86ea3c17, type: 3} m_Name: m_EditorClassIdentifier: - TargetOffset: {x: 0, y: 0, z: 0} - Lookahead: - Enabled: 0 - Time: 0 - Smoothing: 0 - IgnoreY: 0 - Damping: {x: 0.5, y: 0.5} Composition: ScreenPosition: {x: 0, y: 0} DeadZone: @@ -1035,6 +990,13 @@ MonoBehaviour: Size: {x: 0.8, y: 0.8} Offset: {x: 0, y: 0} CenterOnActivate: 1 + TargetOffset: {x: 0, y: 0, z: 0} + Damping: {x: 0.5, y: 0.5} + Lookahead: + Enabled: 0 + Time: 0 + Smoothing: 0 + IgnoreY: 0 --- !u!114 &1846637272 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1115,7 +1077,7 @@ MonoBehaviour: m_Value: 0 OutputChannel: 1 StandbyUpdate: 2 - m_StreamingVersion: 20230301 + m_StreamingVersion: 20241001 m_LegacyPriority: 10 Target: TrackingTarget: {fileID: 822025656} diff --git a/com.unity.cinemachine/Samples~/Shared Assets/Prefabs/CapsuleCar.prefab b/com.unity.cinemachine/Samples~/Shared Assets/Prefabs/CapsuleCar.prefab index 3c8ac5c5c..3c605cdcf 100644 --- a/com.unity.cinemachine/Samples~/Shared Assets/Prefabs/CapsuleCar.prefab +++ b/com.unity.cinemachine/Samples~/Shared Assets/Prefabs/CapsuleCar.prefab @@ -27,6 +27,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 878341184440332465} + serializedVersion: 2 m_LocalRotation: {x: 0.70710665, y: -0, z: -0, w: 0.70710695} m_LocalPosition: {x: 0, y: 5.6860776, z: 8.847401} m_LocalScale: {x: 1, y: 1, z: 1} @@ -35,7 +36,6 @@ Transform: - {fileID: 4228984098192203911} - {fileID: 4228984098714010495} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &878341184440332479 Rigidbody: @@ -152,6 +152,7 @@ MonoBehaviour: m_EditorClassIdentifier: ScanRecursively: 1 SuppressInputWhileBlending: 1 + IgnoreTimeScale: 0 m_ControllerManager: Controllers: - Name: Move X @@ -160,8 +161,9 @@ MonoBehaviour: Input: InputAction: {fileID: -1680190386980627800, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} Gain: 1 - LegacyInput: + LegacyInput: Horizontal LegacyGain: 1 + CancelDeltaTime: 0 InputValue: 0 Driver: AccelTime: 0 @@ -172,8 +174,9 @@ MonoBehaviour: Input: InputAction: {fileID: -1680190386980627800, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} Gain: 1 - LegacyInput: + LegacyInput: Vertical LegacyGain: 1 + CancelDeltaTime: 0 InputValue: 0 Driver: AccelTime: 0 @@ -184,8 +187,9 @@ MonoBehaviour: Input: InputAction: {fileID: 6539296782897260151, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} Gain: 1 - LegacyInput: + LegacyInput: Jump LegacyGain: 1 + CancelDeltaTime: 0 InputValue: 0 Driver: AccelTime: 0 @@ -217,13 +221,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570214454009041785} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6999999, y: 0.12, z: 0.7} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1570214455040328353} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!33 &1570214454009041789 MeshFilter: @@ -301,6 +305,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570214454041857254} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.541, z: 0} m_LocalScale: {x: 1.13, y: 0.38, z: 4.31} @@ -310,7 +315,6 @@ Transform: - {fileID: 1570214456112472636} - {fileID: 1570214454075276569} m_Father: {fileID: 4228984098192203911} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1570214454041857242 MeshFilter: @@ -408,6 +412,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570214454075276570} + 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} @@ -416,7 +421,6 @@ Transform: - {fileID: 1570214455695823972} - {fileID: 1570214455538126729} m_Father: {fileID: 1570214454041857253} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1570214454350906683 GameObject: @@ -443,13 +447,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570214454350906683} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: -0.333, y: 0.13, z: 0.349} m_LocalScale: {x: 0.15, y: 0.07, z: 0.3} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1570214456112472636} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &1570214454350906687 MeshFilter: @@ -526,13 +530,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570214454366507734} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6999999, y: 0.12, z: 0.7} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1570214455892296982} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!33 &1570214454366507722 MeshFilter: @@ -609,13 +613,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570214454552382287} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6999999, y: 0.12, z: 0.7} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1570214454989131252} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!33 &1570214454552382275 MeshFilter: @@ -690,6 +694,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570214454989131253} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.8, y: 0.354, z: -1.3079993} m_LocalScale: {x: 1, y: 1, z: 1} @@ -697,7 +702,6 @@ Transform: m_Children: - {fileID: 1570214454552382286} m_Father: {fileID: 1570214455038153099} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1570214455038153108 GameObject: @@ -722,6 +726,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570214455038153108} + 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} @@ -732,7 +737,6 @@ Transform: - {fileID: 1570214454989131252} - {fileID: 1570214455892296982} m_Father: {fileID: 4228984098192203911} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1570214455040328354 GameObject: @@ -757,6 +761,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570214455040328354} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.8, y: 0.354, z: 1.4329996} m_LocalScale: {x: 1, y: 1, z: 1} @@ -764,7 +769,6 @@ Transform: m_Children: - {fileID: 1570214454009041784} m_Father: {fileID: 1570214455038153099} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1570214455047707640 GameObject: @@ -791,13 +795,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570214455047707640} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.64, z: -0.09} m_LocalScale: {x: 0.85, y: 1.15, z: 0.39} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1570214454041857253} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1570214455047707644 MeshFilter: @@ -874,13 +878,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570214455281306079} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6999999, y: 0.12, z: 0.7} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1570214455642285364} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!33 &1570214455281306067 MeshFilter: @@ -957,13 +961,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570214455538126730} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.38, z: -0.336} m_LocalScale: {x: 0.69, y: 0.12, z: 0.36} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1570214454075276569} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1570214455538126734 MeshFilter: @@ -1038,6 +1042,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570214455642285365} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.8, y: 0.354, z: 1.433} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1045,7 +1050,6 @@ Transform: m_Children: - {fileID: 1570214455281306078} m_Father: {fileID: 1570214455038153099} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1570214455695823973 GameObject: @@ -1072,13 +1076,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570214455695823973} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.35, z: 0.371} m_LocalScale: {x: 0.66, y: 0.12, z: 0.29} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1570214454075276569} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1570214455695823961 MeshFilter: @@ -1153,6 +1157,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570214455892296983} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.8, y: 0.354, z: -1.308} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1160,7 +1165,6 @@ Transform: m_Children: - {fileID: 1570214454366507733} m_Father: {fileID: 1570214455038153099} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1570214455897285751 GameObject: @@ -1187,13 +1191,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570214455897285751} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.333, y: 0.13, z: 0.349} m_LocalScale: {x: 0.15, y: 0.07, z: 0.3} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1570214456112472636} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &1570214455897285739 MeshFilter: @@ -1268,6 +1272,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570214456112472637} + 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} @@ -1276,7 +1281,6 @@ Transform: - {fileID: 1570214454350906682} - {fileID: 1570214455897285750} m_Father: {fileID: 1570214454041857253} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4228984097906734900 GameObject: @@ -1302,13 +1306,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4228984097906734900} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.8, y: 0.497, z: 1.433} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4228984098714010495} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!146 &4228984097906734898 WheelCollider: @@ -1372,6 +1376,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4228984098192204024} + 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} @@ -1380,7 +1385,6 @@ Transform: - {fileID: 1570214454041857253} - {fileID: 1570214455038153099} m_Father: {fileID: 875930279785709979} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4228984098714010480 GameObject: @@ -1405,6 +1409,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4228984098714010480} + 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} @@ -1415,7 +1420,6 @@ Transform: - {fileID: 4228984098961037803} - {fileID: 4228984099593723053} m_Father: {fileID: 875930279785709979} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4228984098961037804 GameObject: @@ -1441,13 +1445,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4228984098961037804} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.8, y: 0.497, z: -1.298} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4228984098714010495} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!146 &4228984098961037802 WheelCollider: @@ -1512,13 +1516,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4228984099382061925} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.8, y: 0.497, z: 1.433} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4228984098714010495} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!146 &4228984099382061923 WheelCollider: @@ -1583,13 +1587,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4228984099593723054} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.8, y: 0.497, z: -1.298} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4228984098714010495} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!146 &4228984099593723052 WheelCollider: diff --git a/com.unity.cinemachine/Samples~/Shared Assets/Prefabs/Player 2D.prefab b/com.unity.cinemachine/Samples~/Shared Assets/Prefabs/Player 2D.prefab index 914927171..b441292a8 100644 --- a/com.unity.cinemachine/Samples~/Shared Assets/Prefabs/Player 2D.prefab +++ b/com.unity.cinemachine/Samples~/Shared Assets/Prefabs/Player 2D.prefab @@ -29,6 +29,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7058214899331077284} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -5.96, y: 4.412, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -36,7 +37,6 @@ Transform: m_Children: - {fileID: 2474673035909645045} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!50 &3690201544760606824 Rigidbody2D: @@ -140,6 +140,7 @@ MonoBehaviour: m_EditorClassIdentifier: ScanRecursively: 1 SuppressInputWhileBlending: 1 + IgnoreTimeScale: 0 m_ControllerManager: Controllers: - Name: Move X @@ -148,8 +149,9 @@ MonoBehaviour: Input: InputAction: {fileID: -1680190386980627800, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} Gain: 1 - LegacyInput: + LegacyInput: Horizontal LegacyGain: 1 + CancelDeltaTime: 0 InputValue: 0 Driver: AccelTime: 0 @@ -160,8 +162,9 @@ MonoBehaviour: Input: InputAction: {fileID: -1680190386980627800, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} Gain: 1 - LegacyInput: + LegacyInput: Vertical LegacyGain: 1 + CancelDeltaTime: 0 InputValue: 0 Driver: AccelTime: 0 @@ -172,8 +175,9 @@ MonoBehaviour: Input: InputAction: {fileID: 6539296782897260151, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} Gain: 1 - LegacyInput: + LegacyInput: Jump LegacyGain: 1 + CancelDeltaTime: 0 InputValue: 0 Driver: AccelTime: 0 @@ -184,8 +188,9 @@ MonoBehaviour: Input: InputAction: {fileID: -3285510275856705445, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} Gain: 1 - LegacyInput: + LegacyInput: Fire3 LegacyGain: 1 + CancelDeltaTime: 0 InputValue: 0 Driver: AccelTime: 0 diff --git a/com.unity.cinemachine/Samples~/Shared Assets/Prefabs/Player.prefab b/com.unity.cinemachine/Samples~/Shared Assets/Prefabs/Player.prefab index 9f1df77cc..518e378db 100644 --- a/com.unity.cinemachine/Samples~/Shared Assets/Prefabs/Player.prefab +++ b/com.unity.cinemachine/Samples~/Shared Assets/Prefabs/Player.prefab @@ -196,7 +196,7 @@ MonoBehaviour: Input: InputAction: {fileID: -1680190386980627800, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} Gain: 1 - LegacyInput: + LegacyInput: Horizontal LegacyGain: 1 CancelDeltaTime: 0 InputValue: 0 @@ -209,7 +209,7 @@ MonoBehaviour: Input: InputAction: {fileID: -1680190386980627800, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} Gain: 1 - LegacyInput: + LegacyInput: Vertical LegacyGain: 1 CancelDeltaTime: 0 InputValue: 0 @@ -222,7 +222,7 @@ MonoBehaviour: Input: InputAction: {fileID: 6539296782897260151, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} Gain: 1 - LegacyInput: + LegacyInput: Jump LegacyGain: 1 CancelDeltaTime: 0 InputValue: 0 @@ -235,7 +235,7 @@ MonoBehaviour: Input: InputAction: {fileID: -3285510275856705445, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} Gain: 1 - LegacyInput: + LegacyInput: Fire2 LegacyGain: 1 CancelDeltaTime: 0 InputValue: 0