Cinematics and UI overhaul

Assets/Data/Bootstrap/Runtime/CustomBootSettings_Runtime.asset

@@ -27,3 +27,4 @@ MonoBehaviour:
   - {fileID: 9076822654798104907, guid: 4684df63af6398f4f9f624a35023f8d2, type: 3}
   - {fileID: 3863019143023165617, guid: 774e30e3f0b1d0d49bad0c2abf11038a, type: 3}
   - {fileID: 5034240524438268576, guid: b15ba9d3d508ef244b0eeb76404dc9de, type: 3}
+  - {fileID: 7207007194116694737, guid: 7180ae585f0db8044ba048426f72d995, type: 3}

Assets/Prefabs/Managers/CinematicSprites.prefab

@@ -0,0 +1,267 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3880639403919980708
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 491766053509356801}
+  - component: {fileID: 8990835369174097178}
+  - component: {fileID: 4081412022221009731}
+  - component: {fileID: 7110521945075217718}
+  - component: {fileID: 7238901747877844110}
+  m_Layer: 5
+  m_Name: CinematicSprites
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &491766053509356801
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3880639403919980708}
+  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: 5590617373016130179}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8990835369174097178
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3880639403919980708}
+  m_CullTransparentMesh: 1
+--- !u!114 &4081412022221009731
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3880639403919980708}
+  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: 21300000, guid: 521b8943618ee4941a59b55cba521053, 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!95 &7110521945075217718
+Animator:
+  serializedVersion: 7
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3880639403919980708}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: e2a3b3586acd1ea4097d75c6f7d0cf0a, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_AnimatePhysics: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &7238901747877844110
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3880639403919980708}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5526348c1593f9b43987b0edcaccdd24, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: '::'
+  holdDuration: 1
+  radialProgressBar: {fileID: 7802237016353117620}
+--- !u!1 &4881325085870413093
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8394866771001925093}
+  - component: {fileID: 6474291411781573184}
+  - component: {fileID: 3495568374332906101}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8394866771001925093
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4881325085870413093}
+  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: 5590617373016130179}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.2, y: 0.2}
+  m_AnchorMax: {x: 0.8, y: 0.8}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6474291411781573184
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4881325085870413093}
+  m_CullTransparentMesh: 1
+--- !u!114 &3495568374332906101
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4881325085870413093}
+  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: -5941552768301239376, guid: 300528d856c15824989bade57a7e04e4, 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 &8647185569012928468
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5590617373016130179}
+  - component: {fileID: 5038311757077579968}
+  - component: {fileID: 7802237016353117620}
+  m_Layer: 5
+  m_Name: SkipProgress
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5590617373016130179
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8647185569012928468}
+  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: 8394866771001925093}
+  m_Father: {fileID: 491766053509356801}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -56, y: 64}
+  m_SizeDelta: {x: 250, y: 250}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &5038311757077579968
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8647185569012928468}
+  m_CullTransparentMesh: 1
+--- !u!114 &7802237016353117620
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8647185569012928468}
+  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: 2758595457390328306, guid: bcd3fab43168dbd43a286294c6cc7838, type: 3}
+  m_Type: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 0
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1

Assets/Prefabs/Managers/CinematicSprites.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 28ef853079fd9524f970703cd64bd0c0
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Managers/CinematicsManager.prefab

@@ -642,8 +642,6 @@ RectTransform:
   m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 4978134902377398530}
-  - {fileID: 5494371867874695937}
   - {fileID: 5708275729410901669}
   m_Father: {fileID: 5006436358316225511}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -725,7 +723,6 @@ GameObject:
   m_Component:
   - component: {fileID: 5006436358316225511}
   - component: {fileID: 4093256939237236730}
-  - component: {fileID: 291412605997816487}
   m_Layer: 0
   m_Name: CinematicsManager
   m_TagString: Untagged
@@ -761,47 +758,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4e3cd69fd77a22640aa40e691d8d6c26, type: 3}
   m_Name: 
   m_EditorClassIdentifier: AppleHillsScripts::CinematicsManager
-  cinematicSpritesGameObject: {fileID: 9166576207668444836}
+  cinematicSpritesGameObject: {fileID: 0}
-  cinematicBackground: {fileID: 3837694223035649714}
+  cinematicBackground: {fileID: 0}
   divingGameOverScreen: {fileID: 7927991410039509668}
-  playableDirector: {fileID: 291412605997816487}
+  playableDirector: {fileID: 0}
---- !u!320 &291412605997816487
-PlayableDirector:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2755712733105741372}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_PlayableAsset: {fileID: 11400000, guid: 10f0c6cee53c1364198438ae185f38fe, type: 2}
-  m_InitialState: 0
-  m_WrapMode: 2
-  m_DirectorUpdateMode: 2
-  m_InitialTime: 0
-  m_SceneBindings:
-  - key: {fileID: -38993752814118673, guid: bf4679c9d0eb0994d9e0de37c045e99b, type: 2}
-    value: {fileID: 2900690403017929526}
-  - key: {fileID: 7845336411882145130, guid: 99c48feb9d744ba4eb579c3b631b9257, type: 2}
-    value: {fileID: 2900690403017929526}
-  - key: {fileID: -8222318252314758605, guid: bf4679c9d0eb0994d9e0de37c045e99b, type: 2}
-    value: {fileID: 0}
-  - key: {fileID: 7536617106820686252, guid: 10f0c6cee53c1364198438ae185f38fe, type: 2}
-    value: {fileID: 0}
-  - key: {fileID: 8636189198204744120, guid: 10f0c6cee53c1364198438ae185f38fe, type: 2}
-    value: {fileID: 2900690403017929526}
-  - key: {fileID: 139419469794405637, guid: bf4679c9d0eb0994d9e0de37c045e99b, type: 2}
-    value: {fileID: 0}
-  - key: {fileID: 8785081636201331406, guid: 400e13ef8f17b5841acd92120f67a092, type: 2}
-    value: {fileID: 0}
-  - key: {fileID: -446339716597930989, guid: 400e13ef8f17b5841acd92120f67a092, type: 2}
-    value: {fileID: 2900690403017929526}
-  - key: {fileID: -5410086080836277403, guid: 10f0c6cee53c1364198438ae185f38fe, type: 2}
-    value: {fileID: 0}
-  - key: {fileID: -427775867803860694, guid: 10f0c6cee53c1364198438ae185f38fe, type: 2}
-    value: {fileID: 0}
-  m_ExposedReferences:
-    m_References: []
 --- !u!1 &3025814654250773583
 GameObject:
   m_ObjectHideFlags: 0
@@ -938,158 +898,6 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &3669323127008070100
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 538506048417711235}
-  - component: {fileID: 1082932495279705792}
-  - component: {fileID: 2786577800096043956}
-  m_Layer: 5
-  m_Name: SkipProgress
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &538506048417711235
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3669323127008070100}
-  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: 4498104668003212261}
-  m_Father: {fileID: 5494371867874695937}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -56, y: 64}
-  m_SizeDelta: {x: 250, y: 250}
-  m_Pivot: {x: 1, y: 0}
---- !u!222 &1082932495279705792
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3669323127008070100}
-  m_CullTransparentMesh: 1
---- !u!114 &2786577800096043956
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3669323127008070100}
-  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: 2758595457390328306, guid: bcd3fab43168dbd43a286294c6cc7838, type: 3}
-  m_Type: 3
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 0
-  m_FillClockwise: 1
-  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:
-  - {fileID: 9195361253609918804}
-  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.0025634766, y: -1380.1166}
-  m_SizeDelta: {x: 1920, y: 1399.7874}
-  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 &3907121777593230662
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/Managers/PlayerHUD.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7180ae585f0db8044ba048426f72d995
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/UI/AppSwitcher/AppSwitcher.prefab

@@ -279,7 +279,6 @@ GameObject:
   m_Component:
   - component: {fileID: 1315170081792486277}
   - component: {fileID: 6669614972729775195}
-  - component: {fileID: 1702317823502492223}
   - component: {fileID: 2981106092574900430}
   - component: {fileID: 8074691980395114238}
   - component: {fileID: 1630362919770549177}
@@ -336,29 +335,6 @@ Canvas:
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
---- !u!114 &1702317823502492223
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1498581815400593087}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.CanvasScaler
-  m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
 --- !u!114 &2981106092574900430
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Prefabs/UI/IntroSequence.prefab

@@ -0,0 +1,138 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5026598641267297246
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 499805009927302532}
+  - component: {fileID: 8952193833593986238}
+  - component: {fileID: 1768742023768591015}
+  - component: {fileID: 4794855098771415437}
+  - component: {fileID: 1827255458430098390}
+  - component: {fileID: 1619383145738161903}
+  m_Layer: 5
+  m_Name: IntroSequence
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &499805009927302532
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5026598641267297246}
+  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_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, y: 0}
+  m_SizeDelta: {x: 1920, y: 1080}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &8952193833593986238
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5026598641267297246}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c119ffb87b2a16d4f925ff5d5ffd7092, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  shouldPlayIntro: 0
+--- !u!222 &1768742023768591015
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5026598641267297246}
+  m_CullTransparentMesh: 1
+--- !u!114 &4794855098771415437
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5026598641267297246}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_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!320 &1827255458430098390
+PlayableDirector:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5026598641267297246}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_PlayableAsset: {fileID: 11400000, guid: bf4679c9d0eb0994d9e0de37c045e99b, type: 2}
+  m_InitialState: 0
+  m_WrapMode: 2
+  m_DirectorUpdateMode: 1
+  m_InitialTime: 0
+  m_SceneBindings:
+  - key: {fileID: -38993752814118673, guid: bf4679c9d0eb0994d9e0de37c045e99b, type: 2}
+    value: {fileID: 1619383145738161903}
+  - key: {fileID: -8222318252314758605, guid: bf4679c9d0eb0994d9e0de37c045e99b, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 139419469794405637, guid: bf4679c9d0eb0994d9e0de37c045e99b, type: 2}
+    value: {fileID: 0}
+  m_ExposedReferences:
+    m_References: []
+--- !u!95 &1619383145738161903
+Animator:
+  serializedVersion: 7
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5026598641267297246}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 052a4fbd53390314ba2bb3878a81b01e, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_AnimatePhysics: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0

Assets/Prefabs/UI/IntroSequence.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d1074dd38c3c50f4ca1454dbd60e44f6
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Bootstrap/BootSceneController.cs

@@ -81,7 +81,9 @@ namespace Bootstrap
                 LogDebugMessage("Attempting to play intro cinematic");
 
                 // Use LoadAndPlayCinematic to play the intro sequence
-                CinematicsManager.Instance.LoadAndPlayCinematic("IntroSequence");
+                CinematicsManager.Instance.LoadAndPlayCinematic("IntroSequence", false);
+                CinematicsManager.Instance.ChangeCinematicBackgroundColour(new Color(0f, 0f, 0f, 1f));
+                //PlayerHudManager.Instance.ResizeCinematicPlayer();
 
                 // Immediately unload the StartingScene - no need to wait for cinematic to finish
                 // since CinematicsManager is bootstrapped and won't be unloaded

Assets/Scripts/Cinematics/CinematicsManager.cs

@@ -80,28 +80,30 @@ namespace Cinematics
             // Initialize PlayableDirector if not set
             if (playableDirector == null)
             {
-                playableDirector = GetComponent<PlayableDirector>();
+                playableDirector = PlayerHudManager.Instance.playableDirector;
                 
                 // If still null, try to add the component
                 if (playableDirector == null)
                 {
-                    playableDirector = gameObject.AddComponent<PlayableDirector>();
+                    Debug.Log("[CinematicsManager] Could not find Playable Director on the PlayerHudManager");
-                    Debug.Log("[CinematicsManager] Added missing PlayableDirector component");
                 }
             }
             
             // Initialize _cinematicSprites if not set
             if (_cinematicSprites == null)
             {
-                // First try to find in children
+                // First try to find in children in the PlayerHud
-                _cinematicSprites = GetComponentInChildren<Image>(true);
+                _cinematicSprites = PlayerHudManager.Instance.cinematicSprites;
                 
-                // If still null, create a new UI Image for cinematics
+                // If still null, return error
                 if (_cinematicSprites == null)
                 {
                     Debug.LogWarning("[CinematicsManager] No Image found for cinematics display. Cinematics may not display correctly.");
                 }
             }
+
+            cinematicSpritesGameObject = PlayerHudManager.Instance.currentCinematicPlayer;
+            cinematicBackground = PlayerHudManager.Instance.CinematicBackground;
         }
         
         /// <summary>
@@ -117,6 +119,7 @@ namespace Cinematics
                 _cinematicSprites.enabled = true;
                 cinematicSpritesGameObject.SetActive(true);
             }
+            cinematicBackground.SetActive(true);
             
             playableDirector.stopped += OnPlayableDirectorStopped;
             playableDirector.Play(assetToPlay);
@@ -141,7 +144,7 @@ namespace Cinematics
         /// <summary>
         /// Loads a playable from an asset path and plays it as a cinematic
         /// </summary>
-        public PlayableDirector LoadAndPlayCinematic(string key)
+        public PlayableDirector LoadAndPlayCinematic(string key, bool playPortraitMode)
         {
             // Load the asset via addressables
             var handle = Addressables.LoadAssetAsync<PlayableAsset>(key);
@@ -152,6 +155,7 @@ namespace Cinematics
             
             Logging.Debug($"[CinematicsManager] Loaded addressable cinematic: {key}");
             
+            PlayerHudManager.Instance.SetPortraitMode(playPortraitMode);
             return PlayCinematic(result);
         }
 
@@ -217,5 +221,12 @@ namespace Cinematics
                 Logging.Warning("[CinematicsManager] DivingGameOverScreen reference is not set!");
             }
         }
+
+        public void ChangeCinematicBackgroundColour(Color clr)
+        {
+            PlayerHudManager.Instance.cinematicBackgroundSprites.color = clr;
         }
     }
+
+
+}

Assets/Scripts/Minigames/DivingForPictures/DivingGameManager.cs

@@ -14,6 +14,7 @@ using UI.Core;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.Playables;
+using Svg;
 
 namespace Minigames.DivingForPictures
 {
@@ -627,8 +628,9 @@ namespace Minigames.DivingForPictures
             {
                 //Instead of surfacingTimeline, play the outro cinematic
                 deathAudioPlayer.Stop();
-                CinematicsManager.Instance.LoadAndPlayCinematic("SurfacingCinematic");
+                CinematicsManager.Instance.LoadAndPlayCinematic("SurfacingCinematic",true);
-                CinematicsManager.Instance.ShowCinematicBackground(true);
+                CinematicsManager.Instance.ChangeCinematicBackgroundColour(new Color(0.5058824f, 0.7803922f, 0.8862746f, 1f));
+                //PlayerHudManager.Instance.ResizeCinematicPlayer();
                 //surfacingTimeline.Play();
                 //Logging.Debug("[DivingGameManager] Last tile left the screen, playing timeline");
 

Assets/Scripts/UI/PlayerHudManager.cs

@@ -0,0 +1,84 @@
+using Bootstrap;
+using Cinematics;
+using UnityEngine;
+using Core;
+using System;
+using UnityEngine.UI;
+using UnityEngine.Playables;
+
+public class PlayerHudManager : MonoBehaviour
+{
+    private AppSwitcher _appSwitcher;
+    public GameObject landscapeObject;
+    public GameObject portraitObject;
+    public GameObject cinematicsParentObject;
+    public GameObject CinematicBackground;
+
+    [HideInInspector] public Image cinematicSprites;
+    [HideInInspector] public Image cinematicBackgroundSprites;
+
+    [HideInInspector] public GameObject currentCinematicPlayer;
+
+    [HideInInspector] public PlayableDirector playableDirector;
+
+
+
+    private static PlayerHudManager _instance;
+
+
+    public static PlayerHudManager Instance => _instance;
+    private void Awake()
+    {
+        if (Instance != null)
+        {
+            Destroy(this);
+            return;
+        }
+
+        _instance = this;
+
+        // Register for post-boot initialization
+        BootCompletionService.RegisterInitAction(InitializePostBoot);
+    }
+
+    private void InitializeReferences()
+    {
+        cinematicSprites = currentCinematicPlayer.GetComponent<Image>();
+        cinematicBackgroundSprites = CinematicBackground.GetComponent<Image>();
+        playableDirector = cinematicsParentObject.GetComponent<PlayableDirector>();
+    }
+
+    private void InitializePostBoot()
+    {
+        // Initialize any dependencies that require other services to be ready
+        // For example, subscribe to SceneManagerService events if needed
+
+        
+        Logging.Debug("[PlayerHudManager] Post-boot initialization complete");
+    }
+
+    private void OnEnable()
+    {
+        // Subscribe to application quit event to ensure cleanup
+        Application.quitting += OnApplicationQuit;
+    }
+
+    private void OnApplicationQuit()
+    {
+    }
+
+    public void SetPortraitMode(bool portraitModeEnable)
+    {
+        if (portraitModeEnable)
+        {
+            currentCinematicPlayer = portraitObject;
+            InitializeReferences();
+
+        }
+        else 
+        {
+            currentCinematicPlayer = landscapeObject;
+            InitializeReferences();
+        }
+    }
+}

Assets/Scripts/UI/PlayerHudManager.cs.meta

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