tschesky/AppleHillsProduction
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP game over diving

Browse Source
This commit is contained in:
AlexanderT
2025-10-16 16:23:48 +02:00
parent 8c4f821865
commit eab8899720
7 changed files with 1185 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/AddressableAssetsData/AssetGroups/Cinematics.asset
View File

@@ -15,8 +15,8 @@ MonoBehaviour:
m_GroupName: Cinematics
m_GUID: 75e1f68b7bf77f34f8ad4aeab74d4244
m_SerializeEntries:
- m_GUID: 400e13ef8f17b5841acd92120f67a092
m_Address: MinigameOutroPlayable
- m_GUID: 10f0c6cee53c1364198438ae185f38fe
m_Address: SurfacingCinematic
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0

2
Assets/Art/Cinematics/Quarry/CinematicSprites.controller
View File

@@ -11,7 +11,7 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1764196853123557444}
m_Position: {x: 200, y: 0, z: 0}
m_Position: {x: 80, y: 290, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []

1042
Assets/Prefabs/Managers/CinematicsManager.prefab
View File

File diff suppressed because it is too large Load Diff

110
Assets/Prefabs/UI/Tutorial.prefab
View File

@@ -312,7 +312,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &4249054603034392046
Transform:
m_ObjectHideFlags: 0
@@ -559,6 +559,81 @@ 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
@@ -1045,6 +1120,7 @@ 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}
@@ -1238,3 +1314,35 @@ 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}

30
Assets/Scenes/MiniGames/DivingForPictures.unity
View File

@@ -342,10 +342,10 @@ 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.15785426, y: 3.7729874, z: 0}
- {x: -0.15602553, y: 4.0749445, z: 0}
- {x: -0.1566351, y: 3.9736376, z: 0}
- {x: -0.1572447, y: 3.8729854, z: 0}
- {x: -0.15785426, y: 3.772987, 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.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,10 +1367,10 @@ 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.15602553, y: 4.074945, z: 0}
- {x: -0.11662118, y: 3.8796225, z: 0}
- {x: -0.07721684, y: 3.7057447, z: 0}
- {x: -0.03781248, y: 3.5533109, 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.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.7000234, z: 0}
- {x: -0.25665125, y: 3.5455208, 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.35727698, y: 3.2138486, z: 0}
- {x: -0.39081886, y: 3.147236, 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}

15
Assets/Scripts/Cinematics/CinematicsManager.cs
View File

@@ -21,6 +21,7 @@ namespace Cinematics
private Image _cinematicSprites;
private bool _isCinematicPlaying = false;
public bool IsCinematicPlaying => _isCinematicPlaying;
public Image cinematicBackground;
// Dictionary to track addressable handles by PlayableDirector
private Dictionary<PlayableDirector, AsyncOperationHandle<PlayableAsset>> _addressableHandles
@@ -210,5 +211,19 @@ namespace Cinematics
// Use the new method with loading screen instead of direct load
await PlayCinematicWithLoadingScreen("IntroSequence");
}
public void ShowCinematicBackground(bool showCinematic)
{
if(showCinematic == true)
{
var _image = cinematicBackground.GetComponent<Image>();
_image.enabled = true;
}
if (showCinematic == false)
{
var _image = cinematicBackground.GetComponent<Image>();
_image.enabled = false;
}
}
}
}

5
Assets/Scripts/Minigames/DivingForPictures/DivingGameManager.cs
View File

@@ -203,6 +203,7 @@ namespace Minigames.DivingForPictures
}
OnMonsterSpawned += DoMonsterSpawned;
CinematicsManager.Instance.OnCinematicStopped += EndGame;
}
private void OnDestroy()
@@ -674,8 +675,8 @@ namespace Minigames.DivingForPictures
if (surfacingTimeline != null)
{
//Instead of surfacingTimeline, play the outro cinematic
Debug.Log("Why am I stuck??");
//CinematicsManager.Instance.LoadAndPlayCinematic("MinigameOutroPlayable");
CinematicsManager.Instance.LoadAndPlayCinematic("SurfacingCinematic");
CinematicsManager.Instance.ShowCinematicBackground(true);
//surfacingTimeline.Play();
//Logging.Debug("[DivingGameManager] Last tile left the screen, playing timeline");