diff --git a/Assets/Scripts/Ghost.asset b/Assets/Scripts/Ghost.asset index fd3b977..da62ab4 100644 --- a/Assets/Scripts/Ghost.asset +++ b/Assets/Scripts/Ghost.asset @@ -43,7 +43,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 37 + Data: 36 - Name: Entry: 7 Data: @@ -913,25 +913,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: kinematic + Data: target - Name: $v Entry: 7 Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: kinematic + Data: target - Name: k__BackingField - Entry: 7 - Data: 51|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Boolean, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 7 - Name: k__BackingField Entry: 9 - Data: 51 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -946,7 +940,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -970,16 +964,22 @@ MonoBehaviour: Data: horizontalOnly - Name: $v Entry: 7 - Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: horizontalOnly - Name: k__BackingField - Entry: 9 - Data: 51 + Entry: 7 + Data: 53|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 51 + Data: 53 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1015,19 +1015,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: housePelletCounterLimit + Data: inTunnel - Name: $v Entry: 7 Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: housePelletCounterLimit + Data: inTunnel - 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 @@ -1063,19 +1063,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: faceInStartingDirectionUntilUnfrozen + Data: rngState - Name: $v Entry: 7 Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: faceInStartingDirectionUntilUnfrozen + Data: rngState - Name: k__BackingField Entry: 9 - Data: 51 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 51 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1111,19 +1111,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: specialLook + Data: turnAroundSoon - Name: $v Entry: 7 Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: specialLook + Data: turnAroundSoon - Name: k__BackingField Entry: 9 - Data: 51 + Data: 53 - Name: k__BackingField Entry: 9 - Data: 51 + Data: 53 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1159,214 +1159,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: followingPredefinedPath + Data: speed - Name: $v Entry: 7 Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: followingPredefinedPath - - Name: k__BackingField - Entry: 9 - Data: 51 - - Name: k__BackingField - Entry: 9 - Data: 51 - - 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: 62|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: predefinedPath - - Name: $v - Entry: 7 - Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: predefinedPath - - Name: k__BackingField - Entry: 7 - Data: 64|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Vector2[], UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - 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: 65|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: predefinedPathIndex - - Name: $v - Entry: 7 - Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: predefinedPathIndex - - 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: 67|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: rngState - - Name: $v - Entry: 7 - Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: rngState - - 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: 69|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: speed - - Name: $v - Entry: 7 - Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: speed - Name: k__BackingField Entry: 7 - Data: 71|System.RuntimeType, mscorlib + Data: 62|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Single, mscorlib @@ -1375,7 +1177,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 71 + Data: 62 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1390,151 +1192,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 72|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: target - - Name: $v - Entry: 7 - Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: target - - 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: 74|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: offGrid - - Name: $v - Entry: 7 - Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: offGrid - - Name: k__BackingField - Entry: 9 - Data: 51 - - Name: k__BackingField - Entry: 9 - Data: 51 - - 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: 76|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: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: inTunnel - - Name: k__BackingField - Entry: 9 - Data: 51 - - Name: k__BackingField - Entry: 9 - Data: 51 - - 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: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1558,13 +1216,13 @@ MonoBehaviour: Data: ghostState - Name: $v Entry: 7 - Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: ghostState - Name: k__BackingField Entry: 7 - Data: 80|System.RuntimeType, mscorlib + Data: 65|System.RuntimeType, mscorlib - Name: Entry: 1 Data: Marro.PacManUdon.PacManGhostState, Assembly-CSharp @@ -1586,6 +1244,348 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 66|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: isScared + - Name: $v + Entry: 7 + Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: isScared + - Name: k__BackingField + Entry: 9 + Data: 53 + - Name: k__BackingField + Entry: 9 + Data: 53 + - 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: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: scattering + - Name: $v + Entry: 7 + Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: scattering + - Name: k__BackingField + Entry: 9 + Data: 53 + - Name: k__BackingField + Entry: 9 + Data: 53 + - 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: 70|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: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: frozenState + - Name: k__BackingField + Entry: 7 + Data: 72|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: Marro.PacManUdon.PacManGhostFrozenState, Assembly-CSharp + - Name: + Entry: 8 + Data: + - 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: 73|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: offGrid + - Name: $v + Entry: 7 + Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: offGrid + - Name: k__BackingField + Entry: 9 + Data: 53 + - Name: k__BackingField + Entry: 9 + Data: 53 + - 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: 75|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: housePelletCounter + - Name: $v + Entry: 7 + Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: housePelletCounter + - 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: 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: housePelletCounterActive + - Name: $v + Entry: 7 + Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: housePelletCounterActive + - Name: k__BackingField + Entry: 9 + Data: 53 + - Name: k__BackingField + Entry: 9 + Data: 53 + - 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: 79|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: housePelletCounterLimit + - Name: $v + Entry: 7 + Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: housePelletCounterLimit + - 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: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -1609,19 +1609,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: isScared + Data: faceInStartingDirectionUntilUnfrozen - Name: $v Entry: 7 Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: isScared + Data: faceInStartingDirectionUntilUnfrozen - Name: k__BackingField Entry: 9 - Data: 51 + Data: 53 - Name: k__BackingField Entry: 9 - Data: 51 + Data: 53 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1657,19 +1657,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: scattering + Data: kinematic - Name: $v Entry: 7 Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: scattering + Data: kinematic - Name: k__BackingField Entry: 9 - Data: 51 + Data: 53 - Name: k__BackingField Entry: 9 - Data: 51 + Data: 53 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1705,25 +1705,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: frozenState + Data: specialLook - Name: $v Entry: 7 Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: frozenState + Data: specialLook - Name: k__BackingField - Entry: 7 - Data: 87|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: Marro.PacManUdon.PacManGhostFrozenState, Assembly-CSharp - - Name: - Entry: 8 - Data: + Entry: 9 + 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 @@ -1738,7 +1732,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1759,19 +1753,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: hideUntilUnfrozen + Data: followingPredefinedPath - Name: $v Entry: 7 - Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: hideUntilUnfrozen + Data: followingPredefinedPath - Name: k__BackingField Entry: 9 - Data: 51 + Data: 53 - Name: k__BackingField Entry: 9 - Data: 51 + Data: 53 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1786,7 +1780,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 90|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1807,19 +1801,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: housePelletCounter + Data: predefinedPath - Name: $v Entry: 7 - Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: housePelletCounter + Data: predefinedPath - Name: k__BackingField - Entry: 9 - Data: 11 + Entry: 7 + Data: 91|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Vector2[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 11 + Data: 91 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1855,19 +1855,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: housePelletCounterActive + Data: predefinedPathIndex - Name: $v Entry: 7 Data: 93|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: housePelletCounterActive + Data: predefinedPathIndex - Name: k__BackingField Entry: 9 - Data: 51 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 51 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1898,54 +1898,6 @@ MonoBehaviour: - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: turnAroundSoon - - Name: $v - Entry: 7 - Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: turnAroundSoon - - Name: k__BackingField - Entry: 9 - Data: 51 - - Name: k__BackingField - Entry: 9 - Data: 51 - - 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: 96|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: 13 Data: diff --git a/Assets/Scripts/Ghost.cs b/Assets/Scripts/Ghost.cs index ed9ab41..6497015 100644 --- a/Assets/Scripts/Ghost.cs +++ b/Assets/Scripts/Ghost.cs @@ -39,6 +39,7 @@ namespace Marro.PacManUdon [SerializeField] private PacManGhostType ghostType; [SerializeField] private PacManGhostStartState startState; + // External references private GhostManager ghostManager; private Animator animator; private new Renderer renderer; @@ -54,31 +55,36 @@ namespace Marro.PacManUdon private Vector2 idlePosition2; private Vector2 cornerPosition; - private bool kinematic; - + // Pathfinding + private Vector2 target; private bool horizontalOnly; - private int housePelletCounterLimit; + private bool inTunnel; + private int rngState; + private bool turnAroundSoon; + private float speed; + + // State + private PacManGhostState ghostState; + private bool isScared; + private bool scattering; + private PacManGhostFrozenState frozenState; + + // Home + private bool offGrid; + private int housePelletCounter; + private bool housePelletCounterActive; + private int housePelletCounterLimit; private bool faceInStartingDirectionUntilUnfrozen; + + // Cutscene + private bool kinematic; private bool specialLook; private bool followingPredefinedPath; private Vector2[] predefinedPath; private int predefinedPathIndex; - int rngState; - 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 int housePelletCounter; - private bool housePelletCounterActive; - private bool turnAroundSoon; - public void Initialize(PacMan pacMan, Ghost blinky, Transform startTransform, Vector2 homePosition, Vector2 idlePosition1, Vector2 idlePosition2, Vector2 cornerPosition) { ghostManager = transform.parent.GetComponent(); @@ -760,6 +766,62 @@ namespace Marro.PacManUdon UpdateAnimator(); } + public override void CollectSyncedData(byte[] data, ref int index, NetworkEventType eventType) + { + if (eventType != NetworkEventType.GhostUpdate) + { + return; + } + + data.Append(target, ref index); + data.Append(horizontalOnly, ref index); + data.Append(inTunnel, ref index); + data.Append(rngState, ref index); + data.Append(turnAroundSoon, ref index); + data.Append(speed, ref index); + + data.Append((byte)ghostState, ref index); + data.Append(isScared, ref index); + data.Append(scattering, ref index); + data.Append((byte)frozenState, ref index); + + data.Append(offGrid, ref index); + data.Append((byte)housePelletCounter, ref index); + data.Append(housePelletCounterActive, ref index); + data.Append((byte)housePelletCounterLimit, ref index); + data.Append(faceInStartingDirectionUntilUnfrozen, ref index); + + base.CollectSyncedData(data, ref index, eventType); + } + + public override bool WriteSyncedData(byte[] data, ref int index, NetworkEventType eventType) + { + if (eventType != NetworkEventType.GhostUpdate) + { + return true; + } + + target = data.ReadVector2(ref index); + horizontalOnly = data.ReadBool(ref index); + inTunnel = data.ReadBool(ref index); + rngState = data.ReadInt(ref index); + turnAroundSoon = data.ReadBool(ref index); + speed = data.ReadFloat(ref index); + + ghostState = (PacManGhostState)data.ReadByte(ref index); + isScared = data.ReadBool(ref index); + scattering = data.ReadBool(ref index); + frozenState = (PacManGhostFrozenState)data.ReadByte(ref index); + + offGrid = data.ReadBool(ref index); + housePelletCounter = data.ReadByte(ref index); + housePelletCounterActive = data.ReadBool(ref index); + housePelletCounterLimit = data.ReadByte(ref index); + faceInStartingDirectionUntilUnfrozen = data.ReadBool(ref index); + + return base.WriteSyncedData(data, ref index, eventType); + } + void OnTriggerEnter(Collider other) { if (other.gameObject.GetComponent()) @@ -796,14 +858,5 @@ namespace Marro.PacManUdon SetInTunnel(false); } } - - PacManGhostState State - { - set - { - SetState(value); - } - get => ghostState; - } } } \ No newline at end of file diff --git a/Assets/Scripts/NetworkManager.cs b/Assets/Scripts/NetworkManager.cs index ed627fc..f353480 100644 --- a/Assets/Scripts/NetworkManager.cs +++ b/Assets/Scripts/NetworkManager.cs @@ -16,6 +16,7 @@ namespace Marro.PacManUdon PacManTurn = 2, StartGameButtonPressed = 3, SyncPellets = 4, + GhostUpdate = 5, } public class NetworkManager : UdonSharpBehaviour