diff --git a/Assets/Animations/PacMan/PacMan.controller b/Assets/Animations/PacMan/PacMan.controller index eba3859..1e6f5bd 100644 --- a/Assets/Animations/PacMan/PacMan.controller +++ b/Assets/Animations/PacMan/PacMan.controller @@ -126,11 +126,19 @@ BlendTree: m_CycleOffset: 0 m_DirectBlendParameter: Blend m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: a28e7bee3098d0a4996a108a60ccf4c0, type: 2} + m_Threshold: 1.25 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Direction + m_Mirror: 0 m_BlendParameter: Direction m_BlendParameterY: Blend m_MinThreshold: 0 - m_MaxThreshold: 1 - m_UseAutomaticThresholds: 1 + m_MaxThreshold: 1.25 + m_UseAutomaticThresholds: 0 m_NormalizedBlendValues: 0 m_BlendType: 0 --- !u!91 &9100000 @@ -147,25 +155,25 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Eating m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Direction m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Reset m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/Assets/Animations/PacMan/PacManEatRightBig.anim b/Assets/Animations/PacMan/PacManEatRightBig.anim new file mode 100644 index 0000000..f72976c --- /dev/null +++ b/Assets/Animations/PacMan/PacManEatRightBig.anim @@ -0,0 +1,81 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PacManEatRightBig + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -1729128937, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + - time: 0.055555556 + value: {fileID: -63752043, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + - time: 0.11111111 + value: {fileID: 1288529213, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + - time: 0.16666667 + value: {fileID: -63752043, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 18 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -1729128937, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + - {fileID: -63752043, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + - {fileID: 1288529213, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + - {fileID: -63752043, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.22222222 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/PacMan/PacManEatRightBig.anim.meta b/Assets/Animations/PacMan/PacManEatRightBig.anim.meta new file mode 100644 index 0000000..ee65710 --- /dev/null +++ b/Assets/Animations/PacMan/PacManEatRightBig.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a28e7bee3098d0a4996a108a60ccf4c0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/PacMan.unity b/Assets/Scenes/PacMan.unity index 1c99753..36532d3 100644 --- a/Assets/Scenes/PacMan.unity +++ b/Assets/Scenes/PacMan.unity @@ -1110,6 +1110,110 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} +--- !u!1 &49515935 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 49515936} + - component: {fileID: 49515939} + - component: {fileID: 49515938} + - component: {fileID: 49515937} + m_Layer: 0 + m_Name: Skip level button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &49515936 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 49515935} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.265, y: 0.789, z: 0.296} + m_LocalScale: {x: 0.08076144, y: 0.08076144, z: 0.08076144} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2146786255} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &49515937 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 49515935} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Skip level + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 2 + serializedProgramAsset: {fileID: 11400000, guid: 3473403fe88c8134e8be431c33461470, type: 2} + programSource: {fileID: 11400000, guid: b729fe1256b57ed45adc7743d16599bf, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &49515938 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 49515935} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d9af496212c74a45a7b915169e465af, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 49515937} + customEventReceiver: {fileID: 174205108} + eventName: SkipLevelButtonPressed +--- !u!135 &49515939 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 49515935} + 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_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} --- !u!4 &53629142 stripped Transform: m_CorrespondingSourceObject: {fileID: 1315692994360949719, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} @@ -2410,8 +2514,78 @@ Transform: - {fileID: 462995872} - {fileID: 99960227} - {fileID: 1804101362} + - {fileID: 1750460165} m_Father: {fileID: 1886023632} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &106686679 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2026234130} + m_Modifications: + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalScale.y + value: 0.10000007 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalScale.z + value: 0.10000007 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalPosition.x + value: -4 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalPosition.y + value: -15.5 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_Name + value: PacMan Second + objectReference: {fileID: 0} + - target: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f10209aafcd484f438cbd0888287e98a, type: 3} --- !u!1 &107806787 GameObject: m_ObjectHideFlags: 0 @@ -4565,7 +4739,7 @@ GameObject: - component: {fileID: 174205109} - component: {fileID: 174205108} m_Layer: 0 - m_Name: GameController + m_Name: GameManager m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4620,7 +4794,7 @@ MonoBehaviour: m_GameObject: {fileID: 174205106} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 88e88d9bfa304c8448489e53fc031f74, type: 3} + m_Script: {fileID: 11500000, guid: 501bd6c4adad10344a5e5dc0598e0b24, type: 3} m_Name: m_EditorClassIdentifier: serializationData: @@ -4641,6 +4815,7 @@ MonoBehaviour: pelletManager: {fileID: 1777057126} statusDisplay: {fileID: 1539035118} attractScreen: {fileID: 573616889} + intermissionScreen: {fileID: 2026234129} pressStartButtonScreen: {fileID: 1467061502} playerInput: {fileID: 1311215816} demo: {fileID: 2057800960} @@ -5040,12 +5215,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 196434887} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 851913432} + m_Father: {fileID: 806746267} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &197774888 PrefabInstance: @@ -5684,6 +5859,75 @@ Transform: m_CorrespondingSourceObject: {fileID: 1315692994360949719, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} m_PrefabInstance: {fileID: 12585360} m_PrefabAsset: {fileID: 0} +--- !u!1001 &224767333 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2026234130} + m_Modifications: + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalScale.y + value: 0.10000007 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalScale.z + value: 0.10000007 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalPosition.x + value: 31 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalPosition.y + value: -16.5 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_Name + value: Blinky Start + objectReference: {fileID: 0} + - target: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f10209aafcd484f438cbd0888287e98a, type: 3} --- !u!1 &226050919 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4099390335584803315, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} @@ -10523,6 +10767,37 @@ Transform: m_Children: [] m_Father: {fileID: 712073434} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &393606782 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 393606783} + m_Layer: 0 + m_Name: Increase hitbox size + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &393606783 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + 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_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 806746267} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &394240690 PrefabInstance: m_ObjectHideFlags: 0 @@ -19417,6 +19692,10 @@ Transform: - {fileID: 1407267687} - {fileID: 1036776029} - {fileID: 1222364614} + - {fileID: 2028333697} + - {fileID: 1429024914} + - {fileID: 1516731745} + - {fileID: 1387643237} m_Father: {fileID: 1886023632} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &712932630 stripped @@ -19841,6 +20120,7 @@ MonoBehaviour: audioSourceGhosts: {fileID: 418715426} audioSourceExtraLife: {fileID: 1036453364} pacStart: {fileID: 8300000, guid: 785e7b0273a31d944b0494c11d16c6e0, type: 3} + intermission: {fileID: 8300000, guid: 590be4cba40c2b04bb960ee74e5d60e8, type: 3} pacDot1: {fileID: 8300000, guid: 849983f9f45501b4a9cceb08a54571af, type: 3} pacDot2: {fileID: 8300000, guid: fea5136a0bdc133499b59e680f5c98df, type: 3} pacDie1: {fileID: 8300000, guid: 0392b3961b71caa4fa91c839f217d867, type: 3} @@ -20237,6 +20517,75 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} +--- !u!1001 &734987232 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2026234130} + m_Modifications: + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalScale.y + value: 0.10000007 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalScale.z + value: 0.10000007 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalPosition.x + value: 27.5 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalPosition.y + value: -16.5 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_Name + value: PacMan Start + objectReference: {fileID: 0} + - target: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f10209aafcd484f438cbd0888287e98a, type: 3} --- !u!4 &735377421 stripped Transform: m_CorrespondingSourceObject: {fileID: 1315692994360949719, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} @@ -22178,6 +22527,9 @@ Transform: - {fileID: 606557185} - {fileID: 1101037633} - {fileID: 2057945690} + - {fileID: 393606783} + - {fileID: 1033118942} + - {fileID: 196434888} m_Father: {fileID: 1886023632} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &808835976 @@ -23251,13 +23603,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2028333697} - - {fileID: 1429024914} - {fileID: 1045119746} - - {fileID: 196434888} - {fileID: 1959372908} - - {fileID: 1516731745} - - {fileID: 1387643237} m_Father: {fileID: 1886023632} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &857863772 @@ -28109,6 +28456,37 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} +--- !u!1 &1033118941 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1033118942} + m_Layer: 0 + m_Name: Fix text vs sprite rendering + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1033118942 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1033118941} + 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: 806746267} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1034221796 stripped Transform: m_CorrespondingSourceObject: {fileID: 1315692994360949719, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} @@ -34653,6 +35031,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 1315692994360949719, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} m_PrefabInstance: {fileID: 1915370441} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1282265537 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2026234130} + m_Modifications: + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalScale.y + value: 0.10000007 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalScale.z + value: 0.10000007 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalPosition.x + value: -1.5 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalPosition.y + value: -16.5 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_Name + value: Blinky Second + objectReference: {fileID: 0} + - target: {fileID: 6416098964784429726, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f10209aafcd484f438cbd0888287e98a, type: 3} +--- !u!4 &1282265538 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + m_PrefabInstance: {fileID: 1282265537} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1282656008 PrefabInstance: m_ObjectHideFlags: 0 @@ -37724,12 +38176,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1387643236} 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: 851913432} + m_Father: {fileID: 712073434} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1388421355 stripped Transform: @@ -38879,11 +39331,11 @@ Transform: m_GameObject: {fileID: 1429024913} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + 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: 851913432} + m_Father: {fileID: 712073434} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1430474353 stripped GameObject: @@ -39150,6 +39602,7 @@ Transform: - {fileID: 2130594149} - {fileID: 1606820138} - {fileID: 913595182} + - {fileID: 1618600687} m_Father: {fileID: 1886023632} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1441752956 @@ -40022,6 +40475,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 1315692994360949719, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} m_PrefabInstance: {fileID: 654135149} m_PrefabAsset: {fileID: 0} +--- !u!4 &1483436541 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + m_PrefabInstance: {fileID: 734987232} + m_PrefabAsset: {fileID: 0} --- !u!1 &1485745523 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4099390335584803315, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} @@ -40609,12 +41067,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1516731744} 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: 851913432} + m_Father: {fileID: 712073434} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1518047589 stripped GameObject: @@ -43237,7 +43695,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: PUSH SHART BUTTON + m_text: PUSH START BUTTON m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 7168d13094fcae94b81e672d1f4ab73f, type: 2} m_sharedMaterial: {fileID: 2541243872366204002, guid: 7168d13094fcae94b81e672d1f4ab73f, type: 2} @@ -43552,6 +44010,37 @@ Transform: m_CorrespondingSourceObject: {fileID: 1315692994360949719, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} m_PrefabInstance: {fileID: 1350816438} m_PrefabAsset: {fileID: 0} +--- !u!1 &1618600686 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1618600687} + m_Layer: 0 + m_Name: Choose demo type + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1618600687 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1618600686} + 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: 1438618203} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1622857050 stripped Transform: m_CorrespondingSourceObject: {fileID: 1315692994360949719, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} @@ -44009,6 +44498,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a3e3ccd3b6d1e34fb8a64aa23d418ff, type: 3} insertIndex: -1 addedObject: {fileID: 1934195469} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a3e3ccd3b6d1e34fb8a64aa23d418ff, type: 3} + insertIndex: -1 + addedObject: {fileID: 49515936} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4a3e3ccd3b6d1e34fb8a64aa23d418ff, type: 3} insertIndex: -1 addedObject: {fileID: 1219781429} @@ -47847,6 +48339,14 @@ MonoBehaviour: ID: 299 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 2026234129} + ID: 300 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 49515935} + ID: 301 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] @@ -47929,6 +48429,37 @@ Transform: m_CorrespondingSourceObject: {fileID: 1315692994360949719, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} m_PrefabInstance: {fileID: 460508736} m_PrefabAsset: {fileID: 0} +--- !u!1 &1750460164 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1750460165} + m_Layer: 0 + m_Name: Ghost start look directions not correct + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1750460165 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1750460164} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 106401850} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1750680546 PrefabInstance: m_ObjectHideFlags: 0 @@ -49264,6 +49795,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 1315692994360949719, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} m_PrefabInstance: {fileID: 1610984412} m_PrefabAsset: {fileID: 0} +--- !u!4 &1801191416 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + m_PrefabInstance: {fileID: 224767333} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1803135861 PrefabInstance: m_ObjectHideFlags: 0 @@ -51934,7 +52470,7 @@ GameObject: - component: {fileID: 1934195471} - component: {fileID: 1934195470} m_Layer: 0 - m_Name: Skip level button + m_Name: Start demo button m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -53220,6 +53756,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} +--- !u!4 &1976563574 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} + m_PrefabInstance: {fileID: 106686679} + m_PrefabAsset: {fileID: 0} --- !u!1 &1977846720 GameObject: m_ObjectHideFlags: 0 @@ -54364,6 +54905,41 @@ Transform: m_CorrespondingSourceObject: {fileID: 1315692994360949719, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} m_PrefabInstance: {fileID: 1300460534} m_PrefabAsset: {fileID: 0} +--- !u!1 &2026234129 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2026234130} + m_Layer: 0 + m_Name: Intermission Screen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2026234130 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2026234129} + 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: + - {fileID: 1483436541} + - {fileID: 1801191416} + - {fileID: 1976563574} + - {fileID: 1282265538} + m_Father: {fileID: 2084589243} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2028333696 GameObject: m_ObjectHideFlags: 0 @@ -54389,11 +54965,11 @@ Transform: m_GameObject: {fileID: 2028333696} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + 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: 851913432} + m_Father: {fileID: 712073434} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2028366766 stripped GameObject: @@ -56278,6 +56854,7 @@ Transform: - {fileID: 2063054471} - {fileID: 905219923} - {fileID: 573616887} + - {fileID: 2026234130} - {fileID: 1467061503} m_Father: {fileID: 151056553} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index e68c43b..1f0b0ca 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -21,6 +21,7 @@ namespace Marro.PacManUdon [SerializeField] private PelletManager pelletManager; [SerializeField] public StatusDisplay statusDisplay; // This one is public so other scripts can write to the debug display [SerializeField] private PelletManager attractScreen; + [SerializeField] private GameObject intermissionScreen; [SerializeField] private GameObject pressStartButtonScreen; [SerializeField] private PlayerInput playerInput; [SerializeField] private Animator demo; @@ -42,6 +43,7 @@ namespace Marro.PacManUdon private int pelletCountTotal; private int pelletCountRemaining; private GameObject[] attractScreenElements; + private GameObject[] intermissionScreenElements; [UdonSynced, FieldChangeCallback(nameof(GameState))] private PacManGameState gameState; [UdonSynced, FieldChangeCallback(nameof(Score))] private int score; @@ -54,12 +56,19 @@ namespace Marro.PacManUdon maze = mazes[0]; pelletPool = maze.pelletContainer.GetComponent(); mazeSpriteAnimator = maze.mazeSprite.GetComponent(); + attractScreenElements = new GameObject[attractScreen.transform.childCount]; for (int i = 0; i < attractScreenElements.Length; i++) { attractScreenElements[i] = attractScreen.transform.GetChild(i).gameObject; } + intermissionScreenElements = new GameObject[intermissionScreen.transform.childCount]; + for (int i = 0; i < intermissionScreenElements.Length; i++) + { + intermissionScreenElements[i] = intermissionScreen.transform.GetChild(i).gameObject; + } + ghostManager.Initialize(maze.ghostTargets, pacMan, this); pacMan.Initialize(playerInput, pelletPool, this); bonusFruit.Initialize(); @@ -114,7 +123,7 @@ namespace Marro.PacManUdon if (Networking.IsOwner(gameObject)) { Debug.Log($"{gameObject} Start demo button pressed!"); - StartTimeSequence(PacManTimeSequence.AttractScreenDemo); + StartTimeSequence(PacManTimeSequence.Intermission1); } } @@ -610,6 +619,9 @@ namespace Marro.PacManUdon case PacManTimeSequence.GameOver: TimeSequenceStepGameOver(sequenceProgress); break; + case PacManTimeSequence.Intermission1: + TimeSequenceStepIntermission1(sequenceProgress); + break; } } @@ -622,7 +634,7 @@ namespace Marro.PacManUdon return new float[0]; case PacManTimeSequence.AttractScreenIntroduction: return DeltaToAbsolute(new float[] { 0, 0.032f, 1f, 1f, .5f, .5f, 1f, .5f, .5f, 1f, .5f, .5f, 1f, .5f, 1f, 1f, 1f, - 5f, 0.2f, 2f, 0.91667f, 2f, 0.91667f, 2f, 0.91667f, 2f, 0.91667f }); + 5f, 0.2f, 2f, 0.91667f, 2f, 0.91667f, 2f, 0.91667f, 2f, 0.91667f }); case PacManTimeSequence.AttractScreenDemo: return DeltaToAbsolute(new float[] { 0, 0.016f, 0.05f, 0.16f, 0.33f, 1.85f, 54f }); case PacManTimeSequence.WaitForStart: @@ -643,6 +655,8 @@ namespace Marro.PacManUdon return DeltaToAbsolute(new float[] { 0, 0.016f, 0.064f, 0.032f, 1.85f, 0.016f }); case PacManTimeSequence.GameOver: return DeltaToAbsolute(new float[] { 0, 1.95f }); + case PacManTimeSequence.Intermission1: + return DeltaToAbsolute(new float[] { 0, 0.316f, 4.26f, 2.15f, 4.03f }); } } diff --git a/Assets/Scripts/Ghost.cs b/Assets/Scripts/Ghost.cs index 2bef84f..f302a00 100644 --- a/Assets/Scripts/Ghost.cs +++ b/Assets/Scripts/Ghost.cs @@ -551,6 +551,7 @@ namespace Marro.PacManUdon void UpdateSpeed() { speed = ghostManager.GetTargetSpeed(this, ghostState, isScared, inTunnel); + Debug.Log($"Ghost updated speed to {speed}, level: {ghostManager.elroyLevel}"); } public void ResetHousePelletCounter() @@ -634,7 +635,7 @@ namespace Marro.PacManUdon } } - public void SetScared(bool scared) + private void SetScared(bool scared) { isScared = scared; UpdateAnimator(); diff --git a/Assets/Scripts/GhostManager.asset b/Assets/Scripts/GhostManager.asset index 519b336..42c7ffc 100644 --- a/Assets/Scripts/GhostManager.asset +++ b/Assets/Scripts/GhostManager.asset @@ -43,7 +43,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 32 + Data: 33 - Name: Entry: 7 Data: @@ -1291,7 +1291,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -1652,6 +1652,54 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: kinematic + - Name: $v + Entry: 7 + Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: kinematic + - Name: k__BackingField + Entry: 9 + Data: 35 + - Name: k__BackingField + Entry: 9 + Data: 35 + - 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: 13 Data: diff --git a/Assets/Scripts/GhostManager.cs b/Assets/Scripts/GhostManager.cs index a858528..9fefc51 100644 --- a/Assets/Scripts/GhostManager.cs +++ b/Assets/Scripts/GhostManager.cs @@ -44,7 +44,7 @@ private int scatterPatternIndex; // Elroy logic - private int elroyLevel; + public int elroyLevel; private int pelletsRemaining; // Ghost house logic @@ -55,6 +55,7 @@ private float pelletTimeoutLimit; private bool frozen; + private bool kinematic; // This should be called once when the game is initialized public void Initialize(GameObject[] ghostTargets, PacMan pacMan, GameManager gameController) @@ -83,6 +84,8 @@ sharedPelletCounter = 0; pelletTimeout = 0; elroyLevel = 0; + frozen = false; + kinematic = false; foreach (Ghost ghost in ghosts) { @@ -110,7 +113,7 @@ public void FixedUpdate() { // gameStateManager.statusDisplay.SetDebugText(1, this.blinkCountdown.ToString()); - if (frozen) + if (frozen || kinematic) { return; } @@ -310,6 +313,7 @@ public void SetLevel(int level) { + Debug.Log($"GhostManager: SetLevel {level}"); speedDefault = PacManConstants.GetGhostDefaultSpeedForLevel(level); speedScared = PacManConstants.GetGhostScaredSpeedForLevel(level); speedReturn = 15f; @@ -471,6 +475,7 @@ public void SetKinematic(bool kinematic) { + this.kinematic = kinematic; foreach (Ghost ghost in ghosts) { ghost.SetKinematic(kinematic); diff --git a/Assets/Scripts/PacMan.cs b/Assets/Scripts/PacMan.cs index a2833ce..b456d4e 100644 --- a/Assets/Scripts/PacMan.cs +++ b/Assets/Scripts/PacMan.cs @@ -34,6 +34,17 @@ [UdonSynced] private float freezeSeconds; [UdonSynced] private bool frozen; +#region Animator constants + private const string AnimatorKeyDead = "Dead"; + private const string AnimatorKeyDirection = "Direction"; + private const float AnimatorDirectionNone = 0f; + private const float AnimatorDirectionRight = 0.25f; + private const float AnimatorDirectionLeft = 0.50f; + private const float AnimatorDirectionUp = 0.75f; + private const float AnimatorDirectionDown = 1f; + private const float AnimatorDirectionRightBig = 1.25f; +#endregion + public void Initialize(PlayerInput input, VRCObjectPool pelletPool, GameManager gameController) { @@ -202,7 +213,7 @@ if (!gameObject.activeInHierarchy) return; - animator.SetBool("Dead", dead); + animator.SetBool(AnimatorKeyDead, dead); if (dead) { animator.speed = 1; @@ -211,7 +222,7 @@ if (frozen || direction.Equals(Vector2.zero)) { - animator.SetFloat("Direction", 0f); + animator.SetFloat(AnimatorKeyDirection, AnimatorDirectionNone); animator.speed = 0; } else @@ -219,31 +230,23 @@ animator.speed = 1; if (targetDirection.Equals(Vector2.right)) { - animator.SetFloat("Direction", 0.25f); + animator.SetFloat(AnimatorKeyDirection, AnimatorDirectionRight); } else if (targetDirection.Equals(Vector2.left)) { - animator.SetFloat("Direction", 0.5f); + animator.SetFloat(AnimatorKeyDirection, AnimatorDirectionLeft); } else if (targetDirection.Equals(Vector2.up)) { - animator.SetFloat("Direction", 0.75f); + animator.SetFloat(AnimatorKeyDirection, AnimatorDirectionUp); } else if (targetDirection.Equals(Vector2.down)) { - animator.SetFloat("Direction", 1f); + animator.SetFloat(AnimatorKeyDirection, AnimatorDirectionDown); } } } - // public Vector2 GetTarget(Vector2 gridPosition, Vector2 currentDirection) { - // Vector2 nextDirection = input.GetRotatedDirection(); - // if(!nextDirection.Equals(currentDirection) && !GridMoverTools.CheckCollisionInDirection(transform, gridPosition, nextDirection)) { - // return nextDirection; - // } - // return Vector2.zero; - // } - public void SetDead(bool dead) { this.dead = dead; @@ -303,6 +306,11 @@ predefinedPathIndex = 0; } + public void BecomeBig() + { + animator.SetFloat(AnimatorKeyDirection, AnimatorDirectionRightBig); + } + void SetVisibility(bool visible) { renderer.enabled = visible; diff --git a/Assets/Scripts/PacManConstants.cs b/Assets/Scripts/PacManConstants.cs index bce57d4..168603e 100644 --- a/Assets/Scripts/PacManConstants.cs +++ b/Assets/Scripts/PacManConstants.cs @@ -42,7 +42,10 @@ namespace Marro.PacManUdon GhostCaught, PacManCaught, RestartLevel, - GameOver + GameOver, + Intermission1, + Intermission2, + Intermission3 } public static class PacManConstants diff --git a/Assets/Scripts/Sequences/AttractScreenIntroduction.cs b/Assets/Scripts/Sequences/AttractScreenIntroduction.cs index c8efbcd..7212f3c 100644 --- a/Assets/Scripts/Sequences/AttractScreenIntroduction.cs +++ b/Assets/Scripts/Sequences/AttractScreenIntroduction.cs @@ -86,15 +86,15 @@ namespace Marro.PacManUdon attractScreenElements[14].SetActive(true); attractScreenElements[15].SetActive(true); - pacMan.SetLevel(1); pacMan.Reset(); + pacMan.SetLevel(1); pacMan.SetKinematic(true); pacMan.SetActive(true); pacMan.SetPosition(attractScreenElements[16].transform.localPosition); pacMan.SetDirection(Vector2.left); - ghostManager.SetLevel(2); ghostManager.Reset(); + ghostManager.SetLevel(2); ghostManager.SetKinematic(true); ghostManager.SetActive(true); Ghost[] ghosts = ghostManager.Ghosts; diff --git a/Assets/Scripts/Sequences/Intermission1.cs b/Assets/Scripts/Sequences/Intermission1.cs new file mode 100644 index 0000000..1a20d03 --- /dev/null +++ b/Assets/Scripts/Sequences/Intermission1.cs @@ -0,0 +1,64 @@ +using UnityEngine; + +namespace Marro.PacManUdon +{ + public partial class GameManager + { + private void TimeSequenceStepIntermission1(int sequenceProgress) + { + var blinky = ghostManager.Ghosts[0]; + + switch (sequenceProgress) + { + case 0: + // Show just level display + RestartLevel(); + statusDisplay.SetLevelDisplayVisible(true); + break; + case 1: + // Start animation, blinky chasing pacman + soundManager.SuppressSound(false); + soundManager.StartIntermissionSound(); + pacMan.Reset(); + pacMan.SetLevel(4); + pacMan.SetPowerPellet(false); // Update speed + pacMan.SetKinematic(true); + pacMan.SetActive(true); + pacMan.SetPosition(intermissionScreenElements[0].transform.localPosition); + pacMan.SetDirection(Vector2.left); + + ghostManager.Reset(); + ghostManager.SetLevel(5); + ghostManager.SetKinematic(true); + ghostManager.gameObject.SetActive(true); + blinky.SetElroy(2); + blinky.SetPosition(intermissionScreenElements[1].transform.localPosition); + blinky.SetDirection(Vector2.left); + blinky.SetState(PacManGhostState.Normal); + blinky.SetActive(true); + SetFrozen(false); + break; + case 2: + // Reached end, make ghost scared and turn around + blinky.BecomeScared(); + blinky.SetPosition(intermissionScreenElements[3].transform.localPosition); + pacMan.SetDirection(Vector2.zero); + pacMan.SetPosition(intermissionScreenElements[2].transform.localPosition); + pacMan.SetPowerPellet(true); + + break; + case 3: + // Pacman starts changing ghosts + pacMan.SetDirection(Vector2.right); + pacMan.BecomeBig(); + break; + case 4: + // End cutscene + soundManager.StopAllSound(); + SetFrozen(true); + StartTimeSequence(PacManTimeSequence.StartNewLevel); + break; + } + } + } +} diff --git a/Assets/Scripts/Sequences/Intermission1.cs.meta b/Assets/Scripts/Sequences/Intermission1.cs.meta new file mode 100644 index 0000000..b6d5210 --- /dev/null +++ b/Assets/Scripts/Sequences/Intermission1.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 343ec2edec89234428ef86d00b0c6430 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/SoundManager.asset b/Assets/Scripts/SoundManager.asset index 0c6de64..cb6fab4 100644 --- a/Assets/Scripts/SoundManager.asset +++ b/Assets/Scripts/SoundManager.asset @@ -43,7 +43,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 24 + Data: 25 - Name: Entry: 7 Data: @@ -277,13 +277,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pacDot1 + Data: intermission - Name: $v Entry: 7 Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pacDot1 + Data: intermission - Name: k__BackingField Entry: 9 Data: 13 @@ -331,13 +331,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pacDot2 + Data: pacDot1 - Name: $v Entry: 7 Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pacDot2 + Data: pacDot1 - Name: k__BackingField Entry: 9 Data: 13 @@ -385,13 +385,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pacDie1 + Data: pacDot2 - Name: $v Entry: 7 Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pacDie1 + Data: pacDot2 - Name: k__BackingField Entry: 9 Data: 13 @@ -439,13 +439,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pacFruit + Data: pacDie1 - Name: $v Entry: 7 Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pacFruit + Data: pacDie1 - Name: k__BackingField Entry: 9 Data: 13 @@ -493,13 +493,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pacCoin + Data: pacFruit - Name: $v Entry: 7 Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pacCoin + Data: pacFruit - Name: k__BackingField Entry: 9 Data: 13 @@ -547,13 +547,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pacGhostEat + Data: pacCoin - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pacGhostEat + Data: pacCoin - Name: k__BackingField Entry: 9 Data: 13 @@ -601,13 +601,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pacGhostBlue + Data: pacGhostEat - Name: $v Entry: 7 Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pacGhostBlue + Data: pacGhostEat - Name: k__BackingField Entry: 9 Data: 13 @@ -655,13 +655,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pacGhostRetreat + Data: pacGhostBlue - Name: $v Entry: 7 Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pacGhostRetreat + Data: pacGhostBlue - Name: k__BackingField Entry: 9 Data: 13 @@ -709,13 +709,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pacExtraLife + Data: pacGhostRetreat - Name: $v Entry: 7 Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pacExtraLife + Data: pacGhostRetreat - Name: k__BackingField Entry: 9 Data: 13 @@ -763,13 +763,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: siren0 + Data: pacExtraLife - Name: $v Entry: 7 Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: siren0 + Data: pacExtraLife - Name: k__BackingField Entry: 9 Data: 13 @@ -817,13 +817,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: siren1 + Data: siren0 - Name: $v Entry: 7 Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: siren1 + Data: siren0 - Name: k__BackingField Entry: 9 Data: 13 @@ -871,13 +871,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: siren2 + Data: siren1 - Name: $v Entry: 7 Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: siren2 + Data: siren1 - Name: k__BackingField Entry: 9 Data: 13 @@ -925,13 +925,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: siren3 + Data: siren2 - Name: $v Entry: 7 Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: siren3 + Data: siren2 - Name: k__BackingField Entry: 9 Data: 13 @@ -979,13 +979,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: siren4 + Data: siren3 - Name: $v Entry: 7 Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: siren4 + Data: siren3 - Name: k__BackingField Entry: 9 Data: 13 @@ -1033,13 +1033,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _nextDotSound + Data: siren4 - Name: $v Entry: 7 Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _nextDotSound + Data: siren4 - Name: k__BackingField Entry: 9 Data: 13 @@ -1057,13 +1057,19 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 Data: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 60|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -1081,25 +1087,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ghostRetreating + Data: _nextDotSound - Name: $v Entry: 7 - Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ghostRetreating + Data: _nextDotSound - Name: k__BackingField - Entry: 7 - Data: 61|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Boolean, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 13 - Name: k__BackingField Entry: 9 - Data: 61 + Data: 13 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1135,19 +1135,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ghostBlue + Data: _ghostRetreating - Name: $v Entry: 7 Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ghostBlue + Data: _ghostRetreating - Name: k__BackingField - Entry: 9 - Data: 61 + Entry: 7 + Data: 64|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 61 + Data: 64 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1162,7 +1168,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1183,25 +1189,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ghostSoundLevel + Data: _ghostBlue - Name: $v Entry: 7 - Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ghostSoundLevel + Data: _ghostBlue - Name: k__BackingField - Entry: 7 - Data: 66|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Int32, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 64 - Name: k__BackingField Entry: 9 - Data: 66 + Data: 64 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1237,19 +1237,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _currentlyPlayingSiren + Data: _ghostSoundLevel - Name: $v Entry: 7 Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _currentlyPlayingSiren + Data: _ghostSoundLevel - Name: k__BackingField - Entry: 9 - Data: 61 + Entry: 7 + Data: 69|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 61 + Data: 69 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1264,7 +1270,55 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 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: _currentlyPlayingSiren + - Name: $v + Entry: 7 + Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _currentlyPlayingSiren + - Name: k__BackingField + Entry: 9 + Data: 64 + - Name: k__BackingField + Entry: 9 + Data: 64 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1288,16 +1342,16 @@ MonoBehaviour: Data: _suppress - Name: $v Entry: 7 - Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _suppress - Name: k__BackingField Entry: 9 - Data: 61 + Data: 64 - Name: k__BackingField Entry: 9 - Data: 61 + Data: 64 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1312,7 +1366,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/Scripts/SoundManager.cs b/Assets/Scripts/SoundManager.cs index b566bea..6e1436e 100644 --- a/Assets/Scripts/SoundManager.cs +++ b/Assets/Scripts/SoundManager.cs @@ -11,6 +11,8 @@ public class SoundManager : UdonSharpBehaviour [SerializeField] private AudioSource audioSourceExtraLife; [SerializeField] private AudioClip pacStart; + [SerializeField] private AudioClip intermission; + [SerializeField] private AudioClip pacDot1; [SerializeField] private AudioClip pacDot2; [SerializeField] private AudioClip pacDie1; @@ -69,6 +71,11 @@ public class SoundManager : UdonSharpBehaviour PlaySound(audioSourcePacMan, pacStart); } + public void StartIntermissionSound() + { + PlaySound(audioSourcePacMan, intermission, true); + } + public void PlayPelletSound() { PlaySound(audioSourcePacMan, _nextDotSound); diff --git a/Assets/Sounds/intermission.wav b/Assets/Sounds/intermission.wav new file mode 100644 index 0000000..a8028ae Binary files /dev/null and b/Assets/Sounds/intermission.wav differ diff --git a/Assets/Sounds/intermission.wav.meta b/Assets/Sounds/intermission.wav.meta new file mode 100644 index 0000000..1a1fb79 --- /dev/null +++ b/Assets/Sounds/intermission.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 590be4cba40c2b04bb960ee74e5d60e8 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: