WIP

Assets/Prefabs/Managers/CinematicsManager.prefab

@@ -220,6 +220,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5708275729410901669}
+  - component: {fileID: 7927991410039509668}
   m_Layer: 0
   m_Name: DivingGameOverScreen
   m_TagString: Untagged
@@ -248,6 +249,18 @@ Transform:
   - {fileID: 7686124293670610134}
   m_Father: {fileID: 592992386388815559}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7927991410039509668
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1555823719300990817}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b37e3dc225aa25143af8ab61f827ae8b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: '::'
 --- !u!1 &2350186695477379260
 GameObject:
   m_ObjectHideFlags: 0
@@ -397,7 +410,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4e3cd69fd77a22640aa40e691d8d6c26, type: 3}
   m_Name: 
   m_EditorClassIdentifier: AppleHillsScripts::CinematicsManager
-  cinematicBackground: {fileID: 2880016163873359919}
   playableDirector: {fileID: 291412605997816487}
 --- !u!320 &291412605997816487
 PlayableDirector:
@@ -970,7 +982,19 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1263043260415585812}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 7927991410039509668}
+        m_TargetAssemblyTypeName: DivingGameOverScreen, AppleHillsScripts
+        m_MethodName: PlayAgain
+        m_Mode: 1
+        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
 --- !u!1 &4068599104538777648
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/UI/Tutorial.prefab

@@ -559,81 +559,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &3630462594258245026
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8409216554811186982}
-  - component: {fileID: 2987366278241384260}
-  - component: {fileID: 908238949942258649}
-  m_Layer: 5
-  m_Name: Background
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8409216554811186982
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3630462594258245026}
-  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: 2294320748528342736}
-  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: 77.69641, y: 88.43323}
-  m_SizeDelta: {x: 1204.5154, y: 802.1875}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2987366278241384260
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3630462594258245026}
-  m_CullTransparentMesh: 1
---- !u!114 &908238949942258649
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3630462594258245026}
-  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: 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: -6869325624984279803, guid: bfff7425eb5869d49b7dbfbe9dab3af1, 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!1 &3795501750743266310
 GameObject:
   m_ObjectHideFlags: 0
@@ -1120,7 +1045,6 @@ RectTransform:
   m_Children:
   - {fileID: 4249054603034392046}
   - {fileID: 1831065641766120066}
-  - {fileID: 2294320748528342736}
   m_Father: {fileID: 3183207532655435649}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -1314,35 +1238,3 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &8957969721421983339
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2294320748528342736}
-  m_Layer: 0
-  m_Name: DivingGameOverScreen
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!4 &2294320748528342736
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8957969721421983339}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -77.69641, y: 312.65674, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8409216554811186982}
-  m_Father: {fileID: 4592376486413311028}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Scenes/MiniGames/DivingForPictures.unity

@@ -342,10 +342,10 @@ LineRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_Positions:
-  - {x: -0.15602553, y: 4.0749445, z: 0}
+  - {x: -0.15602553, y: 4.074945, z: 0}
-  - {x: -0.1566351, y: 3.9736376, z: 0}
+  - {x: -0.1566351, y: 3.973638, z: 0}
-  - {x: -0.1572447, y: 3.8729854, z: 0}
+  - {x: -0.1572447, y: 3.8729856, z: 0}
-  - {x: -0.15785426, y: 3.772987, 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}
@@ -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.1975174, z: 0}
+  m_LocalPosition: {x: 0, y: 3.197517, z: 0}
   m_LocalScale: {x: 0.57574, y: 0.57574, z: 0.57574}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1367,10 +1367,10 @@ LineRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_Positions:
-  - {x: -0.15602553, y: 4.074945, z: 0}
+  - {x: -0.15602553, y: 4.0749445, z: 0}
-  - {x: -0.11662118, y: 3.8796225, z: 0}
+  - {x: -0.11662118, y: 3.879622, z: 0}
-  - {x: -0.07721684, y: 3.7057447, z: 0}
+  - {x: -0.07721684, y: 3.7057445, z: 0}
-  - {x: -0.03781248, y: 3.5533109, 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.08040057, y: 3.2246761, z: 0}
@@ -1910,14 +1910,14 @@ LineRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_Positions:
-  - {x: -0.15602553, y: 4.074945, z: 0}
+  - {x: -0.15602553, y: 4.0749445, z: 0}
-  - {x: -0.18956745, y: 3.8764977, z: 0}
+  - {x: -0.18956745, y: 3.8764973, z: 0}
-  - {x: -0.22310936, y: 3.7000234, z: 0}
+  - {x: -0.22310936, y: 3.7000232, z: 0}
-  - {x: -0.25665125, y: 3.5455208, z: 0}
+  - {x: -0.25665125, y: 3.5455203, z: 0}
   - {x: -0.29019317, y: 3.412991, z: 0}
   - {x: -0.32373506, y: 3.3024335, z: 0}
-  - {x: -0.35727698, y: 3.2138486, z: 0}
+  - {x: -0.35727698, y: 3.2138484, z: 0}
-  - {x: -0.39081886, y: 3.147236, 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.4914446, y: 3.079233, z: 0}

Assets/Scripts/Minigames/DivingForPictures/DivingGameManager.cs

@@ -676,7 +676,7 @@ namespace Minigames.DivingForPictures
             {
                 //Instead of surfacingTimeline, play the outro cinematic
                 CinematicsManager.Instance.LoadAndPlayCinematic("SurfacingCinematic");
-                CinematicsManager.Instance.ShowCinematicBackground(true);
+                // TODO  CinematicsManager.Instance.ShowCinematicBackground(true);
                 //surfacingTimeline.Play();
                 //Logging.Debug("[DivingGameManager] Last tile left the screen, playing timeline");
 
@@ -698,6 +698,7 @@ namespace Minigames.DivingForPictures
                     monster.DespawnMonster();
                 }
             }
+            //TODO CinematicsManager.Instance.ShowGameOverScreen();
 
             activeMonsters.Clear();
 

Assets/Scripts/UI/DivingGameOverScreen.cs

@@ -0,0 +1,18 @@
+using Core;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class DivingGameOverScreen : MonoBehaviour
+{
+    // Start is called once before the first execution of Update after the MonoBehaviour is created
+    void Start()
+    {
+        
+    }
+
+    public void PlayAgain()
+    {
+        SceneManagerService.Instance.ReloadCurrentScene();
+        gameObject.SetActive(false);
+    }
+}

Assets/Scripts/UI/DivingGameOverScreen.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: b37e3dc225aa25143af8ab61f827ae8b