From e149f309cacd7b94237fa1d50ba990672fce7fdb Mon Sep 17 00:00:00 2001 From: Jonathan Benz <98258254+JonathanBenz@users.noreply.github.com> Date: Sun, 8 Dec 2024 19:22:57 -0500 Subject: [PATCH] Skip Cutscene Feature --- Sample2DProject/Assets/Input.inputactions | 17 +- Sample2DProject/Assets/PlayerInput.cs | 37 +- .../Assets/Resources/SelectablePlayer1.prefab | 14 +- .../Assets/Resources/SelectablePlayer2.prefab | 14 +- .../Assets/Scenes/Jon Test Scene.unity | 475 +++++++++++++++++- .../Cinematics/CinematicControlRemover.cs | 2 + .../Cinematics/OscillateSkipCutsceneText.cs | 23 + .../OscillateSkipCutsceneText.cs.meta | 11 + .../Scripts/Cinematics/StopCinematic.cs | 19 + .../Scripts/Cinematics/StopCinematic.cs.meta | 11 + .../Hacking/DisplayHackOnboarding.cs | 2 +- .../Assets/Scripts/Player/PlayerMovement.cs | 5 + .../Layouts/CurrentMaximizeLayout.dwlt | 200 ++++---- 13 files changed, 705 insertions(+), 125 deletions(-) create mode 100644 Sample2DProject/Assets/Scripts/Cinematics/OscillateSkipCutsceneText.cs create mode 100644 Sample2DProject/Assets/Scripts/Cinematics/OscillateSkipCutsceneText.cs.meta create mode 100644 Sample2DProject/Assets/Scripts/Cinematics/StopCinematic.cs create mode 100644 Sample2DProject/Assets/Scripts/Cinematics/StopCinematic.cs.meta diff --git a/Sample2DProject/Assets/Input.inputactions b/Sample2DProject/Assets/Input.inputactions index 1d87383..5f83a5c 100644 --- a/Sample2DProject/Assets/Input.inputactions +++ b/Sample2DProject/Assets/Input.inputactions @@ -874,7 +874,7 @@ "id": "38ed328d-dacf-4ef0-acdc-33379a49d669", "actions": [ { - "name": "New action", + "name": "SkipCutscene", "type": "Button", "id": "86edda7f-df7a-40da-a8c8-b79f1b510350", "expectedControlType": "Button", @@ -887,11 +887,22 @@ { "name": "", "id": "269896ad-86f7-470e-94db-bd7818101dff", - "path": "", + "path": "/enter", + "interactions": "", + "processors": "", + "groups": "", + "action": "SkipCutscene", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "08860cca-2484-45c5-9241-84f649163059", + "path": "/start", "interactions": "", "processors": "", "groups": "", - "action": "New action", + "action": "SkipCutscene", "isComposite": false, "isPartOfComposite": false } diff --git a/Sample2DProject/Assets/PlayerInput.cs b/Sample2DProject/Assets/PlayerInput.cs index 0a9c873..3940d6f 100644 --- a/Sample2DProject/Assets/PlayerInput.cs +++ b/Sample2DProject/Assets/PlayerInput.cs @@ -896,7 +896,7 @@ public @Input() ""id"": ""38ed328d-dacf-4ef0-acdc-33379a49d669"", ""actions"": [ { - ""name"": ""New action"", + ""name"": ""SkipCutscene"", ""type"": ""Button"", ""id"": ""86edda7f-df7a-40da-a8c8-b79f1b510350"", ""expectedControlType"": ""Button"", @@ -909,11 +909,22 @@ public @Input() { ""name"": """", ""id"": ""269896ad-86f7-470e-94db-bd7818101dff"", - ""path"": """", + ""path"": ""/enter"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""SkipCutscene"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""08860cca-2484-45c5-9241-84f649163059"", + ""path"": ""/start"", ""interactions"": """", ""processors"": """", ""groups"": """", - ""action"": ""New action"", + ""action"": ""SkipCutscene"", ""isComposite"": false, ""isPartOfComposite"": false } @@ -1009,7 +1020,7 @@ public @Input() m_Hacking_Advance = m_Hacking.FindAction("Advance", throwIfNotFound: true); // DisableInput m_DisableInput = asset.FindActionMap("DisableInput", throwIfNotFound: true); - m_DisableInput_Newaction = m_DisableInput.FindAction("New action", throwIfNotFound: true); + m_DisableInput_SkipCutscene = m_DisableInput.FindAction("SkipCutscene", throwIfNotFound: true); } public void Dispose() @@ -1329,12 +1340,12 @@ public void SetCallbacks(IHackingActions instance) // DisableInput private readonly InputActionMap m_DisableInput; private List m_DisableInputActionsCallbackInterfaces = new List(); - private readonly InputAction m_DisableInput_Newaction; + private readonly InputAction m_DisableInput_SkipCutscene; public struct DisableInputActions { private @Input m_Wrapper; public DisableInputActions(@Input wrapper) { m_Wrapper = wrapper; } - public InputAction @Newaction => m_Wrapper.m_DisableInput_Newaction; + public InputAction @SkipCutscene => m_Wrapper.m_DisableInput_SkipCutscene; public InputActionMap Get() { return m_Wrapper.m_DisableInput; } public void Enable() { Get().Enable(); } public void Disable() { Get().Disable(); } @@ -1344,16 +1355,16 @@ public void AddCallbacks(IDisableInputActions instance) { if (instance == null || m_Wrapper.m_DisableInputActionsCallbackInterfaces.Contains(instance)) return; m_Wrapper.m_DisableInputActionsCallbackInterfaces.Add(instance); - @Newaction.started += instance.OnNewaction; - @Newaction.performed += instance.OnNewaction; - @Newaction.canceled += instance.OnNewaction; + @SkipCutscene.started += instance.OnSkipCutscene; + @SkipCutscene.performed += instance.OnSkipCutscene; + @SkipCutscene.canceled += instance.OnSkipCutscene; } private void UnregisterCallbacks(IDisableInputActions instance) { - @Newaction.started -= instance.OnNewaction; - @Newaction.performed -= instance.OnNewaction; - @Newaction.canceled -= instance.OnNewaction; + @SkipCutscene.started -= instance.OnSkipCutscene; + @SkipCutscene.performed -= instance.OnSkipCutscene; + @SkipCutscene.canceled -= instance.OnSkipCutscene; } public void RemoveCallbacks(IDisableInputActions instance) @@ -1445,6 +1456,6 @@ public interface IHackingActions } public interface IDisableInputActions { - void OnNewaction(InputAction.CallbackContext context); + void OnSkipCutscene(InputAction.CallbackContext context); } } diff --git a/Sample2DProject/Assets/Resources/SelectablePlayer1.prefab b/Sample2DProject/Assets/Resources/SelectablePlayer1.prefab index e8297a4..de88697 100644 --- a/Sample2DProject/Assets/Resources/SelectablePlayer1.prefab +++ b/Sample2DProject/Assets/Resources/SelectablePlayer1.prefab @@ -2317,7 +2317,19 @@ MonoBehaviour: m_ActionId: 0d0dc6e5-c8da-4ba2-83dd-d536cdb336ac m_ActionName: Hacking/Advance[/Keyboard/space,/XInputControllerWindows/buttonSouth] - m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 8825770351404935619} + m_TargetAssemblyTypeName: PlayerMovement, Assembly-CSharp + m_MethodName: OnSkipCutscene + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_ActionId: 86edda7f-df7a-40da-a8c8-b79f1b510350 m_ActionName: DisableInput/New action m_NeverAutoSwitchControlSchemes: 1 diff --git a/Sample2DProject/Assets/Resources/SelectablePlayer2.prefab b/Sample2DProject/Assets/Resources/SelectablePlayer2.prefab index 7145024..6e71892 100644 --- a/Sample2DProject/Assets/Resources/SelectablePlayer2.prefab +++ b/Sample2DProject/Assets/Resources/SelectablePlayer2.prefab @@ -266,7 +266,19 @@ MonoBehaviour: m_ActionId: 0d0dc6e5-c8da-4ba2-83dd-d536cdb336ac m_ActionName: Hacking/Advance[/Keyboard/space,/XInputControllerWindows/buttonSouth] - m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 3627847233429041494} + m_TargetAssemblyTypeName: PlayerMovement, Assembly-CSharp + m_MethodName: OnSkipCutscene + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_ActionId: 86edda7f-df7a-40da-a8c8-b79f1b510350 m_ActionName: DisableInput/New action m_NeverAutoSwitchControlSchemes: 1 diff --git a/Sample2DProject/Assets/Scenes/Jon Test Scene.unity b/Sample2DProject/Assets/Scenes/Jon Test Scene.unity index d4ef1a0..d4a8d50 100644 --- a/Sample2DProject/Assets/Scenes/Jon Test Scene.unity +++ b/Sample2DProject/Assets/Scenes/Jon Test Scene.unity @@ -2983,6 +2983,95 @@ Transform: m_CorrespondingSourceObject: {fileID: 4142061959012725217, guid: 38528346abd47314993090ba6d4d10f3, type: 3} m_PrefabInstance: {fileID: 1767364673} m_PrefabAsset: {fileID: 0} +--- !u!1 &525085156 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 525085157} + - component: {fileID: 525085159} + - component: {fileID: 525085158} + - component: {fileID: 525085160} + m_Layer: 5 + m_Name: PSStart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &525085157 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 525085156} + 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: 2141792032} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 154, y: 9} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &525085158 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 525085156} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: c71f70e5fdf94a947a64a5aadf5be925, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e4774a7febf2bee4d9b4b86181616521, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &525085159 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 525085156} + m_CullTransparentMesh: 1 +--- !u!114 &525085160 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 525085156} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 71d9327bc16ed644e97da0f5e8589024, type: 3} + m_Name: + m_EditorClassIdentifier: + oscillationSpeed: 1 --- !u!1001 &525301262 PrefabInstance: m_ObjectHideFlags: 0 @@ -7134,6 +7223,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 710154271989400515, guid: b36b659ceb428414b90420171d00105c, type: 3} + propertyPath: skipCutsceneText + value: + objectReference: {fileID: 2141792031} - target: {fileID: 710154271989400515, guid: b36b659ceb428414b90420171d00105c, type: 3} propertyPath: cryoPod1InteractTrigger value: @@ -7144,7 +7237,7 @@ PrefabInstance: objectReference: {fileID: 1085718972} - target: {fileID: 2278742308791012955, guid: b36b659ceb428414b90420171d00105c, type: 3} propertyPath: m_Lens.FieldOfView - value: 60 + value: 57.75977 objectReference: {fileID: 0} - target: {fileID: 3274561603259679018, guid: b36b659ceb428414b90420171d00105c, type: 3} propertyPath: m_Path @@ -7204,7 +7297,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5826233889228417591, guid: b36b659ceb428414b90420171d00105c, type: 3} propertyPath: m_PathPosition - value: 7 + value: 4.476168 objectReference: {fileID: 0} - target: {fileID: 6731452673380315492, guid: b36b659ceb428414b90420171d00105c, type: 3} propertyPath: m_LocalPosition.x @@ -7251,8 +7344,16 @@ PrefabInstance: - {fileID: 8318078459623696834, guid: b36b659ceb428414b90420171d00105c, type: 3} - {fileID: 9169247436764216616, guid: b36b659ceb428414b90420171d00105c, type: 3} m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2941356173993345107, guid: b36b659ceb428414b90420171d00105c, type: 3} + insertIndex: -1 + addedObject: {fileID: 1351181731} m_SourcePrefab: {fileID: 100100000, guid: b36b659ceb428414b90420171d00105c, type: 3} +--- !u!1 &992433261 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2941356173993345107, guid: b36b659ceb428414b90420171d00105c, type: 3} + m_PrefabInstance: {fileID: 992433260} + m_PrefabAsset: {fileID: 0} --- !u!95 &1048699806 stripped Animator: m_CorrespondingSourceObject: {fileID: 8044518595073241447, guid: 22d2c44fed4ffa743aac7afe4d993905, type: 3} @@ -7348,6 +7449,14 @@ PrefabInstance: propertyPath: m_Name value: Hacking Minigame Scene objectReference: {fileID: 0} + - target: {fileID: 3859489519007836400, guid: a7a0090dd07f8ad4a8393779ca3eba52, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4593127445367661498, guid: a7a0090dd07f8ad4a8393779ca3eba52, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4943141913635681028, guid: a7a0090dd07f8ad4a8393779ca3eba52, type: 3} propertyPath: m_fontAsset value: @@ -9378,12 +9487,25 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 710154271989400515, guid: b36b659ceb428414b90420171d00105c, type: 3} m_PrefabInstance: {fileID: 992433260} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 992433261} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3270431626834d343afdf04d2cd90e46, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1351181731 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 992433261} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 25d2446c5a8697d44b5a9aca9d352753, type: 3} + m_Name: + m_EditorClassIdentifier: + skipCutscene: {fileID: 2141792031} --- !u!1001 &1358344324 PrefabInstance: m_ObjectHideFlags: 0 @@ -10687,6 +10809,95 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1797888751} m_CullTransparentMesh: 1 +--- !u!1 &1803509597 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1803509598} + - component: {fileID: 1803509600} + - component: {fileID: 1803509599} + - component: {fileID: 1803509601} + m_Layer: 5 + m_Name: XboxStart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1803509598 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1803509597} + 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: 2141792032} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 103, y: 14} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1803509599 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1803509597} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: c71f70e5fdf94a947a64a5aadf5be925, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3818c50404685cc498424016aef1b66f, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1803509600 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1803509597} + m_CullTransparentMesh: 1 +--- !u!114 &1803509601 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1803509597} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 71d9327bc16ed644e97da0f5e8589024, type: 3} + m_Name: + m_EditorClassIdentifier: + oscillationSpeed: 1 --- !u!1001 &1833191065 PrefabInstance: m_ObjectHideFlags: 0 @@ -12961,6 +13172,95 @@ Transform: m_CorrespondingSourceObject: {fileID: 4592413915255197524, guid: 44d38fb834debc34e991bf87efc97a4c, type: 3} m_PrefabInstance: {fileID: 2001686644} m_PrefabAsset: {fileID: 0} +--- !u!1 &2008895242 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2008895243} + - component: {fileID: 2008895245} + - component: {fileID: 2008895244} + - component: {fileID: 2008895246} + m_Layer: 5 + m_Name: Enter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2008895243 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2008895242} + 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: 2141792032} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 13, y: 16} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2008895244 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2008895242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: c71f70e5fdf94a947a64a5aadf5be925, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: c7572b4a1ab749e4db5d440f0b2a816e, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2008895245 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2008895242} + m_CullTransparentMesh: 1 +--- !u!114 &2008895246 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2008895242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 71d9327bc16ed644e97da0f5e8589024, type: 3} + m_Name: + m_EditorClassIdentifier: + oscillationSpeed: 1 --- !u!64 &2011276016 MeshCollider: m_ObjectHideFlags: 0 @@ -13390,6 +13690,157 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!1 &2141792031 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2141792032} + - component: {fileID: 2141792034} + - component: {fileID: 2141792033} + - component: {fileID: 2141792035} + m_Layer: 5 + m_Name: SkipCutsceneText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2141792032 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141792031} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2008895243} + - {fileID: 1803509598} + - {fileID: 525085157} + m_Father: {fileID: 598611173715266338} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -362, y: -8} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 1, y: 0} +--- !u!114 &2141792033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141792031} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Press or / to skip cutscene... + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 87d6786227062544489ba2cabeff9b05, type: 2} + m_sharedMaterial: {fileID: -261199663134533442, guid: 87d6786227062544489ba2cabeff9b05, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4283387983 + m_fontColor: {r: 0.30980393, g: 0.3137255, b: 0.30980393, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 26 + m_fontSizeBase: 26 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: -567.599, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &2141792034 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141792031} + m_CullTransparentMesh: 1 +--- !u!114 &2141792035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2141792031} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1f54ea34f29f91a4c8a11a72ee3ba2b2, type: 3} + m_Name: + m_EditorClassIdentifier: + fadeSpeed: 1 --- !u!4 &132565829384208666 Transform: m_ObjectHideFlags: 0 @@ -13637,6 +14088,10 @@ PrefabInstance: propertyPath: m_Name value: UI objectReference: {fileID: 0} + - target: {fileID: 2231222011657382839, guid: 385057344d43d9a4cb38ee568c54de65, type: 3} + propertyPath: m_AdditionalShaderChannelsFlag + value: 25 + objectReference: {fileID: 0} - target: {fileID: 3280582858292087931, guid: 385057344d43d9a4cb38ee568c54de65, type: 3} propertyPath: m_SizeDelta.x value: 1920 @@ -13677,6 +14132,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4200449943973532089, guid: 385057344d43d9a4cb38ee568c54de65, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4555869153445593434, guid: 385057344d43d9a4cb38ee568c54de65, type: 3} propertyPath: m_Enabled value: 1 @@ -13727,6 +14186,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 631690302920606984, guid: 385057344d43d9a4cb38ee568c54de65, type: 3} insertIndex: -1 addedObject: {fileID: 337629928} + - targetCorrespondingSourceObject: {fileID: 3546927516923377890, guid: 385057344d43d9a4cb38ee568c54de65, type: 3} + insertIndex: -1 + addedObject: {fileID: 2141792032} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 385057344d43d9a4cb38ee568c54de65, type: 3} --- !u!114 &598611173715266337 stripped @@ -13740,6 +14202,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1046263bc30e3b243a0c63465de2085b, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &598611173715266338 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3546927516923377890, guid: 385057344d43d9a4cb38ee568c54de65, type: 3} + m_PrefabInstance: {fileID: 598611173715266336} + m_PrefabAsset: {fileID: 0} --- !u!65 &991284175604529446 BoxCollider: m_ObjectHideFlags: 0 diff --git a/Sample2DProject/Assets/Scripts/Cinematics/CinematicControlRemover.cs b/Sample2DProject/Assets/Scripts/Cinematics/CinematicControlRemover.cs index 657a172..4e5af62 100644 --- a/Sample2DProject/Assets/Scripts/Cinematics/CinematicControlRemover.cs +++ b/Sample2DProject/Assets/Scripts/Cinematics/CinematicControlRemover.cs @@ -13,6 +13,7 @@ public class CinematicControlRemover : MonoBehaviour GameObject[] players; [SerializeField] BoxCollider cryoPod1InteractTrigger; [SerializeField] BoxCollider cryoPod2InteractTrigger; + [SerializeField] GameObject skipCutsceneText; private bool donePlaying = true; @@ -53,5 +54,6 @@ void EnableControl(PlayableDirector pd) } cryoPod1InteractTrigger.enabled = true; cryoPod2InteractTrigger.enabled = true; + skipCutsceneText.SetActive(false); } } \ No newline at end of file diff --git a/Sample2DProject/Assets/Scripts/Cinematics/OscillateSkipCutsceneText.cs b/Sample2DProject/Assets/Scripts/Cinematics/OscillateSkipCutsceneText.cs new file mode 100644 index 0000000..547e0cd --- /dev/null +++ b/Sample2DProject/Assets/Scripts/Cinematics/OscillateSkipCutsceneText.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using TMPro; + +public class OscillateSkipCutsceneText : MonoBehaviour +{ + [SerializeField] float fadeSpeed = 1f; + TMP_Text skipCutsceneText; + void Start() + { + skipCutsceneText = GetComponent(); + } + void Update() + { + OscillateOpacity(); + } + void OscillateOpacity() + { + float textAlpha = 0.5f * (Mathf.Sin((Time.time * fadeSpeed) - (Mathf.PI / 2)) + 1); //Normalizes oscillations between 0 and 1 instead of -1 and 1 + skipCutsceneText.alpha = textAlpha; + } +} diff --git a/Sample2DProject/Assets/Scripts/Cinematics/OscillateSkipCutsceneText.cs.meta b/Sample2DProject/Assets/Scripts/Cinematics/OscillateSkipCutsceneText.cs.meta new file mode 100644 index 0000000..1883c28 --- /dev/null +++ b/Sample2DProject/Assets/Scripts/Cinematics/OscillateSkipCutsceneText.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1f54ea34f29f91a4c8a11a72ee3ba2b2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Sample2DProject/Assets/Scripts/Cinematics/StopCinematic.cs b/Sample2DProject/Assets/Scripts/Cinematics/StopCinematic.cs new file mode 100644 index 0000000..b541185 --- /dev/null +++ b/Sample2DProject/Assets/Scripts/Cinematics/StopCinematic.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Playables; + + +[RequireComponent(typeof(PlayableDirector))] +public class StopCinematic : MonoBehaviour +{ + [SerializeField] GameObject skipCutscene; + bool hasSkipped; + public void SkipCutscene() + { + if (hasSkipped) return; + GetComponent().Stop(); + skipCutscene.SetActive(false); + hasSkipped = true; + } +} diff --git a/Sample2DProject/Assets/Scripts/Cinematics/StopCinematic.cs.meta b/Sample2DProject/Assets/Scripts/Cinematics/StopCinematic.cs.meta new file mode 100644 index 0000000..0bef51b --- /dev/null +++ b/Sample2DProject/Assets/Scripts/Cinematics/StopCinematic.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 25d2446c5a8697d44b5a9aca9d352753 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Sample2DProject/Assets/Scripts/MiniGames/Hacking/DisplayHackOnboarding.cs b/Sample2DProject/Assets/Scripts/MiniGames/Hacking/DisplayHackOnboarding.cs index 8e81d2b..e85c924 100644 --- a/Sample2DProject/Assets/Scripts/MiniGames/Hacking/DisplayHackOnboarding.cs +++ b/Sample2DProject/Assets/Scripts/MiniGames/Hacking/DisplayHackOnboarding.cs @@ -63,7 +63,7 @@ private void Update() void FadingUI(Image image) { - float oscillatingAlpha = 0.5f * (Mathf.Sin(Time.time - (Mathf.PI / 2)) + 1); //Normalizes oscillations between 0 and 1 instead of -1 and 1 + float oscillatingAlpha = 0.5f * (Mathf.Sin((Time.time * crossFadeSpeed) - (Mathf.PI / 2)) + 1); //Normalizes oscillations between 0 and 1 instead of -1 and 1 Color newColor = new Color(image.color.r, image.color.g, image.color.b, oscillatingAlpha); image.color = newColor; } diff --git a/Sample2DProject/Assets/Scripts/Player/PlayerMovement.cs b/Sample2DProject/Assets/Scripts/Player/PlayerMovement.cs index 72502a5..139a63a 100644 --- a/Sample2DProject/Assets/Scripts/Player/PlayerMovement.cs +++ b/Sample2DProject/Assets/Scripts/Player/PlayerMovement.cs @@ -20,6 +20,7 @@ public class PlayerMovement : MonoBehaviour Animator animator; PlayerInput pi; bool isAlreadySelected = false; + public bool IsAlreadySelected { get { return isAlreadySelected; } set { isAlreadySelected = value; } } @@ -126,4 +127,8 @@ private void ToggleFloating(bool isFloating) } else transform.position = new Vector3(transform.position.x, 0f, transform.position.z); } + public void OnSkipCutscene(InputAction.CallbackContext context) + { + FindObjectOfType().SkipCutscene(); + } } diff --git a/Sample2DProject/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/Sample2DProject/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 479e401..1e91610 100644 --- a/Sample2DProject/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/Sample2DProject/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 5189 + controlID: 52 draggingID: 0 --- !u!114 &2 MonoBehaviour: @@ -46,10 +46,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 783 + x: 803 y: 73 - width: 681 - height: 649 + width: 661 + height: 566 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -66,7 +66,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 681, y: 383} + m_TargetSize: {x: 661, y: 372} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -81,10 +81,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -340.5 - m_HBaseRangeMax: 340.5 - m_VBaseRangeMin: -191.5 - m_VBaseRangeMax: 191.5 + m_HBaseRangeMin: -330.5 + m_HBaseRangeMax: 330.5 + m_VBaseRangeMin: -186 + m_VBaseRangeMax: 186 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -102,23 +102,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 681 - height: 628 + width: 661 + height: 545 m_Scale: {x: 1, y: 1} - m_Translation: {x: 340.5, y: 314} + m_Translation: {x: 330.5, y: 272.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -340.5 - y: -314 - width: 681 - height: 628 + x: -330.5 + y: -272.5 + width: 661 + height: 545 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 681, y: 649} + m_LastWindowPixelSize: {x: 661, y: 566} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -148,7 +148,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 5190 + controlID: 53 draggingID: 0 --- !u!114 &4 MonoBehaviour: @@ -171,11 +171,11 @@ MonoBehaviour: x: 0 y: 0 width: 1466 - height: 670 + height: 587 m_MinSize: {x: 300, y: 50} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 5191 + controlID: 54 draggingID: 0 --- !u!114 &5 MonoBehaviour: @@ -194,8 +194,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 285 - height: 670 + width: 273 + height: 587 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 6} @@ -224,9 +224,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 19 - width: 284 - height: 649 + y: 73 + width: 272 + height: 566 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -240,9 +240,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: a8c9f7ff - m_LastClickedID: 0 - m_ExpandedIDs: ec1efaff6c1afbff3a24fbffb424fbffc826fbff6e2afbff002bfbff6a3bfbff2cfafbff58a4fdff3ed2fdff9af0fdff64fafdffce22feff1a33fffffae4ffffeae6ffffcefaffff48690000223b01002a1402001c4602000e780200eaac02005e0e0400c60e040020120400bea50400bca60400 + m_SelectedIDs: 16c1f3ff + m_LastClickedID: -802538 + m_ExpandedIDs: 4605f2ff16c1f3ffbed8f3ffc0d8f3ffe8e6f3ff92eaf3fffef9f3ffa401f4ffce2af4fff07cf4ff047ff4ff38a8f4ff5015f6ff962ff6ff6a33f6ff0440f6fff885f7ff8a4cf8ff4c4df8fff4a7f8ff2eaef8ff04c4f8ff7edcf8ff9811f9ff2c29f9ffcc9bf9fff09cf9ff3ad8f9ff140ffaff0675faffa89cfaff389dfaff20a6faffa2ccfaffa41dfbffd01efbffea4ffbff4456fbff4ab5fbffe0e0fbffa20efcffa40efcffce18fcffe218fcffe418fcffb837fcff6e14fdff2416fdff2017fdff1c19fdffe81dfdff6021fdffd022fdff0828fdff4497fdff5897fdff5c97fdff2898fdff2c98fdff7eaffdff80affdffbceffdffe62afeff542bfeff0668feff307bfeffb095feff1a9cfeff74b6feffcec3feff06d5feff72f1feff8217fffff83bffffd257ffff0479ffffe8b0ffffa4d7ffffccfaffffcefaffff74df0000e6e7000076ec00007aec0000121e0100682b0100ba2f01006404020062050200dc060200120b0200100c02008a0d0200701702006e180200e81902005a39020076d8020032090300b2090300b60903006c0d0300940a040080180400701f0400fc200400dc9d040054ac0400 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -276,23 +276,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimatorControllerTool + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 285 + x: 273 y: 0 - width: 498 - height: 670 - m_MinSize: {x: 102, y: 121} + width: 530 + height: 587 + m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 9} + m_ActualView: {fileID: 8} m_Panes: - {fileID: 8} - {fileID: 9} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -313,10 +313,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 285 + x: 273 y: 73 - width: 445 - height: 649 + width: 528 + height: 566 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -643,7 +643,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 52, y: 10} + snapOffset: {x: 43, y: 10} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: UnityEditor.SceneViewCameraOverlay @@ -664,20 +664,33 @@ MonoBehaviour: layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: UnityEditor.SceneViewCameraOverlay (0) + index: 12 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 m_OverlaysVisible: 1 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 1 + m_SceneIsLit: 0 m_SceneLighting: 1 m_2DMode: 0 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 399.124, y: 236.23808, z: 118.62344} + m_Target: {x: 283.44638, y: 145.10187, z: 98.32528} speed: 2 - m_Value: {x: 399.124, y: 236.23808, z: 118.62344} + m_Value: {x: 283.44638, y: 145.10187, z: 98.32528} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -723,13 +736,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.05087581, y: -0.036542255, z: 0.01962438, w: 0.99914145} + m_Target: {x: 0.30631205, y: 0.0710835, z: 0.01175863, w: 0.95081294} speed: 2 - m_Value: {x: 0.050809994, y: -0.03649498, z: 0.019598993, w: 0.9978489} + m_Value: {x: 0.30584395, y: 0.07097487, z: 0.01174066, w: 0.9493599} m_Size: - m_Target: 419.92917 + m_Target: 302.8042 speed: 2 - m_Value: 419.92917 + m_Value: 317.07245 m_Ortho: m_Target: 0 speed: 2 @@ -774,9 +787,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 285 + x: 247 y: 73 - width: 496 + width: 762 height: 649 m_SerializedDataModeController: m_DataMode: 0 @@ -795,9 +808,8 @@ MonoBehaviour: - {fileID: -9091830984465330416, guid: 84ecdbd8445592e4995e137a5f484eb5, type: 2} - {fileID: 5436397918847577406, guid: ba9e8416878fd894d832c8ba3613655c, type: 2} - {fileID: 613746103013774878, guid: e17933361c0acbe4fb2da71edfd3c063, type: 2} - - {fileID: -7738724050937789290, guid: bf11577d657f9334990bc3214ef2024a, type: 2} - {fileID: -4010563949765389298, guid: 7fc4fdf93250a5044a5fc08ec9793228, type: 2} - - {fileID: 5857986031010838410, guid: 2e124ff0f2c353a49a83014e2f17d00c, type: 2} + - {fileID: 3472662526043819351, guid: 86e91deace56a6a4f8133dc0c17f4a01, type: 2} m_ValueSerializationHelper: - e00: 0.4288926 e01: 0 @@ -879,30 +891,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.27052632 - e01: 0 - e02: 0 - e03: 1.4736786 - e10: 0 - e11: 0.27052632 - e12: 0 - e13: 279.3 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.5843522 + - e00: 0.5957895 e01: 0 e02: 0 - e03: 39.669605 + e03: -14.78949 e10: 0 - e11: 0.5843522 + e11: 0.5957895 e12: 0 - e13: 286.3446 + e13: 248.4 e20: 0 e21: 0 e22: 1 @@ -911,14 +907,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.62055635 + - e00: 1 e01: 0 e02: 0 - e03: -42.7106 + e03: 0 e10: 0 - e11: 0.62055635 + e11: 1 e12: 0 - e13: 358.84222 + e13: 0 e20: 0 e21: 0 e22: 1 @@ -928,9 +924,9 @@ MonoBehaviour: e32: 0 e33: 1 m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: ba9e8416878fd894d832c8ba3613655c, type: 2} + m_AnimatorController: {fileID: 9100000, guid: b746a5f00d7fa36408f63937838ee6fe, type: 2} m_BreadCrumbs: - - m_Target: {fileID: 5436397918847577406, guid: ba9e8416878fd894d832c8ba3613655c, type: 2} + - m_Target: {fileID: -9091830984465330416, guid: b746a5f00d7fa36408f63937838ee6fe, type: 2} m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} stateMachineGraphGUI: {fileID: 0} @@ -958,10 +954,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 783 + x: 803 y: 0 - width: 683 - height: 670 + width: 663 + height: 587 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} @@ -979,24 +975,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: TimelineWindow + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 670 + y: 587 width: 1466 - height: 277 + height: 360 m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 13} m_Panes: - {fileID: 12} - {fileID: 13} - {fileID: 14} - {fileID: 15} - m_Selected: 3 + m_Selected: 1 m_LastSelected: 0 --- !u!114 &12 MonoBehaviour: @@ -1019,9 +1015,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 743 + y: 660 width: 1465 - height: 256 + height: 339 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1043,7 +1039,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Animations + - Assets m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1051,16 +1047,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 81 m_LastFolders: - - Assets/Animations + - Assets m_LastFoldersGridSize: 81 m_LastProjectPath: C:\Users\zombi\OneDrive\Documents\GitHub\Singularity-Studios\Sample2DProject m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 79} - m_SelectedIDs: 90a70000 - m_LastClickedID: 42896 - m_ExpandedIDs: 00000000e4810000e6810000e8810000ea810000ec810000ee810000f0810000f2810000f4810000f6810000f881000000ca9a3b + m_SelectedIDs: 1c8f0000 + m_LastClickedID: 36636 + m_ExpandedIDs: 000000001c8f00001e8f0000208f0000228f0000248f0000268f0000288f00002a8f00002c8f00002e8f0000308f0000a0980000b0980000d498000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1088,7 +1084,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000e4810000e6810000e8810000ea810000ec810000ee810000f0810000f2810000f4810000f6810000f881000000ca9a3b + m_ExpandedIDs: 000000001c8f00001e8f0000208f0000228f0000248f0000268f0000288f00002a8f00002c8f00002e8f0000308f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1113,9 +1109,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: c826fbff - m_LastClickedInstanceID: -317752 - m_HadKeyboardFocusLastEvent: 0 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c62300000c970000fa960000e66200003e6d00000000000044e20000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1140,7 +1136,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 32} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 81 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 @@ -1165,9 +1161,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 743 + y: 660 width: 1465 - height: 256 + height: 339 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1214,7 +1210,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -318406 + m_LastSelectedObjectID: -802538 --- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1256,7 +1252,7 @@ MonoBehaviour: m_IsLocked: 0 m_SequenceHierarchy: {fileID: 0} m_SequencePath: - m_SelectionRoot: -317752 + m_SelectionRoot: 0 m_SubElements: [] --- !u!114 &16 MonoBehaviour: @@ -1325,7 +1321,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 6 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: