diff --git a/Assets/PacManGame.prefab b/Assets/PacManGame.prefab index d4df876..1d34664 100644 --- a/Assets/PacManGame.prefab +++ b/Assets/PacManGame.prefab @@ -2804,7 +2804,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2177688266556645545} - - {fileID: 1943896580556949908} - {fileID: 3712504672009017146} - {fileID: 3707824250034173467} - {fileID: 5304420742258014000} @@ -3045,110 +3044,6 @@ MonoBehaviour: serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 ---- !u!1 &1469567527037123035 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3805127033795310874} - - component: {fileID: 5031360617562026835} - - component: {fileID: 5338398749469627165} - - component: {fileID: 4168259429290060702} - m_Layer: 0 - m_Name: GhostCollider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3805127033795310874 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1469567527037123035} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 513719418908347298} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5031360617562026835 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1469567527037123035} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 197f2fb3a12aac94795943b0ee8d3320, type: 3} - m_Name: - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 5338398749469627165} ---- !u!114 &5338398749469627165 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1469567527037123035} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} - m_Name: - m_EditorClassIdentifier: - interactTextPlacement: {fileID: 0} - interactText: Use - interactTextGO: {fileID: 0} - proximity: 2 - SynchronizePosition: 0 - AllowCollisionOwnershipTransfer: 0 - Reliable: 0 - _syncMethod: 1 - serializedProgramAsset: {fileID: 11400000, guid: c5c5f319202c800458920423915157d7, type: 2} - programSource: {fileID: 11400000, guid: 33ddebb883650354f868d672f01e54dd, type: 2} - serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF - publicVariablesUnityEngineObjects: [] - publicVariablesSerializationDataFormat: 0 ---- !u!136 &4168259429290060702 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1469567527037123035} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.2 - m_Height: 2 - m_Direction: 2 - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1474460525853194139 GameObject: m_ObjectHideFlags: 0 @@ -8025,112 +7920,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_renderer: {fileID: 6539332795346976013} m_maskType: 0 ---- !u!1 &3434746169460523106 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1943896580556949908} - - component: {fileID: 8555249676190815205} - - component: {fileID: 8127898086093701786} - - component: {fileID: 6124172593973027271} - m_Layer: 22 - m_Name: Grid Collision - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1943896580556949908 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3434746169460523106} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 16, y: 15.500008, z: 2.5} - m_LocalScale: {x: 28, y: 31.000015, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 9145873486794983750} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!64 &8555249676190815205 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3434746169460523106} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 4194299 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 1474361029063556461, guid: 700689bd5d1823f47b577d684f2c3313, type: 3} ---- !u!33 &8127898086093701786 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3434746169460523106} - m_Mesh: {fileID: 1474361029063556461, guid: 700689bd5d1823f47b577d684f2c3313, type: 3} ---- !u!23 &6124172593973027271 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3434746169460523106} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &3438059697432600989 GameObject: m_ObjectHideFlags: 0 @@ -11630,8 +11419,6 @@ GameObject: - component: {fileID: 513719418908347298} - component: {fileID: 7714172614521704433} - component: {fileID: 1727847739805735067} - - component: {fileID: 9221443362494910120} - - component: {fileID: 4773642625458858929} - component: {fileID: 4126301770395146711} - component: {fileID: 2694554446726062848} m_Layer: 0 @@ -11653,8 +11440,7 @@ Transform: m_LocalPosition: {x: 16, y: 7.500001, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3805127033795310874} + m_Children: [] m_Father: {fileID: 8246186970405181641} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7714172614521704433 @@ -11936,54 +11722,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 2 m_SpriteSortPoint: 0 ---- !u!65 &9221443362494910120 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4979601353925297299} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 0.5, y: 0.5, z: 2} - m_Center: {x: 0, y: 0, z: 0} ---- !u!54 &4773642625458858929 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4979601353925297299} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 --- !u!114 &4126301770395146711 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12417,7 +12155,6 @@ GameObject: - component: {fileID: 7199305853468815256} - component: {fileID: 9157969083631739240} - component: {fileID: 7365495875111851720} - - component: {fileID: 3193872392568730759} m_Layer: 0 m_Name: Bonus Fruit m_TagString: Untagged @@ -12562,27 +12299,6 @@ MonoBehaviour: serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 ---- !u!65 &3193872392568730759 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5229491298805062834} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 0.5, y: 0.5, z: 0.5} - m_Center: {x: 0, y: -0.00000059604645, z: -0.00000011920929} --- !u!1 &5382068025638518521 GameObject: m_ObjectHideFlags: 0 @@ -15348,7 +15064,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2177688266556645545} - - component: {fileID: 8229914749694966936} - component: {fileID: 4047720328164719605} - component: {fileID: 1165551057611019299} m_Layer: 0 @@ -15373,28 +15088,6 @@ Transform: m_Children: [] m_Father: {fileID: 9145873486794983750} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!64 &8229914749694966936 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7163777406449422992} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!212 &4047720328164719605 SpriteRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Ghost.prefab b/Assets/Prefabs/Ghost.prefab index 084eefc..4a97316 100644 --- a/Assets/Prefabs/Ghost.prefab +++ b/Assets/Prefabs/Ghost.prefab @@ -34,7 +34,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4191597391212281593} - - {fileID: 4930314721506563510} - {fileID: 3602007015285256100} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -365,61 +364,6 @@ MonoBehaviour: serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 ---- !u!1 &1283232227864845355 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4930314721506563510} - - component: {fileID: 7503794487432367459} - m_Layer: 0 - m_Name: PacManCollider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4930314721506563510 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1283232227864845355} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 140452431933686981} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!136 &7503794487432367459 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1283232227864845355} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.25 - m_Height: 2 - m_Direction: 2 - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &5838653651634851978 GameObject: m_ObjectHideFlags: 0 @@ -431,7 +375,6 @@ GameObject: - component: {fileID: 4191597391212281593} - component: {fileID: 7008590632023811945} - component: {fileID: 1439451148072521473} - - component: {fileID: 3313165921880363939} m_Layer: 0 m_Name: Target Indicator m_TagString: Untagged @@ -504,27 +447,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &3313165921880363939 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5838653651634851978} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &6726417638088798178 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Power Pellet.prefab b/Assets/Prefabs/Power Pellet.prefab index 2d71052..59278c4 100644 --- a/Assets/Prefabs/Power Pellet.prefab +++ b/Assets/Prefabs/Power Pellet.prefab @@ -9,7 +9,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8163531541416620119} - - component: {fileID: 1316532931576341977} - component: {fileID: 7952758579179122936} - component: {fileID: 7532756116111475170} - component: {fileID: 4063084300691044555} @@ -36,27 +35,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1316532931576341977 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6582247089451643248} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 0.5, y: 0.5, z: 0.5} - m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7952758579179122936 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/PacMan.unity b/Assets/Scenes/PacMan.unity index 972ba43..7f53619 100644 --- a/Assets/Scenes/PacMan.unity +++ b/Assets/Scenes/PacMan.unity @@ -2021,12 +2021,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 393606782} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4.266148, y: 14.909718, z: -30.038902} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 806746267} + m_Father: {fileID: 712073434} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &395285409 stripped GameObject: @@ -2297,11 +2297,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 3075789927437587304, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} m_PrefabInstance: {fileID: 7528894854307259292} m_PrefabAsset: {fileID: 0} ---- !u!1 &449652666 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7770158595632194949, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - m_PrefabInstance: {fileID: 7528894854307259292} - m_PrefabAsset: {fileID: 0} --- !u!1 &449859658 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7485081784489983993, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} @@ -2920,11 +2915,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 1039771992410449448, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} m_PrefabInstance: {fileID: 7528894854307259292} m_PrefabAsset: {fileID: 0} ---- !u!1 &531194697 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7384283984066926488, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - m_PrefabInstance: {fileID: 1210508488} - m_PrefabAsset: {fileID: 0} --- !u!1 &531808328 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8046214555805668479, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} @@ -3159,11 +3149,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 5590578823801975434, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} m_PrefabInstance: {fileID: 1210508488} m_PrefabAsset: {fileID: 0} ---- !u!1 &584576221 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7085619490826564167, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - m_PrefabInstance: {fileID: 7528894854307259292} - m_PrefabAsset: {fileID: 0} --- !u!1 &586011047 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7303899807502237517, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} @@ -3567,11 +3552,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 4719546476999972085, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} m_PrefabInstance: {fileID: 7528894854307259292} m_PrefabAsset: {fileID: 0} ---- !u!1 &667019552 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8598658647218644980, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - m_PrefabInstance: {fileID: 7528894854307259292} - m_PrefabAsset: {fileID: 0} --- !u!1 &669161802 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2332378321963395815, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} @@ -3824,6 +3804,7 @@ Transform: - {fileID: 963448677} - {fileID: 1672574592} - {fileID: 2005609925} + - {fileID: 393606783} m_Father: {fileID: 1886023632} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &712508021 stripped @@ -3911,11 +3892,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 2251740172431377212, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} m_PrefabInstance: {fileID: 7528894854307259292} m_PrefabAsset: {fileID: 0} ---- !u!1 &760060790 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7951028731665437070, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - m_PrefabInstance: {fileID: 1210508488} - m_PrefabAsset: {fileID: 0} --- !u!1 &768062667 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2520602138929881729, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} @@ -4218,7 +4194,6 @@ Transform: - {fileID: 606557185} - {fileID: 1101037633} - {fileID: 2057945690} - - {fileID: 393606783} - {fileID: 1033118942} - {fileID: 196434888} - {fileID: 1933482823} @@ -4502,11 +4477,6 @@ Transform: m_Children: [] m_Father: {fileID: 1438618203} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &918030808 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1740315825862880909, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - m_PrefabInstance: {fileID: 7528894854307259292} - m_PrefabAsset: {fileID: 0} --- !u!1 &918968242 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6241923020823632036, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} @@ -5209,11 +5179,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 1963045125815263883, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} m_PrefabInstance: {fileID: 1210508488} m_PrefabAsset: {fileID: 0} ---- !u!1 &1078989070 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7951028731665437070, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - m_PrefabInstance: {fileID: 7528894854307259292} - m_PrefabAsset: {fileID: 0} --- !u!1 &1084704382 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2170105392583171138, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} @@ -7123,7 +7088,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6505452106475299050, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6516549313887553636, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} propertyPath: serializationData.Prefab @@ -7490,85 +7455,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 644674727704841727, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} insertIndex: 6 addedObject: {fileID: 483106233} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 760989357904163835, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 2210743849556565093, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 1499136851737879348, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 1730673936899394188, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 1930333237022248453, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 7219308242589081280, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 5818876718058315162, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 2470603650058556617, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 3733008235006632882, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 1976549912044134044, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 946049230122111055, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 3884000982531321632, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 7360432264745744659, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 8473082740403796940, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 6177469951915325012, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 5895072277459163218, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 7578339981777433697, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 4516921380093177367, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 4005231931981461914, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 1201452541656116112, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 945459299333252523, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 4283788326543693181, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 8749833617750005817, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 5163240847006920611, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 8985312357426446245, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 7757089264771582114, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} --- !u!1 &1214273987 stripped GameObject: @@ -7632,11 +7519,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5ca6f74362dcf8a46b2ad3ec99e38719, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1243038672 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7085619490826564167, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - m_PrefabInstance: {fileID: 1210508488} - m_PrefabAsset: {fileID: 0} --- !u!1 &1245947246 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6377306495378490162, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} @@ -8055,11 +7937,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 3845220453898523040, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} m_PrefabInstance: {fileID: 1210508488} m_PrefabAsset: {fileID: 0} ---- !u!1 &1400026973 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7384283984066926488, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - m_PrefabInstance: {fileID: 7528894854307259292} - m_PrefabAsset: {fileID: 0} --- !u!1 &1401728108 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2229318735839474464, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} @@ -8943,11 +8820,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 8273832444934020666, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} m_PrefabInstance: {fileID: 1210508488} m_PrefabAsset: {fileID: 0} ---- !u!1 &1572095180 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1740315825862880909, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - m_PrefabInstance: {fileID: 1210508488} - m_PrefabAsset: {fileID: 0} --- !u!1 &1572932993 GameObject: m_ObjectHideFlags: 0 @@ -9095,11 +8967,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 109330399196804403, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} m_PrefabInstance: {fileID: 7528894854307259292} m_PrefabAsset: {fileID: 0} ---- !u!1 &1593755083 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8598658647218644980, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - m_PrefabInstance: {fileID: 1210508488} - m_PrefabAsset: {fileID: 0} --- !u!1 &1597361743 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5725646289827963938, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} @@ -9182,11 +9049,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 2840952938539862404, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} m_PrefabInstance: {fileID: 1210508488} m_PrefabAsset: {fileID: 0} ---- !u!1 &1617756308 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7770158595632194949, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - m_PrefabInstance: {fileID: 1210508488} - m_PrefabAsset: {fileID: 0} --- !u!1 &1618600686 GameObject: m_ObjectHideFlags: 0 @@ -9425,11 +9287,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 2341464678470971957, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} m_PrefabInstance: {fileID: 1210508488} m_PrefabAsset: {fileID: 0} ---- !u!1 &1706884682 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1469567527037123035, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - m_PrefabInstance: {fileID: 7528894854307259292} - m_PrefabAsset: {fileID: 0} --- !u!1 &1714954706 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7466015648019123541, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} @@ -9898,14 +9755,6 @@ MonoBehaviour: ID: 36 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1400026973} - ID: 37 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 667019552} - ID: 38 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 1157790585} ID: 40 SerializedTypeNames: @@ -10882,27 +10731,11 @@ MonoBehaviour: ID: 284 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 918030808} - ID: 285 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1078989070} - ID: 286 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 584576221} - ID: 287 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 449652666} - ID: 288 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 63452431} ID: 289 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1706884682} + - gameObject: {fileID: 0} ID: 290 SerializedTypeNames: - VRC.Udon.UdonBehaviour @@ -11038,14 +10871,6 @@ MonoBehaviour: ID: 326 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 531194697} - ID: 327 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1593755083} - ID: 328 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 1007509052} ID: 329 SerializedTypeNames: @@ -12030,27 +11855,11 @@ MonoBehaviour: ID: 574 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1572095180} - ID: 575 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 760060790} - ID: 576 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1243038672} - ID: 577 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1617756308} - ID: 578 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 1366842339} ID: 579 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 2133503830} + - gameObject: {fileID: 0} ID: 580 SerializedTypeNames: - VRC.Udon.UdonBehaviour @@ -14140,11 +13949,6 @@ Transform: m_Children: [] m_Father: {fileID: 1438618203} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2133503830 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1469567527037123035, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - m_PrefabInstance: {fileID: 1210508488} - m_PrefabAsset: {fileID: 0} --- !u!1 &2134745656 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5311459399647555381, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} @@ -14527,6 +14331,10 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 2105085335797955363, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + - target: {fileID: 2122160117470481098, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2135826314059557985, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} propertyPath: serializationData.Prefab value: @@ -14595,6 +14403,10 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 2632463664781619728, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + - target: {fileID: 2644300872115716338, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2829790701909084540, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} propertyPath: serializationData.Prefab value: @@ -14631,6 +14443,10 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 3112141267984921751, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + - target: {fileID: 3147892916020834424, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3166429239840473342, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} propertyPath: serializationData.Prefab value: @@ -14663,6 +14479,10 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 3374507140697445330, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + - target: {fileID: 3436881978671590728, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3453674652927074866, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} propertyPath: serializationData.Prefab value: @@ -14767,6 +14587,10 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 4054080213664381868, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + - target: {fileID: 4054778616656183051, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4141696458541893057, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} propertyPath: serializationData.Prefab value: @@ -14775,6 +14599,10 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 4198411551151104348, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + - target: {fileID: 4219034801460140058, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4227910356677250806, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} propertyPath: serializationData.Prefab value: @@ -14923,6 +14751,18 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 5162299099997422342, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + - target: {fileID: 5205524283141451703, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5205524283141451703, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + propertyPath: m_LocalPosition.x + value: 16.5 + objectReference: {fileID: 0} + - target: {fileID: 5205524283141451703, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5207215077183388049, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} propertyPath: serializationData.Prefab value: @@ -15279,6 +15119,10 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 7504275367788617308, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + - target: {fileID: 7509279530340600537, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7514971118247068176, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} propertyPath: serializationData.Prefab value: @@ -15359,6 +15203,10 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 7915156974697007645, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + - target: {fileID: 7957756277511463930, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7975642066508302169, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} propertyPath: serializationData.Prefab value: @@ -15431,6 +15279,14 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 8632957936983998509, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + - target: {fileID: 8633931985557641148, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8633931985557641148, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} + propertyPath: m_LocalPosition.x + value: -16.5 + objectReference: {fileID: 0} - target: {fileID: 8654957424707515056, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} propertyPath: serializationData.Prefab value: @@ -15506,66 +15362,6 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7219308242589081280, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} insertIndex: -1 addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 5818876718058315162, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 2470603650058556617, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 3733008235006632882, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 1976549912044134044, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 946049230122111055, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 3884000982531321632, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 7360432264745744659, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 8473082740403796940, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 6177469951915325012, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 5895072277459163218, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 7578339981777433697, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 4516921380093177367, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 4005231931981461914, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 1201452541656116112, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 945459299333252523, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 4283788326543693181, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 8749833617750005817, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 5163240847006920611, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 8985312357426446245, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} - - targetCorrespondingSourceObject: {fileID: 7757089264771582114, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} - insertIndex: -1 - addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: 15ac0ed4c56c7784ea3ae9000fc2af1f, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: diff --git a/Assets/Scripts/PelletManager.asset b/Assets/Scripts/CollisionManager.asset similarity index 99% rename from Assets/Scripts/PelletManager.asset rename to Assets/Scripts/CollisionManager.asset index 50b3466..9735b2a 100644 --- a/Assets/Scripts/PelletManager.asset +++ b/Assets/Scripts/CollisionManager.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} - m_Name: PelletManager + m_Name: CollisionManager m_EditorClassIdentifier: serializedUdonProgramAsset: {fileID: 11400000, guid: 9047ff9c4ab51104b8b0160387ad180b, type: 2} udonAssembly: @@ -20,7 +20,7 @@ MonoBehaviour: compiledVersion: 2 behaviourSyncMode: 0 hasInteractEvent: 0 - scriptID: 2205517818672966804 + scriptID: 2892584015827264300 serializationData: SerializedFormat: 2 SerializedBytes: diff --git a/Assets/Scripts/PelletManager.asset.meta b/Assets/Scripts/CollisionManager.asset.meta similarity index 100% rename from Assets/Scripts/PelletManager.asset.meta rename to Assets/Scripts/CollisionManager.asset.meta diff --git a/Assets/Scripts/PelletManager.cs b/Assets/Scripts/CollisionManager.cs similarity index 97% rename from Assets/Scripts/PelletManager.cs rename to Assets/Scripts/CollisionManager.cs index eca7b3b..52df62d 100644 --- a/Assets/Scripts/PelletManager.cs +++ b/Assets/Scripts/CollisionManager.cs @@ -10,7 +10,7 @@ namespace Marro.PacManUdon PowerPellet } - public class PelletManager : SyncedObject + public class CollisionManager : SyncedObject { public int PelletCount => pellets.Length; public int PelletCollectedCount { get; private set; } @@ -58,49 +58,6 @@ namespace Marro.PacManUdon SubscribeToEvent(NetworkEventType.SyncPellets); } - #region Power pellet blink - public override void SyncedUpdate() - { - if (!powerPelletBlinkEnabled) - { - return; - } - - powerPelletBlinkProgress += networkManager.SyncedDeltaTime; - if (powerPelletBlinkProgress >= powerPelletBlinkToggleInterval) - { - // Debug.Log($"{gameObject} PowerPelletBlink toggle"); - powerPelletBlinkProgress -= powerPelletBlinkToggleInterval; - powerPelletBlinkCurrentlyVisible = !powerPelletBlinkCurrentlyVisible; - SetPowerPelletsVisible(powerPelletBlinkCurrentlyVisible); - } - } - - void SetPowerPelletsVisible(bool visible) - { - // Debug.Log($"{gameObject} SetPowerPelletVisible {visible}, powerPellets.Length: {powerPellets.Length}"); - foreach (Animator powerPellet in powerPellets) - { - powerPellet.SetBool("Visible", visible); - } - } - - public void SetPowerPelletsBlink(bool enabled) - { - // Debug.Log($"{gameObject} SetPowerPelletBlink {enabled}"); - powerPelletBlinkEnabled = enabled; - - powerPelletBlinkCurrentlyVisible = true; - powerPelletBlinkProgress = 0; - SetPowerPelletsVisible(true); - } - - public void FreezePowerPelletsBlink(bool frozen) - { - powerPelletBlinkEnabled = !frozen; - } - #endregion - #region Collision public bool IsWallUpcoming(Vector2 position, Vector2 directionVector) { @@ -135,7 +92,7 @@ namespace Marro.PacManUdon TryEatGhost(tilemapIndex); - TryCollectFruit(tile, position, nextPosition); + TryCollectFruit(tile, position); return TryCollectPellet(tile, tilemapIndex); } @@ -151,7 +108,7 @@ namespace Marro.PacManUdon } } - private void TryCollectFruit(int tile, Vector2 position, Vector2 nextPosition) + private void TryCollectFruit(int tile, Vector2 position) { if (tile != (int)PacManConsumableType.FruitLeft && tile != (int)PacManConsumableType.FruitRight || !bonusFruit.Active) @@ -237,6 +194,50 @@ namespace Marro.PacManUdon pellets[i].gameObject.SetActive(active); } } + #endregion + + #region Power pellet blink + public override void SyncedUpdate() + { + if (!powerPelletBlinkEnabled) + { + return; + } + + powerPelletBlinkProgress += networkManager.SyncedDeltaTime; + if (powerPelletBlinkProgress >= powerPelletBlinkToggleInterval) + { + // Debug.Log($"{gameObject} PowerPelletBlink toggle"); + powerPelletBlinkProgress -= powerPelletBlinkToggleInterval; + powerPelletBlinkCurrentlyVisible = !powerPelletBlinkCurrentlyVisible; + SetPowerPelletsVisible(powerPelletBlinkCurrentlyVisible); + } + } + + void SetPowerPelletsVisible(bool visible) + { + // Debug.Log($"{gameObject} SetPowerPelletVisible {visible}, powerPellets.Length: {powerPellets.Length}"); + foreach (Animator powerPellet in powerPellets) + { + powerPellet.SetBool("Visible", visible); + } + } + + public void SetPowerPelletsBlink(bool enabled) + { + // Debug.Log($"{gameObject} SetPowerPelletBlink {enabled}"); + powerPelletBlinkEnabled = enabled; + + powerPelletBlinkCurrentlyVisible = true; + powerPelletBlinkProgress = 0; + SetPowerPelletsVisible(true); + } + + public void FreezePowerPelletsBlink(bool frozen) + { + powerPelletBlinkEnabled = !frozen; + } + #endregion public override void CollectSyncedData(byte[] data, ref int index, NetworkEventType eventType) { @@ -262,6 +263,5 @@ namespace Marro.PacManUdon SetPelletsCollectedFromSync(); return true; } - #endregion } } \ No newline at end of file diff --git a/Assets/Scripts/PelletManager.cs.meta b/Assets/Scripts/CollisionManager.cs.meta similarity index 100% rename from Assets/Scripts/PelletManager.cs.meta rename to Assets/Scripts/CollisionManager.cs.meta diff --git a/Assets/Scripts/GameManager.asset b/Assets/Scripts/GameManager.asset index 1cd6e55..0922d5e 100644 --- a/Assets/Scripts/GameManager.asset +++ b/Assets/Scripts/GameManager.asset @@ -730,19 +730,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pelletManager + Data: collisionManager - Name: $v Entry: 7 Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pelletManager + Data: collisionManager - Name: k__BackingField Entry: 7 Data: 44|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: Marro.PacManUdon.PelletManager, Assembly-CSharp + Data: Marro.PacManUdon.CollisionManager, Assembly-CSharp - Name: Entry: 8 Data: diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 600c0d6..a89c18b 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -10,9 +10,9 @@ namespace Marro.PacManUdon [SerializeField] private PacMan pacMan; [SerializeField] private GhostManager ghostManager; [SerializeField] private BonusFruit bonusFruit; - [SerializeField] private PelletManager pelletManager; + [SerializeField] private CollisionManager collisionManager; [SerializeField] private StatusDisplay statusDisplay; - [SerializeField] private PelletManager attractScreen; + [SerializeField] private CollisionManager attractScreen; [SerializeField] private GameObject intermissionScreen; [SerializeField] private GameObject pressStartButtonScreen; [SerializeField] private PlayerInput playerInput; @@ -58,10 +58,10 @@ namespace Marro.PacManUdon intermission2Pole = intermissionScreenElements[4].GetComponent(); networkManager.Initialize(); - ghostManager.Initialize(maze.ghostStarts, maze.ghostTargets, pacMan, pelletManager, this); - pacMan.Initialize(playerInput, maze.pacManStart, this, pelletManager); + ghostManager.Initialize(maze.ghostStarts, maze.ghostTargets, pacMan, collisionManager, this); + pacMan.Initialize(playerInput, maze.pacManStart, this, collisionManager); bonusFruit.Initialize(); - pelletManager.Initialize(this, bonusFruit, ghostManager.Ghosts); + collisionManager.Initialize(this, bonusFruit, ghostManager.Ghosts); statusDisplay.Initialize(); playerInput.Initialize(this); soundManager.Initialize(); @@ -136,7 +136,7 @@ namespace Marro.PacManUdon { //Debug.Log($"{gameObject} New level started!"); - pelletManager.RestoreAllPellets(); + collisionManager.RestoreAllPellets(); ghostManager.NewLevel(); @@ -153,7 +153,7 @@ namespace Marro.PacManUdon pacMan.Reset(); bonusFruit.Despawn(); soundManager.Reset(); - pelletManager.SetPowerPelletsBlink(false); + collisionManager.SetPowerPelletsBlink(false); } private void PrepareForCutscene() @@ -280,7 +280,7 @@ namespace Marro.PacManUdon void SetPelletsActive(bool active) { - pelletManager.gameObject.SetActive(active); + collisionManager.gameObject.SetActive(active); } void SetMazeVisible(bool visible) @@ -394,7 +394,7 @@ namespace Marro.PacManUdon if (!frozen) { - pelletManager.SetPowerPelletsBlink(true); + collisionManager.SetPowerPelletsBlink(true); } } diff --git a/Assets/Scripts/Ghost.asset b/Assets/Scripts/Ghost.asset index bc14713..777e4e2 100644 --- a/Assets/Scripts/Ghost.asset +++ b/Assets/Scripts/Ghost.asset @@ -397,19 +397,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pelletManager + Data: collisionManager - Name: $v Entry: 7 Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pelletManager + Data: collisionManager - Name: k__BackingField Entry: 7 Data: 25|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: Marro.PacManUdon.PelletManager, Assembly-CSharp + Data: Marro.PacManUdon.CollisionManager, Assembly-CSharp - Name: Entry: 8 Data: diff --git a/Assets/Scripts/Ghost.cs b/Assets/Scripts/Ghost.cs index 852152d..8b996df 100644 --- a/Assets/Scripts/Ghost.cs +++ b/Assets/Scripts/Ghost.cs @@ -41,7 +41,7 @@ namespace Marro.PacManUdon // External references private GhostManager ghostManager; - private PelletManager pelletManager; + private CollisionManager collisionManager; private Animator animator; private new Renderer renderer; private PacMan pacMan; @@ -89,13 +89,13 @@ namespace Marro.PacManUdon public bool IsScared => isScared; public int Index { get; private set; } - public void Initialize(PelletManager pelletManager, PacMan pacMan, Ghost blinky, Transform startTransform, Vector2 homePosition, Vector2 idlePosition1, Vector2 idlePosition2, Vector2 cornerPosition, int index) + public void Initialize(CollisionManager collisionManager, PacMan pacMan, Ghost blinky, Transform startTransform, Vector2 homePosition, Vector2 idlePosition1, Vector2 idlePosition2, Vector2 cornerPosition, int index) { ghostManager = transform.parent.GetComponent(); animator = GetComponent(); renderer = GetComponent(); - this.pelletManager = pelletManager; + this.collisionManager = collisionManager; this.pacMan = pacMan; this.blinky = blinky; this.homePosition = homePosition; @@ -199,7 +199,7 @@ namespace Marro.PacManUdon if (CrossesTileBorder(position, nextPosition, direction)) { - var inTunnel = pelletManager.GhostMoveToTile(nextPosition, Index); + var inTunnel = collisionManager.GhostMoveToTile(nextPosition, Index); if (inTunnel != this.inTunnel) { @@ -248,7 +248,7 @@ namespace Marro.PacManUdon private void TryToTurn(Vector2 position, ref Vector2 nextPosition) { var gridPosition = PositionToGrid(position); - var availableDirections = pelletManager.GetAvailableDirections(position); + var availableDirections = collisionManager.GetAvailableDirections(position); if ((availableDirections & (int)PacManCollisionInfoType.NoTurn) != 0 ) { @@ -285,7 +285,7 @@ namespace Marro.PacManUdon { nextValidDirectionIndex += 1; } - if (!pelletManager.IsWallUpcoming(nextPosition, directionVectors[(int)predefinedPath[nextValidDirectionIndex]])) + if (!collisionManager.IsWallUpcoming(nextPosition, directionVectors[(int)predefinedPath[nextValidDirectionIndex]])) { // If we're at a Vector2.zero, we skip applying the direction and only increment. if (nextValidDirectionIndex == predefinedPathIndex) diff --git a/Assets/Scripts/GhostManager.asset b/Assets/Scripts/GhostManager.asset index fbace77..8adf1eb 100644 --- a/Assets/Scripts/GhostManager.asset +++ b/Assets/Scripts/GhostManager.asset @@ -283,19 +283,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pelletManager + Data: collisionManager - Name: $v Entry: 7 Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pelletManager + Data: collisionManager - Name: k__BackingField Entry: 7 Data: 18|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: Marro.PacManUdon.PelletManager, Assembly-CSharp + Data: Marro.PacManUdon.CollisionManager, Assembly-CSharp - Name: Entry: 8 Data: diff --git a/Assets/Scripts/GhostManager.cs b/Assets/Scripts/GhostManager.cs index c20cb1b..b1e2bac 100644 --- a/Assets/Scripts/GhostManager.cs +++ b/Assets/Scripts/GhostManager.cs @@ -11,7 +11,7 @@ namespace Marro.PacManUdon private Ghost[] ghosts; private Ghost blinky; - private PelletManager pelletManager; + private CollisionManager collisionManager; // Level constants private float speedDefault; @@ -57,10 +57,10 @@ namespace Marro.PacManUdon private bool frozen; private bool kinematic; - public void Initialize(Transform[] ghostStarts, Transform[] ghostTargets, PacMan pacMan, PelletManager pelletManager, GameManager gameController) + public void Initialize(Transform[] ghostStarts, Transform[] ghostTargets, PacMan pacMan, CollisionManager collisionManager, GameManager gameController) { this.gameController = gameController; - this.pelletManager = pelletManager; + this.collisionManager = collisionManager; ghosts = transform.GetComponentsInChildren(true); blinky = ghosts[0]; @@ -72,7 +72,7 @@ namespace Marro.PacManUdon Vector2 idlePosition2 = ghostTargets[2 + ghostIndex * 3].localPosition; Vector2 cornerPosition = ghostTargets[3 + ghostIndex * 3].localPosition; - ghosts[ghostIndex].Initialize(pelletManager, pacMan, blinky, startTransform, homePosition, idlePosition1, idlePosition2, cornerPosition, ghostIndex); + ghosts[ghostIndex].Initialize(collisionManager, pacMan, blinky, startTransform, homePosition, idlePosition1, idlePosition2, cornerPosition, ghostIndex); } SubscribeToEvent(NetworkEventType.GhostUpdate); @@ -105,7 +105,7 @@ namespace Marro.PacManUdon public void NewLevel() { SetSharedPelletCounterActive(false); - UpdateElroyLevel(pelletManager.PelletCount); + UpdateElroyLevel(collisionManager.PelletCount); foreach (Ghost ghost in ghosts) { ghost.ResetHousePelletCounter(); diff --git a/Assets/Scripts/PacMan.asset b/Assets/Scripts/PacMan.asset index 1190cf9..93eb634 100644 --- a/Assets/Scripts/PacMan.asset +++ b/Assets/Scripts/PacMan.asset @@ -331,19 +331,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pelletManager + Data: collisionManager - Name: $v Entry: 7 Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pelletManager + Data: collisionManager - Name: k__BackingField Entry: 7 Data: 20|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: Marro.PacManUdon.PelletManager, Assembly-CSharp + Data: Marro.PacManUdon.CollisionManager, Assembly-CSharp - Name: Entry: 8 Data: diff --git a/Assets/Scripts/PacMan.cs b/Assets/Scripts/PacMan.cs index 7eca35c..0aafe09 100644 --- a/Assets/Scripts/PacMan.cs +++ b/Assets/Scripts/PacMan.cs @@ -9,7 +9,7 @@ namespace Marro.PacManUdon { private GameManager gameManager; private PlayerInput input; - private PelletManager pelletManager; + private CollisionManager collisionManager; private float defaultSpeed; private float powerPelletSpeed; private float speed; @@ -41,10 +41,10 @@ namespace Marro.PacManUdon #endregion - public void Initialize(PlayerInput input, Transform startTransform, GameManager gameManager, PelletManager pelletManager) + public void Initialize(PlayerInput input, Transform startTransform, GameManager gameManager, CollisionManager collisionManager) { this.gameManager = gameManager; - this.pelletManager = pelletManager; + this.collisionManager = collisionManager; this.input = input; animator = GetComponent(); renderer = GetComponent(); @@ -131,7 +131,7 @@ namespace Marro.PacManUdon private Vector2 ProcessNextPosition(Vector2 position, Vector2 nextPosition) { if (CrossesTileCenter(position, nextPosition, Direction.Left) // If pacman is moving horizontally, check if he may cross the center of a tile in that axis - && (!IsHorizontal(targetDirection) || pelletManager.IsWallUpcoming(nextPosition, directionVectors[(int)HorizontalComponent(direction)]))) + && (!IsHorizontal(targetDirection) || collisionManager.IsWallUpcoming(nextPosition, directionVectors[(int)HorizontalComponent(direction)]))) { // If the target direction is in the other axis or if we're about to run into a wall nextPosition.x = PositionToGrid(nextPosition).x; // Snap pacman to the center of his current tile in this axis SetDirection(VerticalComponent(direction)); @@ -139,7 +139,7 @@ namespace Marro.PacManUdon } if (CrossesTileCenter(position, nextPosition, Direction.Down) // See comments above but now vertical - && (!IsVertical(targetDirection) || pelletManager.IsWallUpcoming(nextPosition, directionVectors[(int)VerticalComponent(direction)]))) + && (!IsVertical(targetDirection) || collisionManager.IsWallUpcoming(nextPosition, directionVectors[(int)VerticalComponent(direction)]))) { nextPosition.y = PositionToGrid(nextPosition).y; SetDirection(HorizontalComponent(direction)); @@ -148,7 +148,7 @@ namespace Marro.PacManUdon var inputDirection = input.GetDirection(); if (!inputDirection.Equals(Direction.Zero) && !inputDirection.Equals(targetDirection) // Ignore neutral input or input in our current direction - && !pelletManager.IsWallUpcoming(nextPosition, directionVectors[(int)inputDirection])) // Check if the requested direction does not have a wall + && !collisionManager.IsWallUpcoming(nextPosition, directionVectors[(int)inputDirection])) // Check if the requested direction does not have a wall { // Move in the requested direction, as well as perpundicular to it to get to the center of the tunnel if (IsHorizontal(inputDirection)) @@ -182,7 +182,7 @@ namespace Marro.PacManUdon { nextValidDirectionIndex += 1; } - if (!pelletManager.IsWallUpcoming(nextPosition, directionVectors[(int)predefinedPath[nextValidDirectionIndex]])) + if (!collisionManager.IsWallUpcoming(nextPosition, directionVectors[(int)predefinedPath[nextValidDirectionIndex]])) { // If we're at a Vector2.zero, we skip applying the direction and only increment. if (nextValidDirectionIndex == predefinedPathIndex) @@ -213,7 +213,7 @@ namespace Marro.PacManUdon private void CheckNewTile(Vector2 position, Vector2 nextPosition) { - var eatResult = pelletManager.PacManMoveToTile(position, nextPosition); + var eatResult = collisionManager.PacManMoveToTile(position, nextPosition); if (eatResult == EatResult.Pellet) { diff --git a/Assets/Scripts/Sequences/AttractScreenDemo.cs b/Assets/Scripts/Sequences/AttractScreenDemo.cs index 56509de..bdb6646 100644 --- a/Assets/Scripts/Sequences/AttractScreenDemo.cs +++ b/Assets/Scripts/Sequences/AttractScreenDemo.cs @@ -323,7 +323,7 @@ namespace Marro.PacManUdon break; case 3: SetPelletsActive(true); - pelletManager.RestoreAllPellets(); + collisionManager.RestoreAllPellets(); statusDisplay.SetGameOverTextVisible(true); break; case 4: diff --git a/Assets/Scripts/Sequences/GameOver.cs b/Assets/Scripts/Sequences/GameOver.cs index 7881981..539ad5c 100644 --- a/Assets/Scripts/Sequences/GameOver.cs +++ b/Assets/Scripts/Sequences/GameOver.cs @@ -9,7 +9,7 @@ namespace Marro.PacManUdon case 0: // Show game over text, freeze power pellet blink statusDisplay.SetGameOverTextVisible(true); - pelletManager.FreezePowerPelletsBlink(true); + collisionManager.FreezePowerPelletsBlink(true); break; case 1: break; diff --git a/Assets/Scripts/Sequences/RestartLevel.cs b/Assets/Scripts/Sequences/RestartLevel.cs index 07913a4..09f9816 100644 --- a/Assets/Scripts/Sequences/RestartLevel.cs +++ b/Assets/Scripts/Sequences/RestartLevel.cs @@ -42,7 +42,7 @@ namespace Marro.PacManUdon SetFrozen(false); soundManager.SuppressSound(false); soundManager.StartGhostSound(); - soundManager.UpdatePelletCount(pelletManager.PelletCount - pelletManager.PelletCollectedCount); + soundManager.UpdatePelletCount(collisionManager.PelletCount - collisionManager.PelletCollectedCount); } } } diff --git a/Assets/Test stuff/MazeDefinitionGenerator.asset b/Assets/Test stuff/MazeDefinitionGenerator.asset index 8ebce24..ababdc2 100644 --- a/Assets/Test stuff/MazeDefinitionGenerator.asset +++ b/Assets/Test stuff/MazeDefinitionGenerator.asset @@ -121,7 +121,7 @@ MonoBehaviour: Data: 7|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: Marro.PacManUdon.PelletManager, Assembly-CSharp + Data: Marro.PacManUdon.CollisionManager, Assembly-CSharp - Name: Entry: 8 Data: diff --git a/Assets/Test stuff/MazeDefinitionGenerator.cs b/Assets/Test stuff/MazeDefinitionGenerator.cs index 6c532b9..2a0ff57 100644 --- a/Assets/Test stuff/MazeDefinitionGenerator.cs +++ b/Assets/Test stuff/MazeDefinitionGenerator.cs @@ -18,7 +18,7 @@ namespace Marro.PacManUdon.Dev public class MazeDefinitionGenerator : UdonSharpBehaviour { public BonusFruit bonusFruit; - public PelletManager pelletManager; + public CollisionManager pelletManager; const int width = 32; const int height = 32; @@ -59,7 +59,7 @@ namespace Marro.PacManUdon.Dev private void WriteBonusFruitTiles(int[] map) { var position = GridMover.PositionToGrid(new Vector2(bonusFruit.transform.localPosition.x, bonusFruit.transform.localPosition.y)); - var leftTileIndex = PelletManager.GetTilemapIndex(position); + var leftTileIndex = CollisionManager.GetTilemapIndex(position); map[leftTileIndex] = (int)PacManConsumableType.FruitLeft; var rightTileIndex = leftTileIndex - 1; map[rightTileIndex] = (int)PacManConsumableType.FruitRight;