diff --git a/Assets/Scenes/PacMan.unity b/Assets/Scenes/PacMan.unity index 1298bb8..ba728fd 100644 --- a/Assets/Scenes/PacMan.unity +++ b/Assets/Scenes/PacMan.unity @@ -2606,9 +2606,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1672574592} - - {fileID: 2005609925} + m_Children: [] m_Father: {fileID: 1886023632} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &106686679 @@ -22307,6 +22305,8 @@ Transform: - {fileID: 2841572} - {fileID: 1381489908} - {fileID: 963448677} + - {fileID: 1672574592} + - {fileID: 2005609925} m_Father: {fileID: 1886023632} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &712932630 stripped @@ -51541,12 +51541,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1672574591} 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: 106401850} + m_Father: {fileID: 712073434} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1673553850 GameObject: @@ -62172,12 +62172,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2005609924} 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: 106401850} + m_Father: {fileID: 712073434} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &2008316875 stripped Transform: diff --git a/Assets/Scripts/Intermission2Pole.cs b/Assets/Scripts/Intermission2Pole.cs index 82af9c3..6dccbb3 100644 --- a/Assets/Scripts/Intermission2Pole.cs +++ b/Assets/Scripts/Intermission2Pole.cs @@ -2,6 +2,7 @@ using UnityEngine; using VRC.SDKBase; using VRC.Udon; +using static Cinemachine.DocumentationSortingAttribute; namespace Marro.PacManUdon { @@ -34,6 +35,7 @@ namespace Marro.PacManUdon _ghost = ghost; _gameManager = gameManager; _animator = GetComponent(); + SetActive(false); // Should only activate for intermission 2 Reset(); } @@ -41,11 +43,11 @@ namespace Marro.PacManUdon { _lastUpdate = PoleStrechLevels.None; SetStrechLevel(PoleStrechLevels.None); - SetActive(false); // Should only activate for intermission 2 } public void SetActive(bool isActive) { + Debug.Log($"({nameof(PacManUdon)} {nameof(Intermission2Pole)}) SetActive {isActive}."); gameObject.SetActive(isActive); } @@ -113,6 +115,7 @@ namespace Marro.PacManUdon public void SetStrechLevel(PoleStrechLevels level) { + Debug.Log($"({nameof(PacManUdon)} {nameof(Intermission2Pole)}) Set strech level to {level}."); _animator.SetFloat("Strech", GetAnimatorValueForStrechLevel(level)); } diff --git a/Assets/Scripts/Sequences/Intermission2.cs b/Assets/Scripts/Sequences/Intermission2.cs index 8a1a034..5fc4668 100644 --- a/Assets/Scripts/Sequences/Intermission2.cs +++ b/Assets/Scripts/Sequences/Intermission2.cs @@ -19,8 +19,8 @@ namespace Marro.PacManUdon case 1: // Show pole SetIntermissionScreenVisible(true); - intermission2Pole.Reset(); intermission2Pole.SetActive(true); + intermission2Pole.Reset(); break; case 2: // Start music diff --git a/Assets/Scripts/Sequences/StartNewLevel.cs b/Assets/Scripts/Sequences/StartNewLevel.cs index 47c886f..5d6a1ae 100644 --- a/Assets/Scripts/Sequences/StartNewLevel.cs +++ b/Assets/Scripts/Sequences/StartNewLevel.cs @@ -18,6 +18,7 @@ namespace Marro.PacManUdon // Increment level, show ready, show pellets, show lives indicators IncrementLevel(); statusDisplay.SetExtraLivesDisplayVisible(true); + statusDisplay.SetLevelDisplayVisible(true); statusDisplay.SetReadyTextVisible(true); SetPelletsActive(true); break;