From e3f93c69c5cbe2b9303bf67081ba0d621ca058fa Mon Sep 17 00:00:00 2001 From: Marro64 Date: Sun, 28 Dec 2025 19:40:10 +0100 Subject: [PATCH] Removing more networking things --- Assets/Scripts/BonusFruit.cs | 13 +- Assets/Scripts/GameManager.asset | 532 +++++++------- Assets/Scripts/GameManager.cs | 56 +- Assets/Scripts/Ghost.asset | 1138 ++++++++++++++---------------- Assets/Scripts/Ghost.cs | 38 +- Assets/Scripts/PacMan.cs | 26 +- Assets/Scripts/PlayerInput.asset | 4 +- 7 files changed, 864 insertions(+), 943 deletions(-) diff --git a/Assets/Scripts/BonusFruit.cs b/Assets/Scripts/BonusFruit.cs index ab49fd2..b09a9fb 100644 --- a/Assets/Scripts/BonusFruit.cs +++ b/Assets/Scripts/BonusFruit.cs @@ -1,12 +1,13 @@ namespace Marro.PacManUdon { + using Assets.Scripts; using UdonSharp; using UnityEngine; using VRC.SDK3.Data; using VRC.SDKBase; using VRC.Udon; - public class BonusFruit : UdonSharpBehaviour + public class BonusFruit : SyncedObject { [SerializeField, UdonSynced, FieldChangeCallback(nameof(FruitType))] PacManFruitType fruitType; @@ -83,6 +84,16 @@ RequestSerialization(); } + public override void AppendSyncedData(byte[][] data, ref int offset) + { + + } + + public override bool SetSyncedData(byte[] data, ref int offset) + { + return true; + } + public PacManFruitType FruitType { set diff --git a/Assets/Scripts/GameManager.asset b/Assets/Scripts/GameManager.asset index c09148a..3a626a4 100644 --- a/Assets/Scripts/GameManager.asset +++ b/Assets/Scripts/GameManager.asset @@ -43,7 +43,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 36 + Data: 37 - Name: Entry: 7 Data: @@ -103,13 +103,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: waitingForTimeSequenceFinish + Data: waitingForTimeSequenceFinalize - Name: $v Entry: 7 Data: 5|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: waitingForTimeSequenceFinish + Data: waitingForTimeSequenceFinalize - Name: k__BackingField Entry: 9 Data: 3 @@ -1150,19 +1150,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: recorder + Data: networkManager - Name: $v Entry: 7 Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: recorder + Data: networkManager - Name: k__BackingField - Entry: 9 - Data: 53 + Entry: 7 + Data: 72|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: Marro.PacManUdon.NetworkManager, Assembly-CSharp + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 53 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1177,13 +1183,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 73|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 74|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1204,19 +1210,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: startingExtraLives + Data: recorder - Name: $v Entry: 7 - Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: startingExtraLives + Data: recorder - Name: k__BackingField Entry: 9 - Data: 11 + Data: 53 - Name: k__BackingField Entry: 9 - Data: 11 + Data: 53 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1231,19 +1237,10 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 76|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - - Name: header - Entry: 1 - Data: Game settings - - Name: - Entry: 8 - Data: + Data: 1 - Name: Entry: 7 Data: 77|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -1267,13 +1264,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: scoreToExtraLife + Data: startingExtraLives - Name: $v Entry: 7 Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: scoreToExtraLife + Data: startingExtraLives - Name: k__BackingField Entry: 9 Data: 11 @@ -1297,10 +1294,19 @@ MonoBehaviour: Data: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 - Data: 80|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 80|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Game settings + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 81|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1321,13 +1327,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pelletCountOverride + Data: scoreToExtraLife - Name: $v Entry: 7 - Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pelletCountOverride + Data: scoreToExtraLife - Name: k__BackingField Entry: 9 Data: 11 @@ -1348,19 +1354,10 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 83|UnityEngine.TooltipAttribute, UnityEngine.CoreModule - - Name: tooltip - Entry: 1 - Data: Override amount of pellets needed to clear stage, set to -1 to disable. - - Name: - Entry: 8 - Data: + Data: 1 - Name: Entry: 7 Data: 84|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -1384,16 +1381,79 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: maze + Data: pelletCountOverride - Name: $v Entry: 7 Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: pelletCountOverride + - Name: k__BackingField + Entry: 9 + Data: 11 + - Name: k__BackingField + Entry: 9 + Data: 11 + - 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: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 87|UnityEngine.TooltipAttribute, UnityEngine.CoreModule + - Name: tooltip + Entry: 1 + Data: Override amount of pellets needed to clear stage, set to -1 to disable. + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 88|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: maze + - Name: $v + Entry: 7 + Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: maze - Name: k__BackingField Entry: 7 - Data: 86|System.RuntimeType, mscorlib + Data: 90|System.RuntimeType, mscorlib - Name: Entry: 1 Data: Marro.PacManUdon.Maze, Assembly-CSharp @@ -1417,7 +1477,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1441,13 +1501,13 @@ MonoBehaviour: Data: pelletPool - Name: $v Entry: 7 - Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: pelletPool - Name: k__BackingField Entry: 7 - Data: 89|System.RuntimeType, mscorlib + Data: 93|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Components.VRCObjectPool, VRCSDK3 @@ -1456,7 +1516,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 89 + Data: 93 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1471,7 +1531,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 90|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 94|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1495,13 +1555,13 @@ MonoBehaviour: Data: intermission2Pole - Name: $v Entry: 7 - Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: intermission2Pole - Name: k__BackingField Entry: 7 - Data: 92|System.RuntimeType, mscorlib + Data: 96|System.RuntimeType, mscorlib - Name: Entry: 1 Data: Marro.PacManUdon.Intermission2Pole, Assembly-CSharp @@ -1523,102 +1583,6 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 93|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: mazeSpriteAnimator - - Name: $v - Entry: 7 - Data: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: mazeSpriteAnimator - - Name: k__BackingField - Entry: 9 - Data: 64 - - Name: k__BackingField - Entry: 9 - Data: 64 - - 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: false - - Name: _fieldAttributes - Entry: 7 - Data: 95|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: pelletCountTotal - - Name: $v - Entry: 7 - Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: pelletCountTotal - - Name: k__BackingField - Entry: 9 - Data: 11 - - Name: k__BackingField - Entry: 9 - Data: 11 - - 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: false - Name: _fieldAttributes Entry: 7 Data: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -1642,19 +1606,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pelletCountRemaining + Data: mazeSpriteAnimator - Name: $v Entry: 7 Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pelletCountRemaining + Data: mazeSpriteAnimator - Name: k__BackingField Entry: 9 - Data: 11 + Data: 64 - Name: k__BackingField Entry: 9 - Data: 11 + Data: 64 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1690,16 +1654,114 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: attractScreenElements + Data: pelletCountTotal - Name: $v Entry: 7 Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: pelletCountTotal + - Name: k__BackingField + Entry: 9 + Data: 11 + - Name: k__BackingField + Entry: 9 + Data: 11 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 101|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: pelletCountRemaining + - Name: $v + Entry: 7 + Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: pelletCountRemaining + - Name: k__BackingField + Entry: 9 + Data: 11 + - Name: k__BackingField + Entry: 9 + Data: 11 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 103|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: attractScreenElements + - Name: $v + Entry: 7 + Data: 104|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: attractScreenElements - Name: k__BackingField Entry: 7 - Data: 101|System.RuntimeType, mscorlib + Data: 105|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.GameObject[], UnityEngine.CoreModule @@ -1708,7 +1770,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 101 + Data: 105 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1723,7 +1785,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 102|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 106|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -1748,16 +1810,16 @@ MonoBehaviour: Data: intermissionScreenElements - Name: $v Entry: 7 - Data: 103|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 107|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: intermissionScreenElements - Name: k__BackingField Entry: 9 - Data: 101 + Data: 105 - Name: k__BackingField Entry: 9 - Data: 101 + Data: 105 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1772,7 +1834,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 104|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 108|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -1797,13 +1859,13 @@ MonoBehaviour: Data: gameState - Name: $v Entry: 7 - Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 109|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: gameState - Name: k__BackingField Entry: 7 - Data: 106|System.RuntimeType, mscorlib + Data: 110|System.RuntimeType, mscorlib - Name: Entry: 1 Data: Marro.PacManUdon.PacManGameState, Assembly-CSharp @@ -1817,69 +1879,8 @@ MonoBehaviour: Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 + Entry: 6 Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 107|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 108|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 109|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - - 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: score - - Name: $v - Entry: 7 - Data: 110|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: score - - Name: k__BackingField - Entry: 9 - Data: 11 - - Name: k__BackingField - Entry: 9 - Data: 11 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - Name: Entry: 8 Data: @@ -1892,16 +1893,65 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 2 + Data: 0 - Name: - Entry: 7 - Data: 112|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 113|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: + - Name: $k + Entry: 1 + Data: score + - Name: $v + Entry: 7 + Data: 112|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: score + - Name: k__BackingField + Entry: 9 + Data: 11 + - Name: k__BackingField + Entry: 9 + Data: 11 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 113|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 114|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 115|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1925,7 +1975,7 @@ MonoBehaviour: Data: level - Name: $v Entry: 7 - Data: 114|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: level @@ -1949,20 +1999,20 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 115|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 117|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 116|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 118|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 117|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 119|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1986,7 +2036,7 @@ MonoBehaviour: Data: highScore - Name: $v Entry: 7 - Data: 118|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 120|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: highScore @@ -2010,20 +2060,20 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 119|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 121|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 120|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 122|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 121|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 123|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -2047,7 +2097,7 @@ MonoBehaviour: Data: extraLives - Name: $v Entry: 7 - Data: 122|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 124|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: extraLives @@ -2071,20 +2121,20 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 123|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 125|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 124|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 126|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 125|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 127|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index d2aa6c6..e2c58f0 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -45,7 +45,7 @@ namespace Marro.PacManUdon private GameObject[] attractScreenElements; private GameObject[] intermissionScreenElements; - [UdonSynced, FieldChangeCallback(nameof(GameState))] private PacManGameState gameState; + private PacManGameState gameState; [UdonSynced, FieldChangeCallback(nameof(Score))] private int score; [UdonSynced, FieldChangeCallback(nameof(Level))] private int level; [UdonSynced, FieldChangeCallback(nameof(HighScore))] private int highScore; @@ -119,35 +119,16 @@ namespace Marro.PacManUdon StartTimeSequence(PacManTimeSequence.StartNewGame); } - public void SkipLevelButtonPressed() - { - if (Networking.IsOwner(gameObject)) - { - Debug.Log($"{gameObject} Skip level button pressed!"); - StartTimeSequence(PacManTimeSequence.BoardClear); - TimeSequenceSkipToNextStep(); - } - } - - public void StartDemoButtonPressed() - { - if (Networking.IsOwner(gameObject)) - { - Debug.Log($"{gameObject} Start demo button pressed!"); - StartTimeSequence(PacManTimeSequence.Intermission1); - } - } - private void StartAttractMode() { -// #if RECORDING_DEMO + // #if RECORDING_DEMO // recorder.gameObject.SetActive(true); StartTimeSequence(PacManTimeSequence.AttractScreenIntroduction); -// #else -// SetGameState(PacManGameState.AttractMode); -// HideEverything(); -// demo.gameObject.SetActive(true); -// #endif + // #else + // SetGameState(PacManGameState.AttractMode); + // HideEverything(); + // demo.gameObject.SetActive(true); + // #endif } private void InitializeNewGame() @@ -162,19 +143,16 @@ namespace Marro.PacManUdon { Debug.Log($"{gameObject} New level started!"); - if (Networking.IsOwner(gameObject)) + pelletCountTotal = pelletPool.Pool.Length; + pelletCountRemaining = pelletCountTotal; + ghostManager.SetPelletsRemaining(pelletCountRemaining); + ghostManager.NewLevel(); + + pelletManager.RestoreAllPellets(); + + if (pelletCountOverride > 0) { - pelletCountTotal = pelletPool.Pool.Length; - pelletCountRemaining = pelletCountTotal; - ghostManager.SetPelletsRemaining(pelletCountRemaining); - ghostManager.NewLevel(); - - pelletManager.RestoreAllPellets(); - - if (pelletCountOverride > 0) - { - pelletCountRemaining = pelletCountOverride; - } + pelletCountRemaining = pelletCountOverride; } mazeSpriteAnimator.SetBool("Blinking", false); } @@ -287,7 +265,7 @@ namespace Marro.PacManUdon mazeSpriteAnimator.SetBool("Blinking", true); } - + private void HideEverything() { SetPelletsActive(false); diff --git a/Assets/Scripts/Ghost.asset b/Assets/Scripts/Ghost.asset index 27a1d7b..61db681 100644 --- a/Assets/Scripts/Ghost.asset +++ b/Assets/Scripts/Ghost.asset @@ -49,157 +49,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ghostType + Data: direction - Name: $v Entry: 7 Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ghostType + Data: direction - Name: k__BackingField Entry: 7 Data: 3|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: Marro.PacManUdon.PacManGhostType, Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 7 - Data: 4|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Int32, mscorlib - - Name: - Entry: 8 - Data: - - 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: 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: startState - - Name: $v - Entry: 7 - Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: startState - - Name: k__BackingField - Entry: 7 - Data: 8|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: Marro.PacManUdon.PacManGhostStartState, Assembly-CSharp + Data: UnityEngine.Vector2, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 4 - - 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: 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: 7 - Data: - - Name: $k - Entry: 1 - Data: ghostManager - - Name: $v - Entry: 7 - Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: ghostManager - - Name: k__BackingField - Entry: 7 - Data: 12|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: Marro.PacManUdon.GhostManager, Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 7 - Data: 13|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: VRC.Udon.UdonBehaviour, VRC.Udon - - Name: - Entry: 8 - Data: + Data: 3 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -214,7 +82,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -235,25 +103,157 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: animator + Data: ghostType - Name: $v Entry: 7 - Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 5|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: animator + Data: ghostType - Name: k__BackingField Entry: 7 - Data: 16|System.RuntimeType, mscorlib + Data: 6|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Animator, UnityEngine.AnimationModule + Data: Marro.PacManUdon.PacManGhostType, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 7|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: + - 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: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 9|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: startState + - Name: $v + Entry: 7 + Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: startState + - Name: k__BackingField + Entry: 7 + Data: 11|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: Marro.PacManUdon.PacManGhostStartState, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 16 + Data: 7 + - 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: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 13|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: ghostManager + - Name: $v + Entry: 7 + Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: ghostManager + - Name: k__BackingField + Entry: 7 + Data: 15|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: Marro.PacManUdon.GhostManager, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 16|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.Udon.UdonBehaviour, VRC.Udon + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -289,19 +289,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: renderer + Data: animator - Name: $v Entry: 7 Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: renderer + Data: animator - Name: k__BackingField Entry: 7 Data: 19|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Renderer, UnityEngine.CoreModule + Data: UnityEngine.Animator, UnityEngine.AnimationModule - Name: Entry: 8 Data: @@ -343,25 +343,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pacMan + Data: renderer - Name: $v Entry: 7 Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pacMan + Data: renderer - Name: k__BackingField Entry: 7 Data: 22|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: Marro.PacManUdon.PacMan, Assembly-CSharp + Data: UnityEngine.Renderer, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 13 + Data: 22 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -397,25 +397,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: blinky + Data: pacMan - Name: $v Entry: 7 Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: blinky + Data: pacMan - Name: k__BackingField Entry: 7 Data: 25|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: Marro.PacManUdon.Ghost, Assembly-CSharp + Data: Marro.PacManUdon.PacMan, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 13 + Data: 16 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -451,25 +451,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: scoreBonusDisplay + Data: blinky - Name: $v Entry: 7 Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: scoreBonusDisplay + Data: blinky - Name: k__BackingField Entry: 7 Data: 28|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: Marro.PacManUdon.ScoreBonusDisplay, Assembly-CSharp + Data: Marro.PacManUdon.Ghost, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 13 + Data: 16 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -505,25 +505,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: startPosition + Data: scoreBonusDisplay - Name: $v Entry: 7 Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: startPosition + Data: scoreBonusDisplay - Name: k__BackingField Entry: 7 Data: 31|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Vector3, UnityEngine.CoreModule + Data: Marro.PacManUdon.ScoreBonusDisplay, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 31 + Data: 16 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -559,19 +559,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: startRotation + Data: startPosition - Name: $v Entry: 7 Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: startRotation + Data: startPosition - Name: k__BackingField Entry: 7 Data: 34|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Quaternion, UnityEngine.CoreModule + Data: UnityEngine.Vector3, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -613,19 +613,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: startScale + Data: startRotation - Name: $v Entry: 7 Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: startScale + Data: startRotation - Name: k__BackingField - Entry: 9 - Data: 31 + Entry: 7 + Data: 37|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Quaternion, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 31 + Data: 37 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -640,7 +646,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -661,25 +667,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: homePosition + Data: startScale - Name: $v Entry: 7 - Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: homePosition + Data: startScale - Name: k__BackingField - Entry: 7 - Data: 39|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Vector2, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 34 - Name: k__BackingField Entry: 9 - Data: 39 + Data: 34 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -715,19 +715,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: idlePosition1 + Data: homePosition - Name: $v Entry: 7 Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: idlePosition1 + Data: homePosition - Name: k__BackingField Entry: 9 - Data: 39 + Data: 3 - Name: k__BackingField Entry: 9 - Data: 39 + Data: 3 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -763,19 +763,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: idlePosition2 + Data: idlePosition1 - Name: $v Entry: 7 Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: idlePosition2 + Data: idlePosition1 - Name: k__BackingField Entry: 9 - Data: 39 + Data: 3 - Name: k__BackingField Entry: 9 - Data: 39 + Data: 3 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -811,19 +811,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: cornerPosition + Data: idlePosition2 - Name: $v Entry: 7 Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: cornerPosition + Data: idlePosition2 - Name: k__BackingField Entry: 9 - Data: 39 + Data: 3 - Name: k__BackingField Entry: 9 - Data: 39 + Data: 3 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -859,25 +859,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: kinematic + Data: cornerPosition - Name: $v Entry: 7 Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: kinematic + Data: cornerPosition - Name: k__BackingField - Entry: 7 - Data: 48|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Boolean, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 3 - Name: k__BackingField Entry: 9 - Data: 48 + Data: 3 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -892,7 +886,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -913,19 +907,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: horizontalOnly + Data: kinematic - Name: $v Entry: 7 - Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: horizontalOnly + Data: kinematic - Name: k__BackingField - Entry: 9 - Data: 48 + Entry: 7 + Data: 50|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 48 + Data: 50 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -961,19 +961,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: housePelletCounterLimit + Data: horizontalOnly - Name: $v Entry: 7 Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: housePelletCounterLimit + Data: horizontalOnly - Name: k__BackingField Entry: 9 - Data: 4 + Data: 50 - Name: k__BackingField Entry: 9 - Data: 4 + Data: 50 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1009,19 +1009,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: faceInStartingDirectionUntilUnfrozen + Data: housePelletCounterLimit - Name: $v Entry: 7 Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: faceInStartingDirectionUntilUnfrozen + Data: housePelletCounterLimit - Name: k__BackingField Entry: 9 - Data: 48 + Data: 7 - Name: k__BackingField Entry: 9 - Data: 48 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1057,19 +1057,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: specialLook + Data: faceInStartingDirectionUntilUnfrozen - Name: $v Entry: 7 Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: specialLook + Data: faceInStartingDirectionUntilUnfrozen - Name: k__BackingField Entry: 9 - Data: 48 + Data: 50 - Name: k__BackingField Entry: 9 - Data: 48 + Data: 50 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1105,19 +1105,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: followingPredefinedPath + Data: specialLook - Name: $v Entry: 7 Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: followingPredefinedPath + Data: specialLook - Name: k__BackingField Entry: 9 - Data: 48 + Data: 50 - Name: k__BackingField Entry: 9 - Data: 48 + Data: 50 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1153,25 +1153,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: predefinedPath + Data: followingPredefinedPath - Name: $v Entry: 7 Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: predefinedPath + Data: followingPredefinedPath - Name: k__BackingField - Entry: 7 - Data: 61|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Vector2[], UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 50 - Name: k__BackingField Entry: 9 - Data: 61 + Data: 50 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1186,7 +1180,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1207,19 +1201,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: predefinedPathIndex + Data: predefinedPath - Name: $v Entry: 7 - Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: predefinedPathIndex + Data: predefinedPath - Name: k__BackingField - Entry: 9 - Data: 4 + Entry: 7 + Data: 63|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Vector2[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 4 + Data: 63 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1255,25 +1255,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: rngState + Data: predefinedPathIndex - Name: $v Entry: 7 Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: rngState + Data: predefinedPathIndex - Name: k__BackingField Entry: 9 - Data: 4 + Data: 7 - Name: k__BackingField Entry: 9 - Data: 4 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: @@ -1285,13 +1285,55 @@ MonoBehaviour: Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 0 - Name: - Entry: 7 - Data: 67|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Entry: 13 + Data: - Name: Entry: 8 Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: rngState + - Name: $v + Entry: 7 + Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: rngState + - Name: k__BackingField + Entry: 9 + Data: 7 + - Name: k__BackingField + Entry: 9 + Data: 7 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 - Name: Entry: 13 Data: @@ -1312,22 +1354,22 @@ MonoBehaviour: Data: syncedPosition - Name: $v Entry: 7 - Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: syncedPosition - Name: k__BackingField Entry: 9 - Data: 39 + Data: 3 - Name: k__BackingField Entry: 9 - Data: 39 + Data: 3 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: @@ -1336,16 +1378,10 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 70|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -1386,8 +1422,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: @@ -1399,13 +1435,7 @@ MonoBehaviour: Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 74|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -1423,25 +1453,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: direction + Data: target - Name: $v Entry: 7 - Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: direction + Data: target - Name: k__BackingField Entry: 9 - Data: 39 + Data: 3 - Name: k__BackingField Entry: 9 - Data: 39 + Data: 3 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: @@ -1450,16 +1480,10 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 77|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -1477,25 +1501,73 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: target + Data: offGrid + - Name: $v + Entry: 7 + Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: offGrid + - Name: k__BackingField + Entry: 9 + Data: 50 + - Name: k__BackingField + Entry: 9 + Data: 50 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 77|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: inTunnel - Name: $v Entry: 7 Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: target + Data: inTunnel - Name: k__BackingField Entry: 9 - Data: 39 + Data: 50 - Name: k__BackingField Entry: 9 - Data: 39 + Data: 50 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: @@ -1507,13 +1579,7 @@ MonoBehaviour: Data: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 80|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -1531,25 +1597,31 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: offGrid + Data: ghostState - Name: $v Entry: 7 - Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: offGrid + Data: ghostState - Name: k__BackingField - Entry: 9 - Data: 48 + Entry: 7 + Data: 81|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: Marro.PacManUdon.PacManGhostState, Assembly-CSharp + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 48 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: @@ -1561,13 +1633,7 @@ MonoBehaviour: Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 83|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -1585,25 +1651,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: inTunnel + Data: isScared - Name: $v Entry: 7 - Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: inTunnel + Data: isScared - Name: k__BackingField Entry: 9 - Data: 48 + Data: 50 - Name: k__BackingField Entry: 9 - Data: 48 + Data: 50 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: @@ -1612,16 +1678,10 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 86|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -1639,31 +1699,79 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ghostState + Data: scattering + - Name: $v + Entry: 7 + Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: scattering + - Name: k__BackingField + Entry: 9 + Data: 50 + - Name: k__BackingField + Entry: 9 + Data: 50 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 86|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: frozenState - Name: $v Entry: 7 Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ghostState + Data: frozenState - Name: k__BackingField Entry: 7 Data: 88|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: Marro.PacManUdon.PacManGhostState, Assembly-CSharp + Data: Marro.PacManUdon.PacManGhostFrozenState, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 4 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: @@ -1675,13 +1783,7 @@ MonoBehaviour: Data: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 90|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -1699,25 +1801,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: isScared + Data: hideUntilUnfrozen - Name: $v Entry: 7 - Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: isScared + Data: hideUntilUnfrozen - Name: k__BackingField Entry: 9 - Data: 48 + Data: 50 - Name: k__BackingField Entry: 9 - Data: 48 + Data: 50 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: @@ -1726,16 +1828,10 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 92|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 93|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -1753,25 +1849,73 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: scattering + Data: housePelletCounter + - Name: $v + Entry: 7 + Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: housePelletCounter + - Name: k__BackingField + Entry: 9 + Data: 7 + - Name: k__BackingField + Entry: 9 + Data: 7 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 93|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: housePelletCounterActive - Name: $v Entry: 7 Data: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: scattering + Data: housePelletCounterActive - Name: k__BackingField Entry: 9 - Data: 48 + Data: 50 - Name: k__BackingField Entry: 9 - Data: 48 + Data: 50 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: @@ -1783,238 +1927,7 @@ MonoBehaviour: Data: 95|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 96|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - 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: frozenState - - Name: $v - Entry: 7 - Data: 97|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: frozenState - - Name: k__BackingField - Entry: 7 - Data: 98|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: Marro.PacManUdon.PacManGhostFrozenState, Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 4 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 100|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - 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: hideUntilUnfrozen - - Name: $v - Entry: 7 - Data: 101|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: hideUntilUnfrozen - - Name: k__BackingField - Entry: 9 - Data: 48 - - Name: k__BackingField - Entry: 9 - Data: 48 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 102|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 103|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - 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: housePelletCounter - - Name: $v - Entry: 7 - Data: 104|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: housePelletCounter - - Name: k__BackingField - Entry: 9 - Data: 4 - - Name: k__BackingField - Entry: 9 - Data: 4 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 105|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 106|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - 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: housePelletCounterActive - - Name: $v - Entry: 7 - Data: 107|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: housePelletCounterActive - - Name: k__BackingField - Entry: 9 - Data: 48 - - Name: k__BackingField - Entry: 9 - Data: 48 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 108|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 109|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -2035,22 +1948,22 @@ MonoBehaviour: Data: turnAroundSoon - Name: $v Entry: 7 - Data: 110|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: turnAroundSoon - Name: k__BackingField Entry: 9 - Data: 48 + Data: 50 - Name: k__BackingField Entry: 9 - Data: 48 + Data: 50 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: @@ -2059,17 +1972,10 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 111|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib + Data: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 112|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: diff --git a/Assets/Scripts/Ghost.cs b/Assets/Scripts/Ghost.cs index 0b1a31b..6e7bdf8 100644 --- a/Assets/Scripts/Ghost.cs +++ b/Assets/Scripts/Ghost.cs @@ -72,21 +72,20 @@ namespace Marro.PacManUdon private Vector2[] predefinedPath; private int predefinedPathIndex; - [UdonSynced] int rngState; - [UdonSynced] private Vector2 syncedPosition; - [UdonSynced] private float speed; - [UdonSynced] private Vector2 direction; - [UdonSynced] private Vector2 target; - [UdonSynced] private bool offGrid; - [UdonSynced] private bool inTunnel; - [UdonSynced] private PacManGhostState ghostState; - [UdonSynced] private bool isScared; - [UdonSynced] private bool scattering; - [UdonSynced] private PacManGhostFrozenState frozenState; - [UdonSynced] private bool hideUntilUnfrozen; - [UdonSynced] private int housePelletCounter; - [UdonSynced] private bool housePelletCounterActive; - [UdonSynced] private bool turnAroundSoon; + int rngState; + private Vector2 syncedPosition; + private float speed; + private Vector2 target; + private bool offGrid; + private bool inTunnel; + private PacManGhostState ghostState; + private bool isScared; + private bool scattering; + private PacManGhostFrozenState frozenState; + private bool hideUntilUnfrozen; + private int housePelletCounter; + private bool housePelletCounterActive; + private bool turnAroundSoon; public void Initialize(PacMan pacMan, Ghost blinky, Vector2 homePosition, Vector2 idlePosition1, Vector2 idlePosition2, Vector2 cornerPosition) { @@ -639,10 +638,6 @@ namespace Marro.PacManUdon ghostState = state; UpdateAnimator(); UpdateSpeed(); - if (Networking.IsOwner(gameObject)) - { - RequestSerialization(); - } } private void SetScared(bool scared) @@ -655,11 +650,6 @@ namespace Marro.PacManUdon { SetWhite(false); } - - if (Networking.IsOwner(gameObject)) - { - RequestSerialization(); - } } public void SetScattering(bool scattering, bool reverseDirection = true) diff --git a/Assets/Scripts/PacMan.cs b/Assets/Scripts/PacMan.cs index f8c29de..0174dc2 100644 --- a/Assets/Scripts/PacMan.cs +++ b/Assets/Scripts/PacMan.cs @@ -28,11 +28,10 @@ private Vector2[] predefinedPath; private int predefinedPathIndex; - [UdonSynced] private Vector2 syncedPosition; - [UdonSynced] private Vector2 targetDirection; - [UdonSynced] private Vector2 direction; - [UdonSynced] private float freezeSeconds; - [UdonSynced] private bool frozen; + private Vector2 syncedPosition; + private Vector2 targetDirection; + private float freezeSeconds; + private bool frozen; #region Animator constants private const string AnimatorKeyDead = "Dead"; @@ -322,17 +321,6 @@ UpdateAnimator(); } - public override void OnPreSerialization() - { - syncedPosition = GetPosition(); - } - - public override void OnDeserialization() - { - SetPosition(syncedPosition); - UpdateAnimator(); - } - void OnTriggerEnter(Collider other) { Pellet pellet = other.gameObject.GetComponent(); @@ -350,16 +338,14 @@ if (pellet.isPowerPellet) { - if (Networking.IsOwner(gameObject)) gameController.GotPowerPellet(); + gameController.GotPowerPellet(); freezeSeconds = 0.05f; } else { - if (Networking.IsOwner(gameObject)) gameController.GotPellet(); + gameController.GotPellet(); freezeSeconds = 0.0166666666666667f; } - - if (Networking.IsOwner(gameObject)) RequestSerialization(); return; } else if (Networking.IsOwner(gameObject) && other.gameObject.GetComponent()) diff --git a/Assets/Scripts/PlayerInput.asset b/Assets/Scripts/PlayerInput.asset index bcbce80..b51b1bc 100644 --- a/Assets/Scripts/PlayerInput.asset +++ b/Assets/Scripts/PlayerInput.asset @@ -103,13 +103,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: gameController + Data: gameManager - Name: $v Entry: 7 Data: 5|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: gameController + Data: gameManager - Name: k__BackingField Entry: 7 Data: 6|System.RuntimeType, mscorlib