diff --git a/Assets/Scripts/Intermission2Pole.cs b/Assets/Scripts/Intermission2Pole.cs index d014572..55055fe 100644 --- 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; - } } } \ No newline at end of file diff --git a/Assets/Scripts/PowerPellet.asset b/Assets/Scripts/PowerPellet.asset deleted file mode 100644 index 6fe412c..0000000 --- a/Assets/Scripts/PowerPellet.asset +++ /dev/null @@ -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: diff --git a/Assets/Scripts/PowerPellet.asset.meta b/Assets/Scripts/PowerPellet.asset.meta deleted file mode 100644 index 7ac57a1..0000000 --- a/Assets/Scripts/PowerPellet.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 896816ace5640c644bd057ab48c3b9a1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PowerPellet.cs b/Assets/Scripts/PowerPellet.cs deleted file mode 100644 index 320ccdc..0000000 --- a/Assets/Scripts/PowerPellet.cs +++ /dev/null @@ -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 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 instead without further checking, since the animator is what I need to manipulate anyway. - } -} \ No newline at end of file diff --git a/Assets/Scripts/PowerPellet.cs.meta b/Assets/Scripts/PowerPellet.cs.meta deleted file mode 100644 index 3f9fc28..0000000 --- a/Assets/Scripts/PowerPellet.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 55d0efe8af4dba540a508287baca6656 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/SoundManager.cs b/Assets/Scripts/SoundManager.cs index 4418350..b265a5d 100644 --- 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 { diff --git a/Assets/Scripts/StatusDisplay.cs b/Assets/Scripts/StatusDisplay.cs index 4d683a9..4743895 100644 --- 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; - } } } \ No newline at end of file diff --git a/Assets/Scripts/SyncedObject.cs b/Assets/Scripts/SyncedObject.cs index f58ac63..599a698 100644 --- 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 { diff --git a/Assets/Scripts/Teleporter.asset b/Assets/Scripts/Teleporter.asset deleted file mode 100644 index fe17a80..0000000 --- a/Assets/Scripts/Teleporter.asset +++ /dev/null @@ -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: k__BackingField - Entry: 1 - Data: direction - - Name: k__BackingField - Entry: 7 - Data: 3|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: Marro.PacManUdon.Direction, 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: target - - Name: $v - Entry: 7 - Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: target - - Name: k__BackingField - Entry: 7 - Data: 8|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Transform, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 8 - - 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: 13 - Data: - - Name: - Entry: 8 - Data: diff --git a/Assets/Scripts/Teleporter.asset.meta b/Assets/Scripts/Teleporter.asset.meta deleted file mode 100644 index 5ceb4fd..0000000 --- a/Assets/Scripts/Teleporter.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c6e306d768eba5b469eea599abcf4800 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Teleporter.cs b/Assets/Scripts/Teleporter.cs deleted file mode 100644 index 7e9b7dc..0000000 --- a/Assets/Scripts/Teleporter.cs +++ /dev/null @@ -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(); - - if (gridMover == null || gridMover.GetDirection() != direction) - { - return; - } - - gridMover.SetPosition(gridMover.GetPosition() + (Vector2)(target.localPosition - transform.localPosition)); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Teleporter.cs.meta b/Assets/Scripts/Teleporter.cs.meta deleted file mode 100644 index 63d0277..0000000 --- a/Assets/Scripts/Teleporter.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: aae1c5d18ae01b3488b54c72e6f1edf6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Test.cs b/Assets/Scripts/Test.cs deleted file mode 100644 index e909006..0000000 --- a/Assets/Scripts/Test.cs +++ /dev/null @@ -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); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Test.cs.meta b/Assets/Scripts/Test.cs.meta deleted file mode 100644 index 5d23e18..0000000 --- a/Assets/Scripts/Test.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0227a738d77ab0849bdc9047b5b27c78 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Test1.asset b/Assets/Scripts/Test1.asset deleted file mode 100644 index 0b72020..0000000 --- a/Assets/Scripts/Test1.asset +++ /dev/null @@ -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: k__BackingField - Entry: 1 - Data: pellet - - Name: k__BackingField - Entry: 7 - Data: 3|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: Marro.PacManUdon.Pellet, Assembly-CSharp - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 7 - Data: 4|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 - - 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: 13 - Data: - - Name: - Entry: 8 - Data: diff --git a/Assets/Scripts/Test1.asset.meta b/Assets/Scripts/Test1.asset.meta deleted file mode 100644 index 300f909..0000000 --- a/Assets/Scripts/Test1.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 184e93443ec1bb24fa4e1db8b51405da -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/TimedSequence.cs b/Assets/Scripts/TimedSequence.cs deleted file mode 100644 index 94c6283..0000000 --- a/Assets/Scripts/TimedSequence.cs +++ /dev/null @@ -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); -// } -// } diff --git a/Assets/Scripts/TimedSequence.cs.meta b/Assets/Scripts/TimedSequence.cs.meta deleted file mode 100644 index fcf6538..0000000 --- a/Assets/Scripts/TimedSequence.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 789dbd838d9dd5645852b3bda8c5a161 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: