Cleanup

More sync
Simplified GhostManager restart more
2026-06-22 15:51:59 +02:00 · 2026-06-22 15:51:55 +02:00 · 2026-06-22 15:34:02 +02:00 · 2026-06-22 15:21:48 +02:00 · 2026-06-22 15:20:43 +02:00
30 changed files with 388 additions and 826 deletions
--- a/Assets/Scenes/PacMan.unity
+++ b/Assets/Scenes/PacMan.unity
@@ -458,7 +458,8 @@ Transform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1470248941}
  m_Father: {fileID: 1886023632}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &107806787
@@ -4137,7 +4138,7 @@ MonoBehaviour:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 805005470}
-  m_Enabled: 1
+  m_Enabled: 0
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3}
  m_Name: 
@@ -4162,7 +4163,7 @@ MonoBehaviour:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 805005470}
-  m_Enabled: 1
+  m_Enabled: 0
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: cbbf384cde136444d9f640ff9f3445cf, type: 3}
  m_Name: 
@@ -8438,6 +8439,37 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1465823362}
  m_CullTransparentMesh: 1
+--- !u!1 &1470248940
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1470248941}
+  m_Layer: 0
+  m_Name: Check if ghost behaviour per level is correct
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1470248941
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1470248940}
+  serializedVersion: 2
+  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: 106401850}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1472000832 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 6334235783093999612, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3}
@@ -14567,6 +14599,54 @@ PrefabInstance:
      propertyPath: serializationData.Prefab
      value: 
      objectReference: {fileID: 4698741626709871998, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3}
+    - target: {fileID: 4729227370507332304, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.21968801
+      objectReference: {fileID: 0}
+    - target: {fileID: 4729227370507332304, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.21968801
+      objectReference: {fileID: 0}
+    - target: {fileID: 4729227370507332304, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.21968801
+      objectReference: {fileID: 0}
+    - target: {fileID: 4729227370507332304, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.23
+      objectReference: {fileID: 0}
+    - target: {fileID: 4729227370507332304, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 7.61
+      objectReference: {fileID: 0}
+    - target: {fileID: 4729227370507332304, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -20.12
+      objectReference: {fileID: 0}
+    - target: {fileID: 4729227370507332304, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.6825807
+      objectReference: {fileID: 0}
+    - target: {fileID: 4729227370507332304, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.6825807
+      objectReference: {fileID: 0}
+    - target: {fileID: 4729227370507332304, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.18461756
+      objectReference: {fileID: 0}
+    - target: {fileID: 4729227370507332304, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.18461756
+      objectReference: {fileID: 0}
+    - target: {fileID: 4729227370507332304, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 4729227370507332304, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 30.269
+      objectReference: {fileID: 0}
    - target: {fileID: 4751825057426557829, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3}
      propertyPath: serializationData.Prefab
      value: 
--- a/Assets/Scripts/BonusFruit.cs
+++ b/Assets/Scripts/BonusFruit.cs
@@ -8,15 +8,16 @@ namespace Marro.PacManUdon
    [RequireComponent(typeof(Renderer))]
    public class BonusFruit : SyncedObject
    {
-        PacManFruitType fruitType;
+        private PacManFruitType fruitType;

-        Animator animator;
-        new Renderer renderer;
-        ScoreBonusDisplay scoreBonusDisplay;
+        private Animator animator;
+        private new Renderer renderer;
+        private ScoreBonusDisplay scoreBonusDisplay;

-        [UdonSynced] bool active;
-        private int value;
+        private bool active;
        private float activeCountdown;
+
+        private int value;
        private bool frozen;

        public void Initialize()
@@ -30,15 +31,17 @@ namespace Marro.PacManUdon

        public override void SyncedUpdate()
        {
-            if (active && !frozen)
+            if (!active || frozen)
            {
+                return;
+            }
+
            activeCountdown -= networkManager.SyncedDeltaTime;
            if (activeCountdown <= 0)
            {
                SetActive(false);
            }
        }
-        }

        public void Spawn()
        {
@@ -62,7 +65,6 @@ namespace Marro.PacManUdon

        public void SetFruitType(PacManFruitType fruitType)
        {
-            this.fruitType = fruitType;
            value = (int)fruitScoreValue[PacManConstants.FruitTypeToValue(fruitType)];
            animator.SetFloat("FruitType", PacManConstants.FruitTypeToValue(fruitType));
        }
@@ -80,31 +82,33 @@ namespace Marro.PacManUdon

        public override void CollectSyncedData(byte[] data, ref int index, NetworkEventType eventType)
        {
+            data.Append(active, ref index);

+            if (!active)
+            {
+                return;
+            }
+
+            data.Append(activeCountdown, ref index);
+            data.Append(frozen, ref index);
        }

        public override bool WriteSyncedData(byte[] data, ref int index, NetworkEventType eventType)
+        {
+            SetActive(data.ReadBool(ref index));
+
+            if (!active)
            {
                return true;
            }

-        public PacManFruitType FruitType
-        {
-            set
-            {
-                SetFruitType(value);
-            }
-            get => fruitType;
+            activeCountdown = data.ReadFloat(ref index);
+            frozen = data.ReadBool(ref index);
+
+            return true;
        }

-        public bool Active
-        {
-            set
-            {
-                SetActive(value);
-            }
-            get => active;
-        }
+        public bool Active => active;

        private readonly DataDictionary fruitScoreValue = new DataDictionary()
        {
--- a/Assets/Scripts/CollisionManager.asset
+++ b/Assets/Scripts/CollisionManager.asset
@@ -43,7 +43,7 @@ MonoBehaviour:
      Data: 
    - Name: 
      Entry: 12
-      Data: 17
+      Data: 18
    - Name: 
      Entry: 7
      Data: 
@@ -109,25 +109,25 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: <PelletCollectedCount>k__BackingField
+      Data: gameManager
    - Name: $v
      Entry: 7
      Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: <PelletCollectedCount>k__BackingField
+      Data: gameManager
    - Name: <UserType>k__BackingField
      Entry: 7
      Data: 7|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
-      Data: System.Int32, mscorlib
+      Data: Marro.PacManUdon.GameManager, Assembly-CSharp
    - Name: 
      Entry: 8
      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 7
+      Data: 4
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -163,19 +163,19 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: gameManager
+      Data: bonusFruit
    - Name: $v
      Entry: 7
      Data: 9|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: gameManager
+      Data: bonusFruit
    - Name: <UserType>k__BackingField
      Entry: 7
      Data: 10|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
-      Data: Marro.PacManUdon.GameManager, Assembly-CSharp
+      Data: Marro.PacManUdon.BonusFruit, Assembly-CSharp
    - Name: 
      Entry: 8
      Data: 
@@ -217,25 +217,31 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: bonusFruit
+      Data: pellets
    - Name: $v
      Entry: 7
      Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: bonusFruit
+      Data: pellets
    - Name: <UserType>k__BackingField
      Entry: 7
      Data: 13|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
-      Data: Marro.PacManUdon.BonusFruit, Assembly-CSharp
+      Data: Marro.PacManUdon.Pellet[], Assembly-CSharp
    - Name: 
      Entry: 8
      Data: 
    - Name: <SystemType>k__BackingField
-      Entry: 9
-      Data: 4
+      Entry: 7
+      Data: 14|System.RuntimeType, mscorlib
+    - Name: 
+      Entry: 1
+      Data: UnityEngine.Component[], UnityEngine.CoreModule
+    - Name: 
+      Entry: 8
+      Data: 
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -250,7 +256,7 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 0
@@ -271,31 +277,25 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: pellets
+      Data: powerPellets
    - Name: $v
      Entry: 7
-      Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: pellets
+      Data: powerPellets
    - Name: <UserType>k__BackingField
-      Entry: 7
-      Data: 16|System.RuntimeType, mscorlib
-    - Name: 
-      Entry: 1
-      Data: Marro.PacManUdon.Pellet[], Assembly-CSharp
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: <SystemType>k__BackingField
      Entry: 7
      Data: 17|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
-      Data: UnityEngine.Component[], UnityEngine.CoreModule
+      Data: UnityEngine.Animator[], UnityEngine.AnimationModule
    - Name: 
      Entry: 8
      Data: 
+    - Name: <SystemType>k__BackingField
+      Entry: 9
+      Data: 17
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -331,25 +331,25 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: powerPellets
+      Data: ghosts
    - Name: $v
      Entry: 7
      Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: powerPellets
+      Data: ghosts
    - Name: <UserType>k__BackingField
      Entry: 7
      Data: 20|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
-      Data: UnityEngine.Animator[], UnityEngine.AnimationModule
+      Data: Marro.PacManUdon.Ghost[], Assembly-CSharp
    - Name: 
      Entry: 8
      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 20
+      Data: 14
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -385,25 +385,25 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: ghosts
+      Data: collisionMap
    - Name: $v
      Entry: 7
      Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: ghosts
+      Data: collisionMap
    - Name: <UserType>k__BackingField
      Entry: 7
      Data: 23|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
-      Data: Marro.PacManUdon.Ghost[], Assembly-CSharp
+      Data: System.Byte[], mscorlib
    - Name: 
      Entry: 8
      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 17
+      Data: 23
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -439,19 +439,19 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: powerPelletBlinkEnabled
+      Data: pelletIndices
    - Name: $v
      Entry: 7
      Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: powerPelletBlinkEnabled
+      Data: pelletIndices
    - Name: <UserType>k__BackingField
      Entry: 7
      Data: 26|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
-      Data: System.Boolean, mscorlib
+      Data: System.Int32[], mscorlib
    - Name: 
      Entry: 8
      Data: 
@@ -493,19 +493,19 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: powerPelletBlinkToggleInterval
+      Data: powerPelletBlinkEnabled
    - Name: $v
      Entry: 7
      Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: powerPelletBlinkToggleInterval
+      Data: powerPelletBlinkEnabled
    - Name: <UserType>k__BackingField
      Entry: 7
      Data: 29|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
-      Data: System.Single, mscorlib
+      Data: System.Boolean, mscorlib
    - Name: 
      Entry: 8
      Data: 
@@ -547,19 +547,73 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: powerPelletBlinkProgress
+      Data: powerPelletBlinkToggleInterval
    - Name: $v
      Entry: 7
      Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+    - Name: <Name>k__BackingField
+      Entry: 1
+      Data: powerPelletBlinkToggleInterval
+    - Name: <UserType>k__BackingField
+      Entry: 7
+      Data: 32|System.RuntimeType, mscorlib
+    - Name: 
+      Entry: 1
+      Data: System.Single, mscorlib
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: <SystemType>k__BackingField
+      Entry: 9
+      Data: 32
+    - Name: <SyncMode>k__BackingField
+      Entry: 7
+      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+    - Name: 
+      Entry: 6
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: <IsSerialized>k__BackingField
+      Entry: 5
+      Data: false
+    - Name: _fieldAttributes
+      Entry: 7
+      Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+    - Name: 
+      Entry: 12
+      Data: 0
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: powerPelletBlinkProgress
+    - Name: $v
+      Entry: 7
+      Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: powerPelletBlinkProgress
    - Name: <UserType>k__BackingField
      Entry: 9
-      Data: 29
+      Data: 32
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 29
+      Data: 32
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -574,7 +628,7 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 0
@@ -598,70 +652,16 @@ MonoBehaviour:
      Data: powerPelletBlinkCurrentlyVisible
    - Name: $v
      Entry: 7
-      Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: powerPelletBlinkCurrentlyVisible
    - Name: <UserType>k__BackingField
      Entry: 9
-      Data: 26
+      Data: 29
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 26
-    - Name: <SyncMode>k__BackingField
-      Entry: 7
-      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
-    - Name: 
-      Entry: 6
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: <IsSerialized>k__BackingField
-      Entry: 5
-      Data: false
-    - Name: _fieldAttributes
-      Entry: 7
-      Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
-    - Name: 
-      Entry: 12
-      Data: 0
-    - Name: 
-      Entry: 13
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 7
-      Data: 
-    - Name: $k
-      Entry: 1
-      Data: syncedPelletsCollected
-    - Name: $v
-      Entry: 7
-      Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
-    - Name: <Name>k__BackingField
-      Entry: 1
-      Data: syncedPelletsCollected
-    - Name: <UserType>k__BackingField
-      Entry: 7
-      Data: 36|System.RuntimeType, mscorlib
-    - Name: 
-      Entry: 1
-      Data: System.Byte[], mscorlib
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: <SystemType>k__BackingField
-      Entry: 9
-      Data: 36
+      Data: 29
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -697,19 +697,19 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: collisionMap
+      Data: pelletMap
    - Name: $v
      Entry: 7
      Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: collisionMap
+      Data: pelletMap
    - Name: <UserType>k__BackingField
      Entry: 9
-      Data: 36
+      Data: 23
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 36
+      Data: 23
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -745,19 +745,19 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: pelletMap
+      Data: syncedPelletsCollected
    - Name: $v
      Entry: 7
      Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: pelletMap
+      Data: syncedPelletsCollected
    - Name: <UserType>k__BackingField
      Entry: 9
-      Data: 36
+      Data: 23
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 36
+      Data: 23
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -793,19 +793,19 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: ghostPositions
+      Data: pelletCollectedCount
    - Name: $v
      Entry: 7
      Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: ghostPositions
+      Data: pelletCollectedCount
    - Name: <UserType>k__BackingField
      Entry: 7
      Data: 43|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
-      Data: System.Int32[], mscorlib
+      Data: System.Byte, mscorlib
    - Name: 
      Entry: 8
      Data: 
@@ -847,19 +847,19 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: pacManPosition
+      Data: ghostPositions
    - Name: $v
      Entry: 7
      Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: pacManPosition
+      Data: ghostPositions
    - Name: <UserType>k__BackingField
      Entry: 9
-      Data: 7
+      Data: 26
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 7
+      Data: 26
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -895,19 +895,25 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: frozen
+      Data: pacManPosition
    - Name: $v
      Entry: 7
      Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: frozen
+      Data: pacManPosition
    - Name: <UserType>k__BackingField
-      Entry: 9
-      Data: 26
+      Entry: 7
+      Data: 48|System.RuntimeType, mscorlib
+    - Name: 
+      Entry: 1
+      Data: System.Int32, mscorlib
+    - Name: 
+      Entry: 8
+      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 26
+      Data: 48
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -922,7 +928,55 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+    - Name: 
+      Entry: 12
+      Data: 0
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: frozen
+    - Name: $v
+      Entry: 7
+      Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+    - Name: <Name>k__BackingField
+      Entry: 1
+      Data: frozen
+    - Name: <UserType>k__BackingField
+      Entry: 9
+      Data: 29
+    - Name: <SystemType>k__BackingField
+      Entry: 9
+      Data: 29
+    - Name: <SyncMode>k__BackingField
+      Entry: 7
+      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+    - Name: 
+      Entry: 6
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: <IsSerialized>k__BackingField
+      Entry: 5
+      Data: false
+    - Name: _fieldAttributes
+      Entry: 7
+      Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 0
--- a/Assets/Scripts/CollisionManager.cs
+++ b/Assets/Scripts/CollisionManager.cs
@@ -13,28 +13,27 @@ namespace Marro.PacManUdon
    public class CollisionManager : SyncedObject
    {
        public int PelletCount => pellets.Length;
-        public int PelletCollectedCount { get; private set; }

        private GameManager gameManager;
        private BonusFruit bonusFruit;
+        private Pellet[] pellets;
+        private Animator[] powerPellets;
+        private Ghost[] ghosts;

-        Pellet[] pellets;
-        Animator[] powerPellets;
-        Ghost[] ghosts;
+        private byte[] collisionMap;
+        private int[] pelletIndices;

-        bool powerPelletBlinkEnabled;
-        float powerPelletBlinkToggleInterval;
-        float powerPelletBlinkProgress;
-        bool powerPelletBlinkCurrentlyVisible;
+        private const int mazeWidth = 32;
+        private const int mazeHeight = 32;

-        byte[] syncedPelletsCollected;
+        private bool powerPelletBlinkEnabled;
+        private float powerPelletBlinkToggleInterval;
+        private float powerPelletBlinkProgress;
+        private bool powerPelletBlinkCurrentlyVisible;

-        byte[] collisionMap;
-        byte[] pelletMap;
-        int[] pelletIndices;
-
-        const int mazeWidth = 32;
-        const int mazeHeight = 32;
+        private byte[] pelletMap;
+        private byte[] syncedPelletsCollected;
+        private byte pelletCollectedCount;

        private int[] ghostPositions = new int[4];
        private int pacManPosition;
@@ -188,11 +187,11 @@ namespace Marro.PacManUdon
            var index = pellet.transform.GetSiblingIndex();
            syncedPelletsCollected[index / 8] |= (byte)(1 << index % 8);

-            PelletCollectedCount++;
+            pelletCollectedCount++;

            var pelletType = pellet.isPowerPellet ? EatResult.PowerPellet : EatResult.Pellet;

-            gameManager.GotPellet(pellet, pellet.isPowerPellet, PelletCollectedCount, PelletCount - PelletCollectedCount);
+            gameManager.GotPellet(pellet, pellet.isPowerPellet, pelletCollectedCount, PelletCount - pelletCollectedCount);

            return pelletType;
        }
@@ -205,7 +204,7 @@ namespace Marro.PacManUdon
            }

            syncedPelletsCollected = new byte[pellets.Length/8 + 1];
-            PelletCollectedCount = 0;
+            pelletCollectedCount = 0;

            pelletMap = PacManConstants.GetMazePelletMap();

@@ -268,7 +267,7 @@ namespace Marro.PacManUdon

        public override void CollectSyncedData(byte[] data, ref int index, NetworkEventType eventType)
        {
-            data.Append((byte)PelletCollectedCount, ref index);
+            data.Append((byte)pelletCollectedCount, ref index);
            data.Append(syncedPelletsCollected, ref index);

            data.Append(frozen, ref index);
@@ -276,7 +275,7 @@ namespace Marro.PacManUdon

        public override bool WriteSyncedData(byte[] data, ref int index, NetworkEventType eventType)
        {
-            PelletCollectedCount = data.ReadByte(ref index);
+            pelletCollectedCount = data.ReadByte(ref index);
            Array.Copy(data, index, syncedPelletsCollected, 0, syncedPelletsCollected.Length);
            index += syncedPelletsCollected.Length;
            SetPelletsCollectedFromSync();
--- a/Assets/Scripts/Fruit.asset
+++ b/Assets/Scripts/Fruit.asset
@@ -354,8 +354,8 @@ MonoBehaviour:
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
    - Name: 
-      Entry: 3
-      Data: 1
+      Entry: 6
+      Data: 
    - Name: 
      Entry: 8
      Data: 
@@ -367,13 +367,7 @@ MonoBehaviour:
      Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
-      Data: 1
-    - Name: 
-      Entry: 7
-      Data: 22|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
-    - Name: 
-      Entry: 8
-      Data: 
+      Data: 0
    - Name: 
      Entry: 13
      Data: 
@@ -391,19 +385,25 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: value
+      Data: activeCountdown
    - Name: $v
      Entry: 7
-      Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: value
+      Data: activeCountdown
    - Name: <UserType>k__BackingField
-      Entry: 9
-      Data: 8
+      Entry: 7
+      Data: 23|System.RuntimeType, mscorlib
+    - Name: 
+      Entry: 1
+      Data: System.Single, mscorlib
+    - Name: 
+      Entry: 8
+      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 8
+      Data: 23
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -439,25 +439,19 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: activeCountdown
+      Data: value
    - Name: $v
      Entry: 7
      Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: activeCountdown
+      Data: value
    - Name: <UserType>k__BackingField
-      Entry: 7
-      Data: 26|System.RuntimeType, mscorlib
-    - Name: 
-      Entry: 1
-      Data: System.Single, mscorlib
-    - Name: 
-      Entry: 8
-      Data: 
+      Entry: 9
+      Data: 8
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 26
+      Data: 8
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -472,7 +466,7 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 0
@@ -496,7 +490,7 @@ MonoBehaviour:
      Data: frozen
    - Name: $v
      Entry: 7
-      Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: frozen
@@ -520,7 +514,7 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 0
@@ -544,13 +538,13 @@ MonoBehaviour:
      Data: fruitScoreValue
    - Name: $v
      Entry: 7
-      Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: fruitScoreValue
    - Name: <UserType>k__BackingField
      Entry: 7
-      Data: 31|System.RuntimeType, mscorlib
+      Data: 30|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: VRC.SDK3.Data.DataDictionary, VRCSDK3
@@ -559,7 +553,7 @@ MonoBehaviour:
      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 31
+      Data: 30
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -574,7 +568,7 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 0
--- a/Assets/Scripts/GameManager.cs
+++ b/Assets/Scripts/GameManager.cs
@@ -132,20 +132,11 @@ namespace Marro.PacManUdon
            SetLevel(1);
        }

-        private void InitializeLevel()
-        {
-            //Debug.Log($"{gameObject} New level started!");
-
-            ghostManager.NewLevel();
-            
-            mazeSpriteAnimator.SetBool("Blinking", false);
-        }
-
        private void RestartLevel(bool afterLifeLost = false)
        {
            //Debug.Log($"{gameObject} (Re)started level!");

-            // SetInGameComponentVisibility(true);
+            mazeSpriteAnimator.SetBool("Blinking", false);

            ghostManager.RestartLevel(afterLifeLost);
            pacMan.Reset();
@@ -393,8 +384,11 @@ namespace Marro.PacManUdon

        public override void CollectSyncedData(byte[] data, ref int index, NetworkEventType eventType)
        {
-            if (eventType == NetworkEventType.FullSync)
+            if (eventType != NetworkEventType.FullSync)
            {
+                return;
+            }
+
            data.Append(currentlyInTimeSequence, ref index);

            if (currentlyInTimeSequence)
@@ -403,6 +397,12 @@ namespace Marro.PacManUdon
                data.Append(timeSequenceSecondsPassed, ref index);
            }

+            data.AppendAsByte(level, ref index);
+            data.Append(score, ref index);
+            data.AppendAsByte(extraLives, ref index);
+
+            bonusFruit.CollectSyncedData(data, ref index, eventType);
+
            collisionManager.CollectSyncedData(data, ref index, eventType);

            ghostManager.CollectSyncedData(data, ref index, eventType);
@@ -410,12 +410,6 @@ namespace Marro.PacManUdon
            pacMan.CollectSyncedData(data, ref index, 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(timeSequenceSecondsPassed);
-        }
-
        public override bool WriteSyncedData(byte[] data, ref int index, NetworkEventType eventType)
        {
            if (eventType == NetworkEventType.StartGameButtonPressed)
@@ -424,8 +418,11 @@ namespace Marro.PacManUdon
                return true;
            }

-            if (eventType == NetworkEventType.FullSync)
+            if (eventType != NetworkEventType.FullSync)
            {
+                return true;
+            }
+
            var currentlyInTimeSequence = data.ReadBool(ref index);
            if (currentlyInTimeSequence)
            {
@@ -438,20 +435,17 @@ namespace Marro.PacManUdon
                TimeSequenceTryEndCurrent();
            }

+            SetLevel(data.ReadByte(ref index));
+            SetScore(data.ReadInt(ref index));
+            SetExtraLives(data.ReadByte(ref index));
+
+            bonusFruit.WriteSyncedData(data, ref index, eventType);
+
            collisionManager.WriteSyncedData(data, ref index, eventType);

            ghostManager.WriteSyncedData(data, ref index, eventType);

            pacMan.WriteSyncedData(data, ref index, eventType);
-            }
-
-            //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;
        }
--- a/Assets/Scripts/GhostManager.cs
+++ b/Assets/Scripts/GhostManager.cs
@@ -95,10 +95,7 @@ namespace Marro.PacManUdon
            }

            SetScattering(true, reverseDirection: false);
-        }

-        public void NewLevel()
-        {
            SetSharedPelletCounterActive(false);
            UpdateElroyLevel(collisionManager.PelletCount);
            foreach (Ghost ghost in ghosts)
@@ -292,7 +289,7 @@ namespace Marro.PacManUdon
            for (int i = 0; i < ghosts.Length; i++)
            {
                ghosts[i].SetHousePelletCounterLimit(privatePelletCounterReleaseValues[i]);
-                RestartLevel(); // Reset needed to properly apply level
+                ghosts[i].UpdateSpeed();
            }
        }

--- a/Assets/Scripts/Intermission2Pole.cs
+++ b/Assets/Scripts/Intermission2Pole.cs
@@ -143,15 +143,5 @@ namespace Marro.PacManUdon
        {
            return (Vector2)transform.localPosition;
        }
-
-        public override void CollectSyncedData(byte[] data, ref int index, NetworkEventType eventType)
-        {
-
-        }
-
-        public override bool WriteSyncedData(byte[] data, ref int index, NetworkEventType eventType)
-        {
-            return true;
-        }
    }
 }
--- a/Assets/Scripts/PowerPellet.asset
+++ b/Assets/Scripts/PowerPellet.asset
@@ -1,52 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
-  m_Name: PowerPellet
-  m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: bc9582994932aa648bc02c914215e7cc, type: 2}
-  udonAssembly: 
-  assemblyError: 
-  sourceCsScript: {fileID: 11500000, guid: 55d0efe8af4dba540a508287baca6656, type: 3}
-  scriptVersion: 2
-  compiledVersion: 2
-  behaviourSyncMode: 0
-  hasInteractEvent: 0
-  scriptID: 7835090324168685075
-  serializationData:
-    SerializedFormat: 2
-    SerializedBytes: 
-    ReferencedUnityObjects: []
-    SerializedBytesString: 
-    Prefab: {fileID: 0}
-    PrefabModificationsReferencedUnityObjects: []
-    PrefabModifications: []
-    SerializationNodes:
-    - Name: fieldDefinitions
-      Entry: 7
-      Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition,
-        UdonSharp.Editor]], mscorlib
-    - Name: comparer
-      Entry: 7
-      Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String,
-        mscorlib]], mscorlib
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 12
-      Data: 0
-    - Name: 
-      Entry: 13
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
--- a/Assets/Scripts/PowerPellet.asset.meta
+++ b/Assets/Scripts/PowerPellet.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 896816ace5640c644bd057ab48c3b9a1
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts/PowerPellet.cs
+++ b/Assets/Scripts/PowerPellet.cs
@@ -1,12 +0,0 @@
-namespace Marro.PacManUdon
-{
-    using UdonSharp;
-
-    public class PowerPellet : UdonSharpBehaviour
-    {
-        // Oh how I wish I could just have this method extend pellet and do things the normal way...
-        // But alas, with 'typeof', 'is' and overriding base fields all broken/not available I don't see a good way of differentiating between a type or its derivatives...
-        // The only reason I even want to use this class is so I can do GetComponentsInChildren<PowerPellet> instead of gathering all Pellets and then sorting through them.
-        // But since power pellets are the only pellets with animators, I'll probably just use GetComponentsInChildren<Animator> instead without further checking, since the animator is what I need to manipulate anyway.
-    }
-}
--- a/Assets/Scripts/PowerPellet.cs.meta
+++ b/Assets/Scripts/PowerPellet.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 55d0efe8af4dba540a508287baca6656
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts/Sequences/AttractScreenDemo.cs
+++ b/Assets/Scripts/Sequences/AttractScreenDemo.cs
@@ -14,7 +14,6 @@ namespace Marro.PacManUdon
                    SetGameState(PacManGameState.AttractModeDemo);
                    break;
                case 1:
-                    InitializeLevel();
                    SetMazeVisible(true);
                    SetLevel(1);
                    break;
--- a/Assets/Scripts/Sequences/AttractScreenIntroduction.cs
+++ b/Assets/Scripts/Sequences/AttractScreenIntroduction.cs
@@ -92,7 +92,6 @@ namespace Marro.PacManUdon
                    pacMan.SetPosition(attractScreenElements[16].transform.localPosition);
                    pacMan.SetDirection(Direction.Left);

-                    ghostManager.RestartLevel();
                    ghostManager.SetLevel(2);
                    ghostManager.SetKinematic(true);
                    ghostManager.SetActive(true);
--- a/Assets/Scripts/Sequences/RestartLevel.cs
+++ b/Assets/Scripts/Sequences/RestartLevel.cs
@@ -42,7 +42,6 @@ namespace Marro.PacManUdon
            SetFrozen(false);
            soundManager.SuppressSound(false);
            soundManager.StartGhostSound();
-            soundManager.UpdatePelletCount(collisionManager.PelletCount - collisionManager.PelletCollectedCount);
        }
    }
 }
--- a/Assets/Scripts/Sequences/StartNewGame.cs
+++ b/Assets/Scripts/Sequences/StartNewGame.cs
@@ -11,7 +11,6 @@ namespace Marro.PacManUdon
                    gameState = PacManGameState.InGame;

                    InitializeNewGame();
-                    InitializeLevel();
                    PrepareForCutscene();
                    
                    soundManager.SuppressSound(false);
--- a/Assets/Scripts/Sequences/StartNewLevel.cs
+++ b/Assets/Scripts/Sequences/StartNewLevel.cs
@@ -10,7 +10,6 @@ namespace Marro.PacManUdon
                    PrepareForCutscene();
                    
                    // Reset, show maze and score display
-                    InitializeLevel();
                    SetMazeVisible(true);
                    statusDisplay.SetScoreDisplayVisible(true);
                    break;
--- a/Assets/Scripts/SoundManager.cs
+++ b/Assets/Scripts/SoundManager.cs
@@ -1,9 +1,6 @@

 using Marro.PacManUdon;
-using UdonSharp;
 using UnityEngine;
-using VRC.SDKBase;
-using VRC.Udon;

 public class SoundManager : SyncedObject
 {
--- a/Assets/Scripts/StatusDisplay.cs
+++ b/Assets/Scripts/StatusDisplay.cs
@@ -166,15 +166,5 @@ namespace Marro.PacManUdon
                levelDisplayDigitAnimators[i].SetFloat("FruitType", PacManConstants.FruitTypeToValue(PacManConstants.GetFruitTypeForLevel(level - i)));
            }
        }
-
-        public override void CollectSyncedData(byte[] data, ref int index, NetworkEventType eventType)
-        {
-
-        }
-
-        public override bool WriteSyncedData(byte[] data, ref int index, NetworkEventType eventType)
-        {
-            return true;
-        }
    }
 }
--- a/Assets/Scripts/SyncedObject.cs
+++ b/Assets/Scripts/SyncedObject.cs
@@ -1,6 +1,4 @@
-using System.Collections;
-using UdonSharp;
-using UnityEngine;
+using UdonSharp;

 namespace Marro.PacManUdon
 {
--- a/Assets/Scripts/Teleporter.asset
+++ b/Assets/Scripts/Teleporter.asset
@@ -1,178 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
-  m_Name: Teleporter
-  m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: 1589eb7cce8925e4da3272208dfa87f4, type: 2}
-  udonAssembly: 
-  assemblyError: 
-  sourceCsScript: {fileID: 11500000, guid: aae1c5d18ae01b3488b54c72e6f1edf6, type: 3}
-  scriptVersion: 2
-  compiledVersion: 2
-  behaviourSyncMode: 0
-  hasInteractEvent: 0
-  scriptID: -7788394196284941649
-  serializationData:
-    SerializedFormat: 2
-    SerializedBytes: 
-    ReferencedUnityObjects: []
-    SerializedBytesString: 
-    Prefab: {fileID: 0}
-    PrefabModificationsReferencedUnityObjects: []
-    PrefabModifications: []
-    SerializationNodes:
-    - Name: fieldDefinitions
-      Entry: 7
-      Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition,
-        UdonSharp.Editor]], mscorlib
-    - Name: comparer
-      Entry: 7
-      Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String,
-        mscorlib]], mscorlib
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 12
-      Data: 2
-    - Name: 
-      Entry: 7
-      Data: 
-    - Name: $k
-      Entry: 1
-      Data: direction
-    - Name: $v
-      Entry: 7
-      Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
-    - Name: <Name>k__BackingField
-      Entry: 1
-      Data: direction
-    - Name: <UserType>k__BackingField
-      Entry: 7
-      Data: 3|System.RuntimeType, mscorlib
-    - Name: 
-      Entry: 1
-      Data: Marro.PacManUdon.Direction, Assembly-CSharp
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: <SystemType>k__BackingField
-      Entry: 7
-      Data: 4|System.RuntimeType, mscorlib
-    - Name: 
-      Entry: 1
-      Data: System.Int32, mscorlib
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: <SyncMode>k__BackingField
-      Entry: 7
-      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
-    - Name: 
-      Entry: 6
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: <IsSerialized>k__BackingField
-      Entry: 5
-      Data: true
-    - Name: _fieldAttributes
-      Entry: 7
-      Data: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
-    - Name: 
-      Entry: 12
-      Data: 1
-    - Name: 
-      Entry: 7
-      Data: 6|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: 7
-      Data: 
-    - Name: $k
-      Entry: 1
-      Data: target
-    - Name: $v
-      Entry: 7
-      Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
-    - Name: <Name>k__BackingField
-      Entry: 1
-      Data: target
-    - Name: <UserType>k__BackingField
-      Entry: 7
-      Data: 8|System.RuntimeType, mscorlib
-    - Name: 
-      Entry: 1
-      Data: UnityEngine.Transform, UnityEngine.CoreModule
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: <SystemType>k__BackingField
-      Entry: 9
-      Data: 8
-    - Name: <SyncMode>k__BackingField
-      Entry: 7
-      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
-    - Name: 
-      Entry: 6
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: <IsSerialized>k__BackingField
-      Entry: 5
-      Data: true
-    - Name: _fieldAttributes
-      Entry: 7
-      Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
-    - Name: 
-      Entry: 12
-      Data: 1
-    - Name: 
-      Entry: 7
-      Data: 10|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: 
-    - Name: 
-      Entry: 8
-      Data: 
--- a/Assets/Scripts/Teleporter.asset.meta
+++ b/Assets/Scripts/Teleporter.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c6e306d768eba5b469eea599abcf4800
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts/Teleporter.cs
+++ b/Assets/Scripts/Teleporter.cs
@@ -1,23 +0,0 @@
-namespace Marro.PacManUdon
-{
-    using UdonSharp;
-    using UnityEngine;
-
-    public class Teleporter : UdonSharpBehaviour
-    {
-        [SerializeField] private Direction direction = Direction.Zero;
-        [SerializeField] private Transform target;
-
-        void OnTriggerEnter(Collider other)
-        {
-            GridMover gridMover = other.gameObject.GetComponent<GridMover>();
-
-            if (gridMover == null || gridMover.GetDirection() != direction)
-            {
-                return;
-            }
-
-            gridMover.SetPosition(gridMover.GetPosition() + (Vector2)(target.localPosition - transform.localPosition));
-        }
-    }
-}
--- a/Assets/Scripts/Teleporter.cs.meta
+++ b/Assets/Scripts/Teleporter.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: aae1c5d18ae01b3488b54c72e6f1edf6
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts/Test.cs
+++ b/Assets/Scripts/Test.cs
@@ -1,14 +0,0 @@
-namespace Marro.PacManUdon
-{
-    using UdonSharp;
-    using UnityEngine;
-
-    public class Test : UdonSharpBehaviour
-    {
-        [SerializeField] Pellet pellet;
-        public void Start()
-        {
-            Debug.Log(pellet.enabled);
-        }
-    }
-}
--- a/Assets/Scripts/Test.cs.meta
+++ b/Assets/Scripts/Test.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 0227a738d77ab0849bdc9047b5b27c78
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts/Test1.asset
+++ b/Assets/Scripts/Test1.asset
@@ -1,118 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
-  m_Name: Test1
-  m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: 6457f9f1332ac0742bdff23291631f30, type: 2}
-  udonAssembly: 
-  assemblyError: 
-  sourceCsScript: {fileID: 11500000, guid: 0227a738d77ab0849bdc9047b5b27c78, type: 3}
-  scriptVersion: 2
-  compiledVersion: 2
-  behaviourSyncMode: 0
-  hasInteractEvent: 0
-  scriptID: -4571266787425106669
-  serializationData:
-    SerializedFormat: 2
-    SerializedBytes: 
-    ReferencedUnityObjects: []
-    SerializedBytesString: 
-    Prefab: {fileID: 0}
-    PrefabModificationsReferencedUnityObjects: []
-    PrefabModifications: []
-    SerializationNodes:
-    - Name: fieldDefinitions
-      Entry: 7
-      Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition,
-        UdonSharp.Editor]], mscorlib
-    - Name: comparer
-      Entry: 7
-      Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String,
-        mscorlib]], mscorlib
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 12
-      Data: 1
-    - Name: 
-      Entry: 7
-      Data: 
-    - Name: $k
-      Entry: 1
-      Data: pellet
-    - Name: $v
-      Entry: 7
-      Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
-    - Name: <Name>k__BackingField
-      Entry: 1
-      Data: pellet
-    - Name: <UserType>k__BackingField
-      Entry: 7
-      Data: 3|System.RuntimeType, mscorlib
-    - Name: 
-      Entry: 1
-      Data: Marro.PacManUdon.Pellet, Assembly-CSharp
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: <SystemType>k__BackingField
-      Entry: 7
-      Data: 4|System.RuntimeType, mscorlib
-    - Name: 
-      Entry: 1
-      Data: VRC.Udon.UdonBehaviour, VRC.Udon
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: <SyncMode>k__BackingField
-      Entry: 7
-      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
-    - Name: 
-      Entry: 6
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: <IsSerialized>k__BackingField
-      Entry: 5
-      Data: true
-    - Name: _fieldAttributes
-      Entry: 7
-      Data: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
-    - Name: 
-      Entry: 12
-      Data: 1
-    - Name: 
-      Entry: 7
-      Data: 6|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: 
-    - Name: 
-      Entry: 8
-      Data: 
--- a/Assets/Scripts/Test1.asset.meta
+++ b/Assets/Scripts/Test1.asset.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 184e93443ec1bb24fa4e1db8b51405da
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts/TimedSequence.cs
+++ b/Assets/Scripts/TimedSequence.cs
@@ -1,65 +0,0 @@
-// // Silly me for wanting to make the code neat, forgot this was Udon :)
-
-// using System.Collections;
-// using System.Collections.Generic;
-// using UdonSharp;
-// using UnityEngine;
-
-// public abstract class TimeSequence : UdonSharpBehaviour
-// {
-//     [UdonSynced] float secondsPassed;
-//     int sequenceProgress;
-//     float[] sequenceTimeSeconds;
-
-//     protected TimeSequence(float[] sequenceTimeSeconds)
-//     {
-//         sequenceProgress = 0;
-//         secondsPassed = 0;
-//         this.sequenceTimeSeconds = sequenceTimeSeconds;
-//         ProgressSequenceToTime(secondsPassed);
-//     }
-
-//     public void ProgressInTime(float deltaSeconds)
-//     {
-//         ProgressSequenceToTime(secondsPassed + deltaSeconds);
-//     }
-
-//     public void ProgressSequenceToTime(float seconds)
-//     {
-//         secondsPassed = seconds;
-//         while (secondsPassed >= sequenceTimeSeconds[sequenceProgress])
-//         {
-//             sequenceProgress += 1;
-//             SequenceStep(sequenceProgress);
-//         }
-//     }
-    
-//     protected abstract void SequenceStep(int sequneceProgress);
-
-//     public static float[] DeltaToAbsolute(float[] delta)
-//     {
-//         if (delta.Length < 1) 
-//         {
-//             return new float[0];
-//         }
-
-//         float[] absolute = new float[delta.Length];
-//         absolute[0] = delta[0];
-//         for (int i = 1; i < delta.Length; i++)
-//         {
-//             absolute[i] = delta[i] + absolute[i-1];    
-//         }
-//         return absolute;
-//     }
-
-//     public int SequenceProgress
-//     {
-//         get => sequenceProgress;
-//     }
-
-//     public float SecondsPassed
-//     {
-//         get => secondsPassed;
-//         set => ProgressSequenceToTime(value);
-//     }
-// }
--- a/Assets/Scripts/TimedSequence.cs.meta
+++ b/Assets/Scripts/TimedSequence.cs.meta
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 789dbd838d9dd5645852b3bda8c5a161
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant:
Author	SHA1	Message	Date
Marro64	8a6f1b482b	Cleanup	2026-06-22 15:51:59 +02:00
Marro64	18499ab576	More sync	2026-06-22 15:51:55 +02:00
Marro64	a32df1bd09	Simplified GhostManager restart more	2026-06-22 15:34:02 +02:00
Marro64	d739c9d7b5	Refactored pelletCollectedCount	2026-06-22 15:21:48 +02:00
Marro64	4ba203b1de	Refactored starting new level	2026-06-22 15:20:43 +02:00