From 43ee68dc447d6ae44c8d2d22b427185f543d38b0 Mon Sep 17 00:00:00 2001 From: Marro64 Date: Mon, 22 Dec 2025 22:40:44 +0100 Subject: [PATCH] Removed RECORDING_DEMO from ghost --- Assets/Scenes/PacMan.unity | 50 +++++++++++++-------------- Assets/Scripts/Ghost.cs | 5 ++- ProjectSettings/ProjectSettings.asset | 2 +- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/Assets/Scenes/PacMan.unity b/Assets/Scenes/PacMan.unity index 5e2fa55..8581115 100644 --- a/Assets/Scenes/PacMan.unity +++ b/Assets/Scenes/PacMan.unity @@ -2444,12 +2444,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 99960226} 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 &100590570 stripped Transform: @@ -2509,12 +2509,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 339867315} - - {fileID: 462995872} - - {fileID: 99960227} - - {fileID: 1804101362} - - {fileID: 1750460165} + m_Children: [] m_Father: {fileID: 1886023632} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &106686679 @@ -9701,12 +9696,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 339867314} 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!1001 &342587691 PrefabInstance: @@ -12850,12 +12845,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 462995871} 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!1001 &465548780 PrefabInstance: @@ -19775,6 +19770,11 @@ Transform: - {fileID: 1516731745} - {fileID: 1387643237} - {fileID: 1045119746} + - {fileID: 1750460165} + - {fileID: 1804101362} + - {fileID: 462995872} + - {fileID: 339867315} + - {fileID: 99960227} m_Father: {fileID: 1886023632} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &712932630 stripped @@ -22610,6 +22610,7 @@ Transform: - {fileID: 1033118942} - {fileID: 196434888} - {fileID: 1933482823} + - {fileID: 1959372908} m_Father: {fileID: 1886023632} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &808835976 @@ -23682,8 +23683,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1959372908} + m_Children: [] m_Father: {fileID: 1886023632} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &857863772 @@ -48606,12 +48606,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1750460164} 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!1001 &1750680546 PrefabInstance: @@ -50099,12 +50099,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1804101361} 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!1001 &1805013752 PrefabInstance: @@ -53384,7 +53384,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1959372907} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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 @@ -53392,7 +53392,7 @@ Transform: - {fileID: 1597946119} - {fileID: 989504236} - {fileID: 228709991} - m_Father: {fileID: 851913432} + m_Father: {fileID: 806746267} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1959684378 PrefabInstance: diff --git a/Assets/Scripts/Ghost.cs b/Assets/Scripts/Ghost.cs index 62521a6..8e3e79d 100644 --- a/Assets/Scripts/Ghost.cs +++ b/Assets/Scripts/Ghost.cs @@ -667,9 +667,8 @@ namespace Marro.PacManUdon if (reverseDirection && this.scattering != scattering) { if (ghostState == PacManGhostState.Normal || ghostState == PacManGhostState.Home || ghostState == PacManGhostState.Exiting -#if RECORDING_DEMO - || ghostState == PacManGhostState.Entering // This is afaik not normal PacMan behaviour, but is needed to accomidate slight timing differences -#endif + // This is afaik not normal PacMan behaviour, but is needed to accomidate slight timing differences + || ghostState == PacManGhostState.Entering && ghostManager.gameController.GameState == PacManGameState.AttractModeDemo ) { turnAroundSoon = true; diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 6d2f274..02a073d 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -511,7 +511,7 @@ PlayerSettings: m_Automatic: 0 - m_BuildTarget: iOSSupport m_APIs: 10000000 - m_Automatic: 0 + m_Automatic: 1 - m_BuildTarget: WindowsStandaloneSupport m_APIs: 02000000 m_Automatic: 0