From e0f3c39997e4559eb88d88265695e7f4fe9b43f5 Mon Sep 17 00:00:00 2001 From: Marro64 Date: Mon, 22 Dec 2025 19:55:59 +0100 Subject: [PATCH] Put in all the sequences --- Assets/Scenes/PacMan.unity | 20 ++++++++++---------- Assets/Scripts/Sequences/BoardClear.cs | 21 ++++++++++++++++++++- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/Assets/Scenes/PacMan.unity b/Assets/Scenes/PacMan.unity index 5a76ebe..5e2fa55 100644 --- a/Assets/Scenes/PacMan.unity +++ b/Assets/Scenes/PacMan.unity @@ -2539,7 +2539,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} propertyPath: m_LocalPosition.y - value: -15.5 + value: -16 objectReference: {fileID: 0} - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} propertyPath: m_LocalPosition.z @@ -5881,7 +5881,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} propertyPath: m_LocalPosition.y - value: -16.5 + value: -17 objectReference: {fileID: 0} - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} propertyPath: m_LocalPosition.z @@ -19774,6 +19774,7 @@ Transform: - {fileID: 1429024914} - {fileID: 1516731745} - {fileID: 1387643237} + - {fileID: 1045119746} m_Father: {fileID: 1886023632} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &712932630 stripped @@ -20617,7 +20618,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} propertyPath: m_LocalPosition.y - value: -16.5 + value: -17 objectReference: {fileID: 0} - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} propertyPath: m_LocalPosition.z @@ -23682,7 +23683,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1045119746} - {fileID: 1959372908} m_Father: {fileID: 1886023632} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -29016,12 +29016,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1045119745} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4.266148, y: 14.909718, z: -30.038902} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 851913432} + m_Father: {fileID: 712073434} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1048580314 stripped Transform: @@ -35132,7 +35132,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} propertyPath: m_LocalPosition.y - value: -16.5 + value: -17 objectReference: {fileID: 0} - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} propertyPath: m_LocalPosition.z @@ -52610,7 +52610,7 @@ GameObject: m_Component: - component: {fileID: 1933482823} m_Layer: 0 - m_Name: Improve scary transition out of intermission 2 + m_Name: Intermission music / visuals continue until ready m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -55104,7 +55104,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &2026234130 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Sequences/BoardClear.cs b/Assets/Scripts/Sequences/BoardClear.cs index 3c16750..9570e83 100644 --- a/Assets/Scripts/Sequences/BoardClear.cs +++ b/Assets/Scripts/Sequences/BoardClear.cs @@ -37,7 +37,26 @@ namespace Marro.PacManUdon break; case 6: // Call handler for what should happen next - InsertTimeSequence(PacManTimeSequence.StartNewLevel); + PacManTimeSequence nextSequence; + switch (level) + { + case 2: + nextSequence = PacManTimeSequence.Intermission1; + break; + case 5: + nextSequence = PacManTimeSequence.Intermission2; + break; + case 9: + case 13: + case 17: + nextSequence = PacManTimeSequence.Intermission3; + break; + default: + nextSequence = PacManTimeSequence.StartNewLevel; + break; + } + + InsertTimeSequence(nextSequence); break; } }