From f9c6207a9d6e5da25a6b6b24a8cba64d531071e9 Mon Sep 17 00:00:00 2001 From: Greg Labute Date: Tue, 18 Jul 2023 16:27:45 -0400 Subject: [PATCH] multiplayer sample missing input action assets --- .../PlayerWithCameraRig.prefab | 92 ++++------- .../Split Screen Multiplayer.unity | 152 ++++++++---------- 2 files changed, 96 insertions(+), 148 deletions(-) diff --git a/com.unity.cinemachine/Samples~/Input System Samples/Split Screen Multiplayer/PlayerWithCameraRig.prefab b/com.unity.cinemachine/Samples~/Input System Samples/Split Screen Multiplayer/PlayerWithCameraRig.prefab index 1977e4565..1fbd5b953 100644 --- a/com.unity.cinemachine/Samples~/Input System Samples/Split Screen Multiplayer/PlayerWithCameraRig.prefab +++ b/com.unity.cinemachine/Samples~/Input System Samples/Split Screen Multiplayer/PlayerWithCameraRig.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1021246722323271792} + serializedVersion: 2 m_LocalRotation: {x: 0.20474699, y: -1e-45, z: -0, w: 0.97881496} m_LocalPosition: {x: 0, y: 2.25, z: -4} m_LocalScale: {x: 1.7499995, y: 1.75, z: 1.7499998} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8899812594330443549} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &7614250291158188761 Camera: @@ -144,13 +144,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6240644171936335887} - m_LocalRotation: {x: 0.20474699, y: -1e-45, z: -0, w: 0.97881496} + serializedVersion: 2 + m_LocalRotation: {x: 0.20474693, y: -1e-45, z: -0, w: 0.97881496} m_LocalPosition: {x: 0, y: 2.25, z: -4} m_LocalScale: {x: 1.7499995, y: 1.75, z: 1.7499998} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8899812594330443549} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7387135027659488260 MonoBehaviour: @@ -167,9 +167,7 @@ MonoBehaviour: Priority: Enabled: 0 m_Value: 0 - OutputChannel: - Enabled: 1 - m_Value: 2 + OutputChannel: 1 StandbyUpdate: 2 m_StreamingVersion: 20230301 m_LegacyPriority: 10 @@ -228,6 +226,7 @@ MonoBehaviour: Radius: 2.5 Height: 0.1 SplineCurvature: 0.5 + RecenteringTarget: 2 HorizontalAxis: Value: 0 Center: 0 @@ -323,8 +322,7 @@ MonoBehaviour: Owner: {fileID: 536667594111509029} Enabled: 1 Input: - Input: {fileID: -5630151704836100654, guid: ba1679fafe8a545948be71b9557ead1a, - type: 3} + Input: {fileID: -5630151704836100654, guid: ba1679fafe8a545948be71b9557ead1a, type: 3} InputValue: 0 Driver: AccelTime: 0 @@ -333,8 +331,7 @@ MonoBehaviour: Owner: {fileID: 536667594111509029} Enabled: 1 Input: - Input: {fileID: -5630151704836100654, guid: ba1679fafe8a545948be71b9557ead1a, - type: 3} + Input: {fileID: -5630151704836100654, guid: ba1679fafe8a545948be71b9557ead1a, type: 3} InputValue: 0 Driver: AccelTime: 0 @@ -373,6 +370,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8899812594330443548} + 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} @@ -382,7 +380,6 @@ Transform: - {fileID: 337923160760063250} - {fileID: 132640765952549006} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1150526723863172992 MonoBehaviour: @@ -406,68 +403,55 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 8899812594330443549} m_Modifications: - - target: {fileID: 3521509573382385251, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, - type: 3} + - target: {fileID: 3521509573382385251, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_Name value: Player objectReference: {fileID: 0} - - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, - type: 3} + - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, - type: 3} + - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, - type: 3} + - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, - type: 3} + - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, - type: 3} + - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, - type: 3} + - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, - type: 3} + - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, - type: 3} + - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, - type: 3} + - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, - type: 3} + - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, - type: 3} + - target: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8077383552022060413, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, - type: 3} + - target: {fileID: 8077383552022060413, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} propertyPath: CameraOverride value: objectReference: {fileID: 7614250291158188761} @@ -476,19 +460,16 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3521509573382385251, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, - type: 3} + - targetCorrespondingSourceObject: {fileID: 3521509573382385251, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} insertIndex: -1 addedObject: {fileID: 8899812594144203027} - - targetCorrespondingSourceObject: {fileID: 3521509573382385251, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, - type: 3} + - targetCorrespondingSourceObject: {fileID: 3521509573382385251, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} insertIndex: -1 addedObject: {fileID: 8899812594144203026} m_SourcePrefab: {fileID: 100100000, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} --- !u!114 &836224694118566995 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8077383552022060413, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, - type: 3} + m_CorrespondingSourceObject: {fileID: 8077383552022060413, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} m_PrefabInstance: {fileID: 8899812594144203054} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5430380358557990733} @@ -499,14 +480,12 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!4 &4618237487212078583 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, - type: 3} + m_CorrespondingSourceObject: {fileID: 4293402553517372633, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} m_PrefabInstance: {fileID: 8899812594144203054} m_PrefabAsset: {fileID: 0} --- !u!1 &5430380358557990733 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 3521509573382385251, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, - type: 3} + m_CorrespondingSourceObject: {fileID: 3521509573382385251, guid: 4d8d7a9a98d3f4ac2967d48094ea010f, type: 3} m_PrefabInstance: {fileID: 8899812594144203054} m_PrefabAsset: {fileID: 0} --- !u!114 &8899812594144203027 @@ -521,7 +500,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c44cc6a630eeb47eeb696895e8db466b, type: 3} m_Name: m_EditorClassIdentifier: - ScanRecursively: 0 + ScanRecursively: 1 SuppressInputWhileBlending: 1 m_ControllerManager: Controllers: @@ -529,8 +508,7 @@ MonoBehaviour: Owner: {fileID: 836224694118566995} Enabled: 1 Input: - Input: {fileID: -1680190386980627800, guid: ba1679fafe8a545948be71b9557ead1a, - type: 3} + Input: {fileID: -1680190386980627800, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} InputValue: 0 Driver: AccelTime: 0 @@ -539,8 +517,7 @@ MonoBehaviour: Owner: {fileID: 836224694118566995} Enabled: 1 Input: - Input: {fileID: -1680190386980627800, guid: ba1679fafe8a545948be71b9557ead1a, - type: 3} + Input: {fileID: -1680190386980627800, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} InputValue: 0 Driver: AccelTime: 0 @@ -549,8 +526,7 @@ MonoBehaviour: Owner: {fileID: 836224694118566995} Enabled: 1 Input: - Input: {fileID: 6539296782897260151, guid: ba1679fafe8a545948be71b9557ead1a, - type: 3} + Input: {fileID: 6539296782897260151, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} InputValue: 0 Driver: AccelTime: 0 @@ -559,13 +535,12 @@ MonoBehaviour: Owner: {fileID: 836224694118566995} Enabled: 1 Input: - Input: {fileID: -3285510275856705445, guid: ba1679fafe8a545948be71b9557ead1a, - type: 3} + Input: {fileID: -3285510275856705445, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} InputValue: 0 Driver: AccelTime: 0 DecelTime: 0 - PlayerInput: {fileID: 8899812594144203026} + PlayerInput: {fileID: 0} --- !u!114 &8899812594144203026 MonoBehaviour: m_ObjectHideFlags: 0 @@ -578,8 +553,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} m_Name: m_EditorClassIdentifier: - m_Actions: {fileID: -944628639613478452, guid: ba1679fafe8a545948be71b9557ead1a, - type: 3} + m_Actions: {fileID: -944628639613478452, guid: 1d6e640e716dc4ff6989b73d02023f2b, type: 3} m_NotificationBehavior: 3 m_UIInputModule: {fileID: 0} m_DeviceLostEvent: 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 f0259aefa..b44998764 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,7 @@ 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_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -180,13 +180,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2314367} - m_LocalRotation: {x: 0.25339165, y: 0.008441689, z: -0.0022113097, w: 0.96732444} + serializedVersion: 2 + m_LocalRotation: {x: 0.25339165, y: 0.008441684, z: -0.0022113083, w: 0.96732444} m_LocalPosition: {x: -11.734394, y: 2.2498055, z: -5.2688923} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1101093750} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &2314370 Camera: @@ -338,13 +338,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 65334556} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2, y: 0, z: 0} m_LocalScale: {x: 1, y: 0.5, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &122939468 GameObject: @@ -445,13 +445,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 122939468} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 6, y: 0, z: 0} m_LocalScale: {x: 1, y: 0.5, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &387383892 GameObject: @@ -552,13 +552,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 387383892} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 4, y: 0, z: 0} m_LocalScale: {x: 1, y: 0.5, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &822025655 GameObject: @@ -583,13 +583,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 822025655} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -11.664585, y: -0.00019454956, z: -1.2695013} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1101093750} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1101093749 GameObject: @@ -614,6 +614,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1101093749} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 16.664585, y: 0.00019454956, z: 1.2695013} m_LocalScale: {x: 1, y: 1, z: 1} @@ -623,7 +624,6 @@ Transform: - {fileID: 1846637274} - {fileID: 822025656} m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1340089506 PrefabInstance: @@ -633,63 +633,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 +685,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 +742,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} @@ -855,13 +820,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1823073127} + 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: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1823073130 MonoBehaviour: @@ -944,10 +909,8 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 1120369429361536294, guid: ba1679fafe8a545948be71b9557ead1a, - 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 @@ -1066,6 +1029,7 @@ MonoBehaviour: Radius: 2.5 Height: 0.1 SplineCurvature: 0.5 + RecenteringTarget: 2 HorizontalAxis: Value: 1 Center: 0 @@ -1111,9 +1075,7 @@ MonoBehaviour: Priority: Enabled: 1 m_Value: 0 - OutputChannel: - Enabled: 0 - m_Value: 1 + OutputChannel: 1 StandbyUpdate: 2 m_StreamingVersion: 20230301 m_LegacyPriority: 10 @@ -1148,13 +1110,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1846637268} - m_LocalRotation: {x: 0.25339165, y: 0.008441689, z: -0.0022113097, w: 0.96732444} + serializedVersion: 2 + m_LocalRotation: {x: 0.25339165, y: 0.008441684, z: -0.0022113083, w: 0.96732444} m_LocalPosition: {x: -11.734394, y: 2.2498055, z: -5.2688923} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1101093750} - m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1846637275 MonoBehaviour: @@ -1269,11 +1231,23 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2082728274} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 8, y: 0, z: 0} m_LocalScale: {x: 1, y: 0.5, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1340089506} + - {fileID: 1641029698} + - {fileID: 1101093750} + - {fileID: 1823073129} + - {fileID: 65334560} + - {fileID: 387383896} + - {fileID: 122939472} + - {fileID: 2082728278}