diff --git a/Assets/Prefabs/Managers/CinematicsManager.prefab b/Assets/Prefabs/Managers/CinematicsManager.prefab index 56d95655..d4b954bb 100644 --- a/Assets/Prefabs/Managers/CinematicsManager.prefab +++ b/Assets/Prefabs/Managers/CinematicsManager.prefab @@ -227,7 +227,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &5708275729410901669 Transform: m_ObjectHideFlags: 0 @@ -294,6 +294,7 @@ RectTransform: m_Children: - {fileID: 5494371867874695937} - {fileID: 5708275729410901669} + - {fileID: 4978134902377398530} m_Father: {fileID: 5006436358316225511} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -410,6 +411,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e3cd69fd77a22640aa40e691d8d6c26, type: 3} m_Name: m_EditorClassIdentifier: AppleHillsScripts::CinematicsManager + cinematicBackground: {fileID: 3837694223035649714} + divingGameOverScreen: {fileID: 1555823719300990817} playableDirector: {fileID: 291412605997816487} --- !u!320 &291412605997816487 PlayableDirector: @@ -651,6 +654,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3837694223035649714 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4978134902377398530} + - component: {fileID: 2314847656825276738} + - component: {fileID: 923855569538630903} + m_Layer: 5 + m_Name: CinematicBackground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4978134902377398530 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3837694223035649714} + 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: 592992386388815559} + 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: -0.0025024, y: -1294.4525} + m_SizeDelta: {x: 1920, y: 1571.115} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2314847656825276738 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3837694223035649714} + m_CullTransparentMesh: 1 +--- !u!114 &923855569538630903 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3837694223035649714} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, 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: 0} + 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!1 &3845310352016848710 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/MiniGames/DivingForPictures.unity b/Assets/Scenes/MiniGames/DivingForPictures.unity index 7115e204..dc3344d5 100644 --- a/Assets/Scenes/MiniGames/DivingForPictures.unity +++ b/Assets/Scenes/MiniGames/DivingForPictures.unity @@ -342,16 +342,16 @@ LineRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Positions: - - {x: -0.15602553, y: 4.074945, z: 0} - - {x: -0.1566351, y: 3.973638, z: 0} - - {x: -0.1572447, y: 3.8729856, z: 0} + - {x: -0.15602553, y: 4.0749445, z: 0} + - {x: -0.1566351, y: 3.9736378, z: 0} + - {x: -0.1572447, y: 3.8729858, z: 0} - {x: -0.15785426, y: 3.7729874, z: 0} - - {x: -0.15846384, y: 3.6736436, z: 0} - - {x: -0.15907341, y: 3.574954, z: 0} - - {x: -0.15968299, y: 3.4769192, z: 0} - - {x: -0.16029257, y: 3.3795385, z: 0} - - {x: -0.16090216, y: 3.2828126, z: 0} - - {x: -0.16151173, y: 3.1867409, z: 0} + - {x: -0.15846384, y: 3.6736438, z: 0} + - {x: -0.15907341, y: 3.5749545, z: 0} + - {x: -0.15968299, y: 3.4769197, z: 0} + - {x: -0.16029257, y: 3.379539, z: 0} + - {x: -0.16090216, y: 3.2828128, z: 0} + - {x: -0.16151173, y: 3.186741, z: 0} - {x: -0.16212131, y: 3.0913236, z: 0} m_Parameters: serializedVersion: 3 @@ -915,7 +915,7 @@ Transform: m_GameObject: {fileID: 747976396} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 3.197517, z: 0} + m_LocalPosition: {x: 0, y: 3.1975174, z: 0} m_LocalScale: {x: 0.57574, y: 0.57574, z: 0.57574} m_ConstrainProportionsScale: 0 m_Children: @@ -1367,16 +1367,16 @@ LineRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Positions: - - {x: -0.15602553, y: 4.0749445, z: 0} - - {x: -0.11662118, y: 3.879622, z: 0} - - {x: -0.07721684, y: 3.7057445, z: 0} - - {x: -0.03781248, y: 3.5533106, z: 0} - - {x: 0.0015918687, y: 3.4223216, z: 0} - - {x: 0.040996216, y: 3.3127766, z: 0} + - {x: -0.15602553, y: 4.074945, z: 0} + - {x: -0.11662118, y: 3.8796227, z: 0} + - {x: -0.07721684, y: 3.7057447, z: 0} + - {x: -0.03781248, y: 3.553311, z: 0} + - {x: 0.0015918687, y: 3.4223218, z: 0} + - {x: 0.040996216, y: 3.3127768, z: 0} - {x: 0.08040057, y: 3.2246761, z: 0} - {x: 0.11980491, y: 3.15802, z: 0} - {x: 0.15920927, y: 3.1128082, z: 0} - - {x: 0.1986136, y: 3.0890405, z: 0} + - {x: 0.1986136, y: 3.0890408, z: 0} - {x: 0.23801796, y: 3.0867176, z: 0} m_Parameters: serializedVersion: 3 @@ -1910,16 +1910,16 @@ LineRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Positions: - - {x: -0.15602553, y: 4.0749445, z: 0} - - {x: -0.18956745, y: 3.8764973, z: 0} - - {x: -0.22310936, y: 3.7000232, z: 0} - - {x: -0.25665125, y: 3.5455203, z: 0} + - {x: -0.15602553, y: 4.074945, z: 0} + - {x: -0.18956745, y: 3.8764977, z: 0} + - {x: -0.22310936, y: 3.7000237, z: 0} + - {x: -0.25665125, y: 3.5455213, z: 0} - {x: -0.29019317, y: 3.412991, z: 0} - - {x: -0.32373506, y: 3.3024335, z: 0} - - {x: -0.35727698, y: 3.2138484, z: 0} - - {x: -0.39081886, y: 3.1472359, z: 0} - - {x: -0.4243608, y: 3.1025958, z: 0} - - {x: -0.45790267, y: 3.0799282, z: 0} + - {x: -0.32373506, y: 3.302434, z: 0} + - {x: -0.35727698, y: 3.2138486, z: 0} + - {x: -0.39081886, y: 3.147236, z: 0} + - {x: -0.4243608, y: 3.1025963, z: 0} + - {x: -0.45790267, y: 3.0799284, z: 0} - {x: -0.4914446, y: 3.079233, z: 0} m_Parameters: serializedVersion: 3 diff --git a/Assets/Scripts/Cinematics/CinematicsManager.cs b/Assets/Scripts/Cinematics/CinematicsManager.cs index 66eafa0f..d82e6dff 100644 --- a/Assets/Scripts/Cinematics/CinematicsManager.cs +++ b/Assets/Scripts/Cinematics/CinematicsManager.cs @@ -23,6 +23,8 @@ namespace Cinematics private Image _cinematicSprites; private bool _isCinematicPlaying = false; public bool IsCinematicPlaying => _isCinematicPlaying; + public GameObject cinematicBackground; + public GameObject divingGameOverScreen; // Dictionary to track addressable handles by PlayableDirector private Dictionary> _addressableHandles @@ -132,6 +134,7 @@ namespace Cinematics OnCinematicStopped?.Invoke(); // Release the addressable handle associated with this director ReleaseAddressableHandle(director); + ShowCinematicBackground(false); } /// @@ -190,5 +193,15 @@ namespace Cinematics } _addressableHandles.Clear(); } + + public void ShowCinematicBackground(bool shouldBeActive) + { + cinematicBackground.SetActive(shouldBeActive); + } + + public void ShowGameOverScreen() + { + divingGameOverScreen.SetActive(true); + } } } diff --git a/Assets/Scripts/Minigames/DivingForPictures/DivingGameManager.cs b/Assets/Scripts/Minigames/DivingForPictures/DivingGameManager.cs index bcaede70..c3359535 100644 --- a/Assets/Scripts/Minigames/DivingForPictures/DivingGameManager.cs +++ b/Assets/Scripts/Minigames/DivingForPictures/DivingGameManager.cs @@ -676,7 +676,7 @@ namespace Minigames.DivingForPictures { //Instead of surfacingTimeline, play the outro cinematic CinematicsManager.Instance.LoadAndPlayCinematic("SurfacingCinematic"); - // TODO CinematicsManager.Instance.ShowCinematicBackground(true); + CinematicsManager.Instance.ShowCinematicBackground(true); //surfacingTimeline.Play(); //Logging.Debug("[DivingGameManager] Last tile left the screen, playing timeline"); @@ -698,7 +698,7 @@ namespace Minigames.DivingForPictures monster.DespawnMonster(); } } - //TODO CinematicsManager.Instance.ShowGameOverScreen(); + CinematicsManager.Instance.ShowGameOverScreen(); activeMonsters.Clear();