From c41491e55ecc4f753e42d20a72953c12222969d8 Mon Sep 17 00:00:00 2001 From: Marro64 Date: Thu, 15 Jan 2026 23:00:15 +0100 Subject: [PATCH] Initial progress syncing + many existing bugs --- Assets/Scenes/PacMan.unity | 253 +++++++++--------- Assets/Scripts/GameManager.cs | 39 ++- Assets/Scripts/GhostManager.cs | 10 +- Assets/Scripts/GridMover.cs | 16 +- Assets/Scripts/Intermission2Pole.cs | 6 + Assets/Scripts/Maze.asset | 106 ++++++-- Assets/Scripts/Maze.cs | 3 +- Assets/Scripts/NetworkManager.cs | 30 ++- Assets/Scripts/PacMan.cs | 38 ++- Assets/Scripts/Sequences/Intermission2.cs | 1 + .../Scripts/Sequences/TimeSequenceShared.cs | 73 +++-- 11 files changed, 345 insertions(+), 230 deletions(-) diff --git a/Assets/Scenes/PacMan.unity b/Assets/Scenes/PacMan.unity index d641c56..4e3fd6e 100644 --- a/Assets/Scenes/PacMan.unity +++ b/Assets/Scenes/PacMan.unity @@ -1508,6 +1508,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 63452442} + networkManager: {fileID: 0} --- !u!95 &63452444 Animator: serializedVersion: 5 @@ -4924,6 +4925,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 174205108} + networkManager: {fileID: 811840793} mazes: - {fileID: 973113517} pacMan: {fileID: 63452443} @@ -4937,7 +4939,7 @@ MonoBehaviour: playerInput: {fileID: 1311215816} demo: {fileID: 2057800960} soundManager: {fileID: 723443146} - networkManager: {fileID: 811840793} + networkManagerSetup: {fileID: 0} recorder: {fileID: 786035079} startingExtraLives: 3 scoreToExtraLife: 10000 @@ -9448,11 +9450,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1315692994360949719, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} m_PrefabInstance: {fileID: 843979371} m_PrefabAsset: {fileID: 0} ---- !u!1 &290681268 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} - m_PrefabInstance: {fileID: 1435441348} - m_PrefabAsset: {fileID: 0} --- !u!1 &291096816 GameObject: m_ObjectHideFlags: 0 @@ -11347,6 +11344,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 357748366} + networkManager: {fileID: 0} start: {fileID: 992156376} end: {fileID: 312606797} mode: 2 @@ -13965,7 +13963,7 @@ GameObject: m_Component: - component: {fileID: 453407310} m_Layer: 0 - m_Name: Targets + m_Name: GhostTargets m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -13985,10 +13983,10 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6700954391476675076} - - {fileID: 1435441349} + - {fileID: 561087143} - {fileID: 962421290} - {fileID: 1628047756} - - {fileID: 561087143} + - {fileID: 1435441349} - {fileID: 1169631398} - {fileID: 995791607} - {fileID: 1422201680} @@ -16656,6 +16654,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 527776390} + networkManager: {fileID: 0} start: {fileID: 992156376} end: {fileID: 312606797} mode: 1 @@ -16745,11 +16744,6 @@ Transform: m_Children: [] m_Father: {fileID: 1003947896} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &528223655 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} - m_PrefabInstance: {fileID: 561087142} - m_PrefabAsset: {fileID: 0} --- !u!4 &529072529 stripped Transform: m_CorrespondingSourceObject: {fileID: 1315692994360949719, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} @@ -16902,11 +16896,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} ---- !u!1 &537174290 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} - m_PrefabInstance: {fileID: 252759757} - m_PrefabAsset: {fileID: 0} --- !u!1 &537852066 GameObject: m_ObjectHideFlags: 0 @@ -17520,7 +17509,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} propertyPath: m_Name - value: PinkyCorner + value: BlinkyCorner objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -18186,6 +18175,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 573616888} + networkManager: {fileID: 0} --- !u!1001 &573761182 PrefabInstance: m_ObjectHideFlags: 0 @@ -18843,6 +18833,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 586011051} + networkManager: {fileID: 0} --- !u!1 &586473939 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4099390335584803315, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} @@ -21179,11 +21170,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1315692994360949719, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} m_PrefabInstance: {fileID: 1883296732} m_PrefabAsset: {fileID: 0} ---- !u!1 &696524444 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} - m_PrefabInstance: {fileID: 1628047755} - m_PrefabAsset: {fileID: 0} --- !u!1 &696573218 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4099390335584803315, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} @@ -22547,6 +22533,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 723443145} + networkManager: {fileID: 0} audioSourcePacMan: {fileID: 1747271710} audioSourceGhosts: {fileID: 418715426} audioSourceExtraLife: {fileID: 1036453364} @@ -25349,13 +25336,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 811840792} - syncedObjects: - - {fileID: 174205109} - - {fileID: 63452443} - - {fileID: 1237257558} - - {fileID: 1910438138} - - {fileID: 1407423087} - - {fileID: 1541737191} + root: {fileID: 1170168278} delay: 1 maxEventSendTries: 3 pingDelay: 0.3 @@ -26933,11 +26914,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1315692994360949719, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} m_PrefabInstance: {fileID: 45736035} m_PrefabAsset: {fileID: 0} ---- !u!1 &869942276 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} - m_PrefabInstance: {fileID: 428355819} - m_PrefabAsset: {fileID: 0} --- !u!1001 &870405197 PrefabInstance: m_ObjectHideFlags: 0 @@ -27764,6 +27740,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 905219926} + networkManager: {fileID: 0} --- !u!65 &905219928 BoxCollider: m_ObjectHideFlags: 0 @@ -29078,6 +29055,7 @@ Transform: - {fileID: 140466955} - {fileID: 540296258} - {fileID: 1777057123} + - {fileID: 1381923126} - {fileID: 453407310} - {fileID: 1400026974} - {fileID: 667019553} @@ -29133,22 +29111,23 @@ MonoBehaviour: SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 973113516} mazeBoundaries: {x: 38, y: 31} - ghostTargets: - - {fileID: 1849509644} - - {fileID: 1393993881} - - {fileID: 696524444} - - {fileID: 528223655} - - {fileID: 1393993881} - - {fileID: 696524444} - - {fileID: 290681268} - - {fileID: 2129103899} - - {fileID: 1136081918} - - {fileID: 1178476058} - - {fileID: 869942276} - - {fileID: 1731943105} - - {fileID: 537174290} pelletContainer: {fileID: 1777057122} mazeSprite: {fileID: 140466951} + ghostTargets: + - {fileID: 6700954391476675076} + - {fileID: 962421290} + - {fileID: 1628047756} + - {fileID: 561087143} + - {fileID: 962421290} + - {fileID: 1628047756} + - {fileID: 1435441349} + - {fileID: 1169631398} + - {fileID: 995791607} + - {fileID: 1422201680} + - {fileID: 428355820} + - {fileID: 784242305} + - {fileID: 252759758} + pacManStart: {fileID: 1381923126} --- !u!1001 &973123592 PrefabInstance: m_ObjectHideFlags: 0 @@ -35595,11 +35574,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} ---- !u!1 &1136081918 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} - m_PrefabInstance: {fileID: 995791606} - m_PrefabAsset: {fileID: 0} --- !u!1 &1137161690 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4099390335584803315, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} @@ -36325,6 +36299,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1156754005} + networkManager: {fileID: 0} start: {fileID: 992156376} end: {fileID: 312606797} mode: 0 @@ -36976,11 +36951,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1315692994360949719, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} m_PrefabInstance: {fileID: 1453081378} m_PrefabAsset: {fileID: 0} ---- !u!1 &1178476058 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} - m_PrefabInstance: {fileID: 1422201679} - m_PrefabAsset: {fileID: 0} --- !u!4 &1183921349 stripped Transform: m_CorrespondingSourceObject: {fileID: 1315692994360949719, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} @@ -37771,10 +37741,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1200574209} - syncedObjects: - - {fileID: 1156754006} - - {fileID: 527776391} - - {fileID: 357748371} + root: {fileID: 0} delay: 1 maxEventSendTries: 3 pingDelay: 0.3 @@ -38848,17 +38815,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 140452431933686981, guid: 5cb7233bb90971d45b4f876816f8ca1e, type: 3} m_PrefabInstance: {fileID: 1596065648129789765} m_PrefabAsset: {fileID: 0} ---- !u!114 &1237257558 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7954158839068841090, guid: 5cb7233bb90971d45b4f876816f8ca1e, type: 3} - m_PrefabInstance: {fileID: 1596065648129789765} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 384558790} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5ca6f74362dcf8a46b2ad3ec99e38719, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1239823326 PrefabInstance: m_ObjectHideFlags: 0 @@ -43035,6 +42991,84 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} +--- !u!1001 &1381923125 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 973113515} + m_Modifications: + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalPosition.x + value: 13.5 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalPosition.y + value: -23 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_Name + value: PacManStart + objectReference: {fileID: 0} + - target: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f10209aafcd484f438cbd0888287e98a, type: 3} +--- !u!4 &1381923126 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + m_PrefabInstance: {fileID: 1381923125} + m_PrefabAsset: {fileID: 0} --- !u!4 &1382225361 stripped Transform: m_CorrespondingSourceObject: {fileID: 561101371242997875, guid: 9fbd72f5bc3c5434a87ab8539789c584, type: 3} @@ -43335,11 +43369,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 1872706630021487550, guid: 5cb7233bb90971d45b4f876816f8ca1e, type: 3} m_PrefabInstance: {fileID: 2218844481743558001} m_PrefabAsset: {fileID: 0} ---- !u!1 &1393993881 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} - m_PrefabInstance: {fileID: 962421289} - m_PrefabAsset: {fileID: 0} --- !u!1 &1394104185 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4099390335584803315, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} @@ -43735,17 +43764,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 1 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &1407423087 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7954158839068841090, guid: 5cb7233bb90971d45b4f876816f8ca1e, type: 3} - m_PrefabInstance: {fileID: 6232248010811487649} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1407423078} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5ca6f74362dcf8a46b2ad3ec99e38719, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &1408125383 stripped Transform: m_CorrespondingSourceObject: {fileID: 1315692994360949719, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} @@ -45003,7 +45021,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} propertyPath: m_Name - value: BlinkyCorner + value: PinkyCorner objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -47547,6 +47565,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1539035117} + networkManager: {fileID: 0} scoreDisplayGroup: {fileID: 2135605378} label1UPText: {fileID: 968783086} score1UPText: {fileID: 254787490} @@ -47708,17 +47727,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 1 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &1541737191 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7954158839068841090, guid: 5cb7233bb90971d45b4f876816f8ca1e, type: 3} - m_PrefabInstance: {fileID: 2218844481743558001} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 262522556} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5ca6f74362dcf8a46b2ad3ec99e38719, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1544898141 PrefabInstance: m_ObjectHideFlags: 0 @@ -53053,11 +53061,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1315692994360949719, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} m_PrefabInstance: {fileID: 1790059860} m_PrefabAsset: {fileID: 0} ---- !u!1 &1731943105 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} - m_PrefabInstance: {fileID: 784242304} - m_PrefabAsset: {fileID: 0} --- !u!1 &1732257397 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4099390335584803315, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} @@ -54005,10 +54008,13 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2541243872366204002, guid: 7168d13094fcae94b81e672d1f4ab73f, type: 2} + - {fileID: 10758, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: d77dfda7d2b90ea4983b8659e2c6c0e9, type: 2} - - {fileID: 2100000, guid: 27754be47f0109d4ebd0238a3abcab08, type: 2} - - {fileID: 2100000, guid: 0dd5569666c2c954da72d06b96c639f0, type: 2} + - {fileID: 2100000, guid: a3869014ba4893d409f150224856180a, type: 2} + - {fileID: 2100000, guid: fc67956adbc95584ba3ae3b18d1e430d, type: 2} + - {fileID: 2100000, guid: ae0c7562e66fca1469f7ee603e462581, type: 2} - {fileID: 2100000, guid: db2b6d76bdd134244912a5c1c9971804, type: 2} LightMapsNear: [] LightMapsFar: [] @@ -56087,6 +56093,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1777057125} + networkManager: {fileID: 0} --- !u!1 &1777719727 GameObject: m_ObjectHideFlags: 0 @@ -57718,11 +57725,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 2 m_SpriteSortPoint: 0 ---- !u!1 &1849509644 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} - m_PrefabInstance: {fileID: 6700954391476675075} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1849933512 PrefabInstance: m_ObjectHideFlags: 0 @@ -59029,17 +59031,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 1 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &1910438138 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7954158839068841090, guid: 5cb7233bb90971d45b4f876816f8ca1e, type: 3} - m_PrefabInstance: {fileID: 501294857464887915} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1592985534} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5ca6f74362dcf8a46b2ad3ec99e38719, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1912111465 PrefabInstance: m_ObjectHideFlags: 0 @@ -63468,6 +63459,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 2063054473} + networkManager: {fileID: 0} elroyLevel: 0 --- !u!114 &2063054473 MonoBehaviour: @@ -65177,11 +65169,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} ---- !u!1 &2129103899 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} - m_PrefabInstance: {fileID: 1169631397} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2129264531 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index e1c32b7..c0145b0 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -69,7 +69,7 @@ namespace Marro.PacManUdon networkManager.Initialize(); ghostManager.Initialize(maze.ghostTargets, pacMan, this); - pacMan.Initialize(playerInput, this); + pacMan.Initialize(playerInput, maze.pacManStart, this); bonusFruit.Initialize(); pelletManager.Initialize(); statusDisplay.Initialize(); @@ -112,6 +112,10 @@ namespace Marro.PacManUdon public void StartGameButtonPressed() { Debug.Log($"{gameObject} Start Game Button was pressed!"); + if (networkManager.IsOwner) + { + networkManager.SendEvent(NetworkEventType.StartGameButtonPressed); + } StartTimeSequence(PacManTimeSequence.StartNewGame); } @@ -197,6 +201,8 @@ namespace Marro.PacManUdon public void GotPowerPellet() { + Debug.Log($"{gameObject} GotPowerPellet"); + if (gameState == PacManGameState.AttractMode) { TimeSequenceSkipToNextStep(); @@ -224,6 +230,8 @@ namespace Marro.PacManUdon public void GhostCaught(int scoreBonus) { + Debug.Log($"{gameObject} GhostCaught"); + if (gameState == PacManGameState.AttractMode) { TimeSequenceSkipToNextStep(); @@ -237,7 +245,7 @@ namespace Marro.PacManUdon public void PacManCaught() { - StartTimeSequence(PacManTimeSequence.PacManCaught); + //StartTimeSequence(PacManTimeSequence.PacManCaught); } public void NoGhostsScared() @@ -252,6 +260,8 @@ namespace Marro.PacManUdon public void Intermission2PoleUpdate() { + Debug.Log($"{gameObject} Intermission2PoleUpdate"); + TimeSequenceSkipToNextStep(); } @@ -400,21 +410,26 @@ namespace Marro.PacManUdon public override void AppendSyncedData(byte[][] data, ref int offset, NetworkEventType eventType) { - data[offset++] = new byte[] { NetworkManager.Int32ToByte((int)gameState) }; - data[offset++] = BitConverter.GetBytes(currentlyInTimeSequence); - data[offset++] = new byte[] { NetworkManager.Int32ToByte((int)currentTimeSequence) }; - data[offset++] = BitConverter.GetBytes(timeSequenceProgress); + //data[offset++] = new byte[] { NetworkManager.Int32ToByte((int)gameState) }; + //data[offset++] = BitConverter.GetBytes(currentlyInTimeSequence); + //data[offset++] = new byte[] { NetworkManager.Int32ToByte((int)currentTimeSequence) }; + //data[offset++] = BitConverter.GetBytes(timeSequenceSecondsPassed); } public override bool SetSyncedData(byte[] data, ref int offset, NetworkEventType eventType) { - SetGameState((PacManGameState)data[offset++]); + if (eventType == NetworkEventType.StartGameButtonPressed) + { + StartGameButtonPressed(); + } - var currentlyInTimeSequence = BitConverter.ToBoolean(data, offset++); - var currentTimeSequence = (PacManTimeSequence)data[offset++]; - var timeSequenceProgress = BitConverter.ToSingle(data, offset); - offset += 4; - TimeSequenceSyncWithRemote(currentlyInTimeSequence, currentTimeSequence, timeSequenceProgress); + //SetGameState((PacManGameState)data[offset++]); + + //var currentlyInTimeSequence = BitConverter.ToBoolean(data, offset++); + //var currentTimeSequence = (PacManTimeSequence)data[offset++]; + //var timeSequenceSecondsPassed = BitConverter.ToSingle(data, offset); + //offset += 4; + //TimeSequenceSyncWithRemote(currentlyInTimeSequence, currentTimeSequence, timeSequenceSecondsPassed); return true; } diff --git a/Assets/Scripts/GhostManager.cs b/Assets/Scripts/GhostManager.cs index bc16369..9628f75 100644 --- a/Assets/Scripts/GhostManager.cs +++ b/Assets/Scripts/GhostManager.cs @@ -55,17 +55,17 @@ namespace Marro.PacManUdon private bool kinematic; // This should be called once when the game is initialized - public void Initialize(GameObject[] ghostTargets, PacMan pacMan, GameManager gameController) + public void Initialize(Transform[] ghostTargets, PacMan pacMan, GameManager gameController) { this.gameController = gameController; ghosts = transform.GetComponentsInChildren(true); blinky = ghosts[0]; for (int ghostIndex = 0; ghostIndex < ghosts.Length; ghostIndex++) { - Vector2 homePosition = ghostTargets[0].transform.localPosition; - Vector2 idlePosition1 = ghostTargets[1 + ghostIndex * 3].transform.localPosition; - Vector2 idlePosition2 = ghostTargets[2 + ghostIndex * 3].transform.localPosition; - Vector2 cornerPosition = ghostTargets[3 + ghostIndex * 3].transform.localPosition; + Vector2 homePosition = ghostTargets[0].localPosition; + Vector2 idlePosition1 = ghostTargets[1 + ghostIndex * 3].localPosition; + Vector2 idlePosition2 = ghostTargets[2 + ghostIndex * 3].localPosition; + Vector2 cornerPosition = ghostTargets[3 + ghostIndex * 3].localPosition; ghosts[ghostIndex].Initialize(pacMan, blinky, homePosition, idlePosition1, idlePosition2, cornerPosition); } diff --git a/Assets/Scripts/GridMover.cs b/Assets/Scripts/GridMover.cs index 2e5c6e4..7f46ac1 100644 --- a/Assets/Scripts/GridMover.cs +++ b/Assets/Scripts/GridMover.cs @@ -34,6 +34,11 @@ namespace Marro.PacManUdon public override void AppendSyncedData(byte[][] data, ref int offset, NetworkEventType eventType) { + if (eventType != NetworkEventType.PacManTurn) + { + return; + } + var position = GetPosition(); data[offset++] = BitConverter.GetBytes(position.x); data[offset++] = BitConverter.GetBytes(position.y); @@ -45,9 +50,14 @@ namespace Marro.PacManUdon public override bool SetSyncedData(byte[] data, ref int offset, NetworkEventType eventType) { - SetPosition(new Vector2(BitConverter.ToSingle(data, offset), BitConverter.ToSingle(data, offset + 2))); - SetDirection(new Vector2(BitConverter.ToSingle(data, offset + 4), BitConverter.ToSingle(data, offset + 6))); - offset += 8; + if (eventType != NetworkEventType.PacManTurn) + { + return true; + } + + SetPosition(new Vector2(BitConverter.ToSingle(data, offset), BitConverter.ToSingle(data, offset + 4))); + SetDirection(new Vector2(BitConverter.ToSingle(data, offset + 8), BitConverter.ToSingle(data, offset + 12))); + offset += 16; return true; } diff --git a/Assets/Scripts/Intermission2Pole.cs b/Assets/Scripts/Intermission2Pole.cs index f87929f..82af9c3 100644 --- a/Assets/Scripts/Intermission2Pole.cs +++ b/Assets/Scripts/Intermission2Pole.cs @@ -41,6 +41,12 @@ namespace Marro.PacManUdon { _lastUpdate = PoleStrechLevels.None; SetStrechLevel(PoleStrechLevels.None); + SetActive(false); // Should only activate for intermission 2 + } + + public void SetActive(bool isActive) + { + gameObject.SetActive(isActive); } public override void SyncedUpdate() diff --git a/Assets/Scripts/Maze.asset b/Assets/Scripts/Maze.asset index 3bea81c..002e6ee 100644 --- a/Assets/Scripts/Maze.asset +++ b/Assets/Scripts/Maze.asset @@ -43,7 +43,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 4 + Data: 5 - Name: Entry: 7 Data: @@ -109,19 +109,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ghostTargets + Data: pelletContainer - Name: $v Entry: 7 Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ghostTargets + Data: pelletContainer - Name: k__BackingField Entry: 7 Data: 7|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.GameObject[], UnityEngine.CoreModule + Data: UnityEngine.GameObject, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -169,25 +169,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pelletContainer + Data: mazeSprite - Name: $v Entry: 7 Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pelletContainer + Data: mazeSprite - Name: k__BackingField - Entry: 7 - Data: 11|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.GameObject, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 7 - Name: k__BackingField Entry: 9 - Data: 11 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -202,13 +196,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 11|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 13|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 12|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -229,19 +223,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: mazeSprite + Data: ghostTargets - Name: $v Entry: 7 - Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: mazeSprite + Data: ghostTargets - Name: k__BackingField - Entry: 9 - Data: 11 + Entry: 7 + Data: 14|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Transform[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 11 + Data: 14 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -278,6 +278,66 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: pacManStart + - Name: $v + Entry: 7 + Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: pacManStart + - Name: k__BackingField + Entry: 7 + Data: 18|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Transform, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 18 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 20|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: diff --git a/Assets/Scripts/Maze.cs b/Assets/Scripts/Maze.cs index 10b0467..3479c18 100644 --- a/Assets/Scripts/Maze.cs +++ b/Assets/Scripts/Maze.cs @@ -8,8 +8,9 @@ public class Maze : UdonSharpBehaviour { [SerializeField] public Vector2 mazeBoundaries; - [SerializeField] public GameObject[] ghostTargets; [SerializeField] public GameObject pelletContainer; [SerializeField] public GameObject mazeSprite; + [SerializeField] public Transform[] ghostTargets; + [SerializeField] public Transform pacManStart; } } \ No newline at end of file diff --git a/Assets/Scripts/NetworkManager.cs b/Assets/Scripts/NetworkManager.cs index 2ffcb93..ea80520 100644 --- a/Assets/Scripts/NetworkManager.cs +++ b/Assets/Scripts/NetworkManager.cs @@ -14,6 +14,7 @@ namespace Marro.PacManUdon FullSyncForced = 0, FullSync = 1, PacManTurn = 2, + StartGameButtonPressed = 3, } public class NetworkManager : UdonSharpBehaviour @@ -217,7 +218,12 @@ namespace Marro.PacManUdon syncedObjects = root.GetComponentsInChildren(includeInactive: true); - Debug.Log($"({nameof(PacManUdon)} {nameof(NetworkManager)}) 3 Found {syncedObjects.Length} {nameof(SyncedObject)} in children of {root.name}."); + foreach (var obj in syncedObjects) + { + obj.networkManager = this; + } + + Debug.Log($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Found {syncedObjects.Length} {nameof(SyncedObject)} in children of {root.name}."); SetOwner(Networking.IsOwner(gameObject)); @@ -239,6 +245,11 @@ namespace Marro.PacManUdon public void FixedUpdate() { + if (!Ready) + { + return; + } + // Fetch the current time UpdateInternalTime(); @@ -268,14 +279,14 @@ namespace Marro.PacManUdon IsEventUpdate = false; ProgressSyncedTime(internalTime); - Debug.Log($"{nameof(PacManUdon)} {nameof(NetworkManager)} syncedObjects: {syncedObjects}"); - Debug.Log($"{nameof(PacManUdon)} {nameof(NetworkManager)} Starting SyncedUpdate for {syncedObjects.Length} objects."); - for (int i = 0; i < syncedObjects.Length; i++) { var obj = syncedObjects[i]; - Debug.Log($"{nameof(PacManUdon)} {nameof(NetworkManager)} SyncedUpdate for {obj.gameObject.name}"); - obj.SyncedUpdate(); + + if (obj.gameObject.activeInHierarchy) + { + obj.SyncedUpdate(); + } } } @@ -367,7 +378,7 @@ namespace Marro.PacManUdon QueueEventInBuffer(result); - Debug.Log($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Prepared event with {eventSize} bytes and timestamp {timestamp} for serialization, index is now {this.eventsQueueIndex}"); + Debug.Log($"({nameof(PacManUdon)} {nameof(NetworkManager)}) Prepared event of type {eventType} with {eventSize} bytes, timestamp {timestamp} and id {eventId} for serialization."); RequestSerializationForEvents(); @@ -905,6 +916,11 @@ namespace Marro.PacManUdon /// An animator which visualizes whether the current perspective is the owner. /// [SerializeField] private Animator DebugImageToIndicateOwner; + + public void DoFullSync() + { + SendEvent(NetworkEventType.FullSync); + } #endregion } } diff --git a/Assets/Scripts/PacMan.cs b/Assets/Scripts/PacMan.cs index ce51619..12a3a8a 100644 --- a/Assets/Scripts/PacMan.cs +++ b/Assets/Scripts/PacMan.cs @@ -43,7 +43,7 @@ namespace Marro.PacManUdon #endregion - public void Initialize(PlayerInput input, GameManager gameController) + public void Initialize(PlayerInput input, Transform startTransform, GameManager gameController) { this.gameController = gameController; this.input = input; @@ -51,14 +51,13 @@ namespace Marro.PacManUdon renderer = GetComponent(); frozen = false; hideUntilUnfrozen = false; - startPosition = transform.localPosition; - startRotation = transform.localRotation; - startScale = transform.localScale; + startPosition = startTransform.localPosition; + startRotation = startTransform.localRotation; + startScale = startTransform.localScale; } public void Reset() { - // Debug.Log($"{gameObject} Reset!"); transform.SetLocalPositionAndRotation(startPosition, startRotation); transform.localScale = startScale; direction = Vector2.left; @@ -69,6 +68,8 @@ namespace Marro.PacManUdon SetDead(false); animator.SetTrigger("Reset"); + + Debug.Log($"{gameObject} Reset! Position is now {GetPosition()}."); } public override void SyncedUpdate() @@ -155,6 +156,7 @@ namespace Marro.PacManUdon SetDirection(inputDirection + new Vector2(GridMoverTools.PositionToGrid(nextPosition).x - nextPosition.x, 0).normalized); } SetTargetDirection(inputDirection); // This is the direction most logic should assume pacman is moving, the actual direction may be different due to cornering + networkManager.SendEvent(NetworkEventType.PacManTurn); } return nextPosition; @@ -338,5 +340,31 @@ namespace Marro.PacManUdon gameController.GotFruit(); } } + + public override void AppendSyncedData(byte[][] data, ref int offset, NetworkEventType eventType) + { + if (eventType != NetworkEventType.PacManTurn || kinematic || frozen || !enabled) + { + return; + } + + data[offset++] = BitConverter.GetBytes(targetDirection.x); + data[offset++] = BitConverter.GetBytes(targetDirection.y); + + base.AppendSyncedData(data, ref offset, eventType); + } + + public override bool SetSyncedData(byte[] data, ref int offset, NetworkEventType eventType) + { + if (eventType != NetworkEventType.PacManTurn || kinematic || frozen || !enabled) + { + return true; + } + + SetTargetDirection(new Vector2(BitConverter.ToSingle(data, offset), BitConverter.ToSingle(data, offset + 4))); + offset += 8; + + return base.SetSyncedData(data, ref offset, eventType); + } } } \ No newline at end of file diff --git a/Assets/Scripts/Sequences/Intermission2.cs b/Assets/Scripts/Sequences/Intermission2.cs index 258febb..8a1a034 100644 --- a/Assets/Scripts/Sequences/Intermission2.cs +++ b/Assets/Scripts/Sequences/Intermission2.cs @@ -20,6 +20,7 @@ namespace Marro.PacManUdon // Show pole SetIntermissionScreenVisible(true); intermission2Pole.Reset(); + intermission2Pole.SetActive(true); break; case 2: // Start music diff --git a/Assets/Scripts/Sequences/TimeSequenceShared.cs b/Assets/Scripts/Sequences/TimeSequenceShared.cs index 99d3bfc..7dbb9f7 100644 --- a/Assets/Scripts/Sequences/TimeSequenceShared.cs +++ b/Assets/Scripts/Sequences/TimeSequenceShared.cs @@ -42,6 +42,7 @@ namespace Marro.PacManUdon { jumpingToTimeSequence = true; TimeSequenceProgressToTime(100000f); + Debug.LogWarning($"{gameObject} TimeSequenceEndCurrent"); TryFinalizeTimeSequence(); jumpingToTimeSequence = false; } @@ -58,7 +59,7 @@ namespace Marro.PacManUdon private void TimeSequenceSkipToNextStep() { - // Debug.Log($"{gameObject} TimeSequenceSkipToNextStep"); + Debug.Log($"{gameObject} TimeSequenceSkipToNextStep"); if (timeSequenceProgress < timeSequenceKeyframeTimes.Length) { TimeSequenceProgressToTime(timeSequenceKeyframeTimes[timeSequenceProgress]); @@ -89,18 +90,19 @@ namespace Marro.PacManUdon private void TimeSequencePrepareForFinish(PacManTimeSequence timeSequence) { - if (networkManager.IsOwner) - { - TimeSequenceExecuteFinalize(timeSequence); + //if (networkManager.IsOwner) + //{ + Debug.LogWarning($"{gameObject} TimeSequencePrepareForFinish"); + TimeSequenceExecuteFinalize(timeSequence); if (!jumpingToTimeSequence) { TimeSequenceExecuteFinished(timeSequence); } - } - else - { - waitingForTimeSequenceFinalize = true; - } + //} + //else + //{ + // waitingForTimeSequenceFinalize = true; + //} } private void TryFinalizeTimeSequence() @@ -114,26 +116,26 @@ namespace Marro.PacManUdon waitingForTimeSequenceFinalize = false; } - private void TimeSequenceSyncWithRemote(bool currentlyInTimeSequence, PacManTimeSequence currentTimeSequence, float timeSequenceProgress) - { - // If the remote is in a time sequence but we're not, or we're in a different time sequence, jump to the remote's time sequence. - if (currentlyInTimeSequence && (!this.currentlyInTimeSequence || currentTimeSequence != this.currentTimeSequence)) - { - StartTimeSequence(currentTimeSequence); - } + //private void TimeSequenceSyncWithRemote(bool currentlyInTimeSequence, PacManTimeSequence currentTimeSequence, float timeSequenceSecondsPassed) + //{ + // // If the remote is in a time sequence but we're not, or we're in a different time sequence, jump to the remote's time sequence. + // if (currentlyInTimeSequence && (!this.currentlyInTimeSequence || currentTimeSequence != this.currentTimeSequence)) + // { + // StartTimeSequence(currentTimeSequence); + // } - // If we're (now) in a time sequence, jump our progress to match the one on the remote - if (this.currentlyInTimeSequence) - { - TimeSequenceProgressToTime(timeSequenceProgress); - } + // // If we're (now) in a time sequence, jump our progress to match the one on the remote + // if (this.currentlyInTimeSequence) + // { + // TimeSequenceProgressToTime(timeSequenceSecondsPassed); + // } - // If the remote has finished it's time sequence and we have one waiting to be finalized, we can do so now - if (!currentlyInTimeSequence) - { - TryFinalizeTimeSequence(); - } - } + // // If the remote has finished it's time sequence and we have one waiting to be finalized, we can do so now + // if (!currentlyInTimeSequence) + // { + // TryFinalizeTimeSequence(); + // } + //} #region Events @@ -245,7 +247,7 @@ namespace Marro.PacManUdon private void TimeSequenceExecuteStep(PacManTimeSequence timeSequence, int sequenceProgress) { - // Debug.Log($"{gameObject} Triggered time sequence step for sequence {currentTimeSequence} with progress {sequenceProgress}"); + Debug.Log($"{gameObject} Triggered time sequence step for sequence {currentTimeSequence} with progress {sequenceProgress}"); switch (timeSequence) { default: @@ -299,7 +301,7 @@ namespace Marro.PacManUdon private void TimeSequenceExecuteFinalize(PacManTimeSequence timeSequence) { - // Debug.Log($"{gameObject} Triggered time sequence step for sequence {currentTimeSequence} with progress {sequenceProgress}"); + Debug.Log($"{gameObject} Triggered time sequence finalize for sequence {currentTimeSequence}"); switch (timeSequence) { default: @@ -343,7 +345,7 @@ namespace Marro.PacManUdon private void TimeSequenceExecuteFinished(PacManTimeSequence timeSequence) { - // Debug.Log($"{gameObject} Triggered time sequence step for sequence {currentTimeSequence} with progress {sequenceProgress}"); + Debug.Log($"{gameObject} Triggered time sequence finished for sequence {currentTimeSequence}"); switch (timeSequence) { default: @@ -447,16 +449,5 @@ namespace Marro.PacManUdon } #endregion - - public int TimeSequenceProgress - { - get => timeSequenceProgress; - } - - public float TimeSequenceSecondsPassed - { - get => timeSequenceSecondsPassed; - set => TimeSequenceProgressToTime(value); - } } } \ No newline at end of file