diff --git a/Assets/Animations/Ghost/Ghost.controller b/Assets/Animations/Ghost/Ghost.controller index afd5b68..6418f82 100644 --- a/Assets/Animations/Ghost/Ghost.controller +++ b/Assets/Animations/Ghost/Ghost.controller @@ -47,6 +47,61 @@ BlendTree: m_UseAutomaticThresholds: 1 m_NormalizedBlendValues: 0 m_BlendType: 1 +--- !u!206 &-8944447067464121002 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Special + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 7285e9dfd47eeb64f8a359c3d14be984, type: 2} + m_Threshold: 0 + m_Position: {x: 1, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: DirX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: aaf4617f2ca36da40883d1c0fa350dbc, type: 2} + m_Threshold: 0.25 + m_Position: {x: -1, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: DirX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 85bb4d19537fb1d429f9b123bc9d9c00, type: 2} + m_Threshold: 0.5 + m_Position: {x: 0, y: 1} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: DirX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 454d1764e1b7a1946808d4221d71c6c5, type: 2} + m_Threshold: 0.75 + m_Position: {x: 0, y: -1} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: DirX + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 2e01a9fa01711c949a6922e3ebaece0f, type: 2} + m_Threshold: 1 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: DirX + m_Mirror: 0 + m_BlendParameter: DirX + m_BlendParameterY: DirY + m_MinThreshold: 0 + m_MaxThreshold: 1 + m_UseAutomaticThresholds: 1 + m_NormalizedBlendValues: 0 + m_BlendType: 1 --- !u!206 &-6725170829935541210 BlendTree: m_ObjectHideFlags: 1 @@ -228,19 +283,19 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: DirY m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: GhostType m_Type: 1 m_DefaultFloat: 1 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -417,10 +472,18 @@ BlendTree: m_CycleOffset: 0 m_DirectBlendParameter: GhostState m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: -8944447067464121002} + m_Threshold: 7 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: DirX + m_Mirror: 0 m_BlendParameter: GhostType m_BlendParameterY: Blend m_MinThreshold: 0 - m_MaxThreshold: 6 + m_MaxThreshold: 7 m_UseAutomaticThresholds: 0 m_NormalizedBlendValues: 0 m_BlendType: 0 diff --git a/Assets/Animations/Ghost/SpecialDown Leg cover torn.anim b/Assets/Animations/Ghost/SpecialDown Leg cover torn.anim new file mode 100644 index 0000000..df4788e --- /dev/null +++ b/Assets/Animations/Ghost/SpecialDown Leg cover torn.anim @@ -0,0 +1,72 @@ +%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: SpecialDown Leg cover torn + 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: -1398607546, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 15 + 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: -1398607546, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.06666667 + 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/Ghost/SpecialDown Leg cover torn.anim.meta b/Assets/Animations/Ghost/SpecialDown Leg cover torn.anim.meta new file mode 100644 index 0000000..009f0ef --- /dev/null +++ b/Assets/Animations/Ghost/SpecialDown Leg cover torn.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 454d1764e1b7a1946808d4221d71c6c5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Ghost/SpecialLeft Stiched up.anim b/Assets/Animations/Ghost/SpecialLeft Stiched up.anim new file mode 100644 index 0000000..478e277 --- /dev/null +++ b/Assets/Animations/Ghost/SpecialLeft Stiched up.anim @@ -0,0 +1,75 @@ +%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: SpecialLeft Stiched up + 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: 1662480253, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + - time: 0.06666667 + value: {fileID: 1425082029, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 15 + 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: 1662480253, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + - {fileID: 1425082029, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.13333334 + 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/Ghost/SpecialLeft Stiched up.anim.meta b/Assets/Animations/Ghost/SpecialLeft Stiched up.anim.meta new file mode 100644 index 0000000..0d18a3f --- /dev/null +++ b/Assets/Animations/Ghost/SpecialLeft Stiched up.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aaf4617f2ca36da40883d1c0fa350dbc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Ghost/SpecialRight dragging cover.anim b/Assets/Animations/Ghost/SpecialRight dragging cover.anim new file mode 100644 index 0000000..9b489a8 --- /dev/null +++ b/Assets/Animations/Ghost/SpecialRight dragging cover.anim @@ -0,0 +1,75 @@ +%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: SpecialRight dragging cover + 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: 938106153, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + - time: 0.06666667 + value: {fileID: -824318244, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 15 + 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: 938106153, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + - {fileID: -824318244, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.13333334 + 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/Ghost/SpecialRight dragging cover.anim.meta b/Assets/Animations/Ghost/SpecialRight dragging cover.anim.meta new file mode 100644 index 0000000..9f3e6af --- /dev/null +++ b/Assets/Animations/Ghost/SpecialRight dragging cover.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7285e9dfd47eeb64f8a359c3d14be984 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Ghost/SpecialUp Leg cover torn.anim b/Assets/Animations/Ghost/SpecialUp Leg cover torn.anim new file mode 100644 index 0000000..9147d59 --- /dev/null +++ b/Assets/Animations/Ghost/SpecialUp Leg cover torn.anim @@ -0,0 +1,72 @@ +%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: SpecialUp Leg cover torn + 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: 222565271, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 15 + 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: 222565271, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.06666667 + 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/Ghost/SpecialUp Leg cover torn.anim.meta b/Assets/Animations/Ghost/SpecialUp Leg cover torn.anim.meta new file mode 100644 index 0000000..f096d8b --- /dev/null +++ b/Assets/Animations/Ghost/SpecialUp Leg cover torn.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85bb4d19537fb1d429f9b123bc9d9c00 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Ghost/SpecialZero.anim b/Assets/Animations/Ghost/SpecialZero.anim new file mode 100644 index 0000000..b2a0bbd --- /dev/null +++ b/Assets/Animations/Ghost/SpecialZero.anim @@ -0,0 +1,72 @@ +%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: SpecialZero + 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: -1398607546, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 15 + 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: -1398607546, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.06666667 + 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/Ghost/SpecialZero.anim.meta b/Assets/Animations/Ghost/SpecialZero.anim.meta new file mode 100644 index 0000000..a1e5598 --- /dev/null +++ b/Assets/Animations/Ghost/SpecialZero.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2e01a9fa01711c949a6922e3ebaece0f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Pole.meta b/Assets/Animations/Pole.meta new file mode 100644 index 0000000..5df4b9e --- /dev/null +++ b/Assets/Animations/Pole.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 712dee4d10687b8419e7ddcf1dfa728f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Pole/Pole Base.anim b/Assets/Animations/Pole/Pole Base.anim new file mode 100644 index 0000000..9864d2e --- /dev/null +++ b/Assets/Animations/Pole/Pole Base.anim @@ -0,0 +1,72 @@ +%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: Pole Base + 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: 1420031444, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + 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: 1420031444, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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/Pole/Pole Base.anim.meta b/Assets/Animations/Pole/Pole Base.anim.meta new file mode 100644 index 0000000..cdd69b4 --- /dev/null +++ b/Assets/Animations/Pole/Pole Base.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e8a3071f9082e9248b263f38d82bbbc8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Pole/Pole Separated.anim b/Assets/Animations/Pole/Pole Separated.anim new file mode 100644 index 0000000..9303633 --- /dev/null +++ b/Assets/Animations/Pole/Pole Separated.anim @@ -0,0 +1,72 @@ +%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: Pole Separated + 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: 1473020388, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + 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: 1473020388, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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/Pole/Pole Separated.anim.meta b/Assets/Animations/Pole/Pole Separated.anim.meta new file mode 100644 index 0000000..57e4b4a --- /dev/null +++ b/Assets/Animations/Pole/Pole Separated.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 83b261ac8c2e7f04ca0d8da11e8fc14f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Pole/Pole Strech 1.anim b/Assets/Animations/Pole/Pole Strech 1.anim new file mode 100644 index 0000000..fcbde70 --- /dev/null +++ b/Assets/Animations/Pole/Pole Strech 1.anim @@ -0,0 +1,72 @@ +%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: Pole Strech 1 + 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: 1836525864, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + 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: 1836525864, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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/Pole/Pole Strech 1.anim.meta b/Assets/Animations/Pole/Pole Strech 1.anim.meta new file mode 100644 index 0000000..329641f --- /dev/null +++ b/Assets/Animations/Pole/Pole Strech 1.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ac67a04acec0d9546b21851869fda2d4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Pole/Pole Strech 2.anim b/Assets/Animations/Pole/Pole Strech 2.anim new file mode 100644 index 0000000..1e349b8 --- /dev/null +++ b/Assets/Animations/Pole/Pole Strech 2.anim @@ -0,0 +1,72 @@ +%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: Pole Strech 2 + 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: -1045593724, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + 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: -1045593724, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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/Pole/Pole Strech 2.anim.meta b/Assets/Animations/Pole/Pole Strech 2.anim.meta new file mode 100644 index 0000000..76d9858 --- /dev/null +++ b/Assets/Animations/Pole/Pole Strech 2.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4a1a2d9f0f85bb14cbd4733341241ca3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Pole/Pole Strech 3.anim b/Assets/Animations/Pole/Pole Strech 3.anim new file mode 100644 index 0000000..544c2c1 --- /dev/null +++ b/Assets/Animations/Pole/Pole Strech 3.anim @@ -0,0 +1,72 @@ +%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: Pole Strech 3 + 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: -1340953024, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + 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: -1340953024, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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/Pole/Pole Strech 3.anim.meta b/Assets/Animations/Pole/Pole Strech 3.anim.meta new file mode 100644 index 0000000..d846a6b --- /dev/null +++ b/Assets/Animations/Pole/Pole Strech 3.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a9c77b2807eb9a6408d84c525c9dba13 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Pole/Pole.controller b/Assets/Animations/Pole/Pole.controller new file mode 100644 index 0000000..34c4288 --- /dev/null +++ b/Assets/Animations/Pole/Pole.controller @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!206 &-6499750159121831549 +BlendTree: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Childs: + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: e8a3071f9082e9248b263f38d82bbbc8, type: 2} + m_Threshold: 0 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: ac67a04acec0d9546b21851869fda2d4, type: 2} + m_Threshold: 1 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 4a1a2d9f0f85bb14cbd4733341241ca3, type: 2} + m_Threshold: 2 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: a9c77b2807eb9a6408d84c525c9dba13, type: 2} + m_Threshold: 3 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + - serializedVersion: 2 + m_Motion: {fileID: 7400000, guid: 83b261ac8c2e7f04ca0d8da11e8fc14f, type: 2} + m_Threshold: 4 + m_Position: {x: 0, y: 0} + m_TimeScale: 1 + m_CycleOffset: 0 + m_DirectBlendParameter: Blend + m_Mirror: 0 + m_BlendParameter: Strech + m_BlendParameterY: Blend + m_MinThreshold: 0 + m_MaxThreshold: 4 + m_UseAutomaticThresholds: 0 + m_NormalizedBlendValues: 0 + m_BlendType: 0 +--- !u!1102 &-237968760341279601 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Blend Tree + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -6499750159121831549} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pole + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Strech + m_Type: 1 + m_DefaultFloat: 1 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1520295354504132550} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &1520295354504132550 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -237968760341279601} + m_Position: {x: 381.44016, y: 123.90466, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -237968760341279601} diff --git a/Assets/Animations/Pole/Pole.controller.meta b/Assets/Animations/Pole/Pole.controller.meta new file mode 100644 index 0000000..3a01958 --- /dev/null +++ b/Assets/Animations/Pole/Pole.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a0ee720eb7bb6f64c87726b9568d92f9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/PacMan.unity b/Assets/Scenes/PacMan.unity index 36532d3..5a76ebe 100644 --- a/Assets/Scenes/PacMan.unity +++ b/Assets/Scenes/PacMan.unity @@ -2535,7 +2535,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} propertyPath: m_LocalPosition.x - value: -4 + value: -3.5 objectReference: {fileID: 0} - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} propertyPath: m_LocalPosition.y @@ -3212,7 +3212,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 3.625, y: -20.37501} + m_AnchoredPosition: {x: 3.5, y: -21} m_SizeDelta: {x: 6, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &143399705 @@ -3383,7 +3383,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 7.625, y: -16.375011} + m_AnchoredPosition: {x: 7.5, y: -17} m_SizeDelta: {x: 2, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &143727503 @@ -5877,7 +5877,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} propertyPath: m_LocalPosition.x - value: 31 + value: 28.5 objectReference: {fileID: 0} - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} propertyPath: m_LocalPosition.y @@ -16575,6 +16575,84 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &586011047 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1749026400577073820, guid: 2079ab708ebf5c441906133787c4d33b, type: 3} + m_PrefabInstance: {fileID: 1503069994} + m_PrefabAsset: {fileID: 0} +--- !u!4 &586011048 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7480337843116735563, guid: 2079ab708ebf5c441906133787c4d33b, type: 3} + m_PrefabInstance: {fileID: 1503069994} + m_PrefabAsset: {fileID: 0} +--- !u!95 &586011049 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 586011047} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: a0ee720eb7bb6f64c87726b9568d92f9, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &586011051 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 586011047} + 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: 33352f027da089a48a08445f114d9370, type: 2} + programSource: {fileID: 11400000, guid: 69101ecb2e061304d8eab6d8ab57a356, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &586011052 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 586011047} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5561162f0532eab4ea6c388cb2d33504, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 586011051} --- !u!1 &586473939 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4099390335584803315, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} @@ -20535,7 +20613,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} propertyPath: m_LocalPosition.x - value: 27.5 + value: 28 objectReference: {fileID: 0} - target: {fileID: 2303859902328226329, guid: f10209aafcd484f438cbd0888287e98a, type: 3} propertyPath: m_LocalPosition.y @@ -22530,6 +22608,7 @@ Transform: - {fileID: 393606783} - {fileID: 1033118942} - {fileID: 196434888} + - {fileID: 1933482823} m_Father: {fileID: 1886023632} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &808835976 @@ -24624,7 +24703,7 @@ Transform: m_GameObject: {fileID: 884405688} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 26, y: -20.500008, z: -0.00000011920929} + m_LocalPosition: {x: 26, y: -21, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -33458,7 +33537,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 21.125, y: -20.37501} + m_AnchoredPosition: {x: 21, y: -21} m_SizeDelta: {x: 5, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1206027443 @@ -40891,6 +40970,76 @@ Transform: m_Children: [] m_Father: {fileID: 806746267} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1503069994 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2026234130} + m_Modifications: + - target: {fileID: 1749026400577073820, guid: 2079ab708ebf5c441906133787c4d33b, type: 3} + propertyPath: m_Name + value: Pole + objectReference: {fileID: 0} + - target: {fileID: 7011447544460571988, guid: 2079ab708ebf5c441906133787c4d33b, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 1420031444, guid: 7c9882097c3869842a9cfc7730a9a2dc, type: 3} + - target: {fileID: 7480337843116735563, guid: 2079ab708ebf5c441906133787c4d33b, type: 3} + propertyPath: m_LocalPosition.x + value: 14.375 + objectReference: {fileID: 0} + - target: {fileID: 7480337843116735563, guid: 2079ab708ebf5c441906133787c4d33b, type: 3} + propertyPath: m_LocalPosition.y + value: -16.875 + objectReference: {fileID: 0} + - target: {fileID: 7480337843116735563, guid: 2079ab708ebf5c441906133787c4d33b, type: 3} + propertyPath: m_LocalPosition.z + value: 0.0000019073486 + objectReference: {fileID: 0} + - target: {fileID: 7480337843116735563, guid: 2079ab708ebf5c441906133787c4d33b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7480337843116735563, guid: 2079ab708ebf5c441906133787c4d33b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7480337843116735563, guid: 2079ab708ebf5c441906133787c4d33b, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7480337843116735563, guid: 2079ab708ebf5c441906133787c4d33b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7480337843116735563, guid: 2079ab708ebf5c441906133787c4d33b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7480337843116735563, guid: 2079ab708ebf5c441906133787c4d33b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7480337843116735563, guid: 2079ab708ebf5c441906133787c4d33b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1749026400577073820, guid: 2079ab708ebf5c441906133787c4d33b, type: 3} + insertIndex: -1 + addedObject: {fileID: 586011049} + - targetCorrespondingSourceObject: {fileID: 1749026400577073820, guid: 2079ab708ebf5c441906133787c4d33b, type: 3} + insertIndex: -1 + addedObject: {fileID: 586011052} + - targetCorrespondingSourceObject: {fileID: 1749026400577073820, guid: 2079ab708ebf5c441906133787c4d33b, type: 3} + insertIndex: -1 + addedObject: {fileID: 586011051} + m_SourcePrefab: {fileID: 100100000, guid: 2079ab708ebf5c441906133787c4d33b, type: 3} --- !u!1 &1503721137 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4099390335584803315, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} @@ -41545,7 +41694,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 7.625, y: -24.375011} + m_AnchoredPosition: {x: 7.5, y: -25} m_SizeDelta: {x: 10, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1535494978 @@ -43672,7 +43821,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 7.625, y: -12.3750105} + m_AnchoredPosition: {x: 7.5, y: -13} m_SizeDelta: {x: 6, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1613622573 @@ -48347,6 +48496,10 @@ MonoBehaviour: ID: 301 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 586011047} + ID: 302 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] @@ -52447,6 +52600,37 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} +--- !u!1 &1933482822 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1933482823} + m_Layer: 0 + m_Name: Improve scary transition out of intermission 2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1933482823 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1933482822} + 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!1 &1934033480 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4099390335584803315, guid: 00a825a5aeafee94789192f61cbb3a5a, type: 3} @@ -54920,7 +55104,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2026234130 Transform: m_ObjectHideFlags: 0 @@ -54938,6 +55122,7 @@ Transform: - {fileID: 1801191416} - {fileID: 1976563574} - {fileID: 1282265538} + - {fileID: 586011048} m_Father: {fileID: 2084589243} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2028333696 @@ -56042,6 +56227,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 2063054473} + elroyLevel: 0 --- !u!114 &2063054473 MonoBehaviour: m_ObjectHideFlags: 2 @@ -57994,7 +58180,7 @@ Transform: m_GameObject: {fileID: 2135605377} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -13.5, y: 0, z: 19} + m_LocalPosition: {x: -13.5, y: 0, z: 18.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Scripts/GameManager.asset b/Assets/Scripts/GameManager.asset index 5f08313..7c12ac6 100644 --- a/Assets/Scripts/GameManager.asset +++ b/Assets/Scripts/GameManager.asset @@ -43,7 +43,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 33 + Data: 36 - Name: Entry: 7 Data: @@ -484,13 +484,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pressStartButtonScreen + Data: intermissionScreen - Name: $v Entry: 7 Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pressStartButtonScreen + Data: intermissionScreen - Name: k__BackingField Entry: 7 Data: 33|System.RuntimeType, mscorlib @@ -544,16 +544,70 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: playerInput + Data: pressStartButtonScreen - Name: $v Entry: 7 Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: pressStartButtonScreen + - Name: k__BackingField + Entry: 9 + Data: 33 + - Name: k__BackingField + Entry: 9 + Data: 33 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 38|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: playerInput + - Name: $v + Entry: 7 + Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: playerInput - Name: k__BackingField Entry: 7 - Data: 37|System.RuntimeType, mscorlib + Data: 40|System.RuntimeType, mscorlib - Name: Entry: 1 Data: Marro.PacManUdon.PlayerInput, Assembly-CSharp @@ -577,13 +631,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 39|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 42|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -607,13 +661,13 @@ MonoBehaviour: Data: demo - Name: $v Entry: 7 - Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: demo - Name: k__BackingField Entry: 7 - Data: 41|System.RuntimeType, mscorlib + Data: 44|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Animator, UnityEngine.AnimationModule @@ -622,7 +676,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 41 + Data: 44 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -637,13 +691,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 43|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 46|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -667,13 +721,13 @@ MonoBehaviour: Data: soundManager - Name: $v Entry: 7 - Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: soundManager - Name: k__BackingField Entry: 7 - Data: 45|System.RuntimeType, mscorlib + Data: 48|System.RuntimeType, mscorlib - Name: Entry: 1 Data: SoundManager, Assembly-CSharp @@ -695,60 +749,6 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 47|UnityEngine.SerializeField, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: recorder - - Name: $v - Entry: 7 - Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: recorder - - Name: k__BackingField - Entry: 9 - Data: 33 - - Name: k__BackingField - Entry: 9 - Data: 33 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: true - Name: _fieldAttributes Entry: 7 Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -778,25 +778,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: startingExtraLives + Data: recorder - Name: $v Entry: 7 Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: startingExtraLives + Data: recorder - Name: k__BackingField - Entry: 7 - Data: 52|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Int32, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 33 - Name: k__BackingField Entry: 9 - Data: 52 + Data: 33 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -811,22 +805,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 - Data: 54|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - - Name: header - Entry: 1 - Data: Game settings - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 55|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 53|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -847,19 +832,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: scoreToExtraLife + Data: startingExtraLives - Name: $v Entry: 7 - Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: scoreToExtraLife + Data: startingExtraLives - Name: k__BackingField - Entry: 9 - Data: 52 + Entry: 7 + Data: 55|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 52 + Data: 55 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -874,10 +865,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 + - Name: + Entry: 7 + Data: 57|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Game settings + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 58|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -901,19 +901,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pelletCountOverride + Data: scoreToExtraLife - Name: $v Entry: 7 Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pelletCountOverride + Data: scoreToExtraLife - Name: k__BackingField Entry: 9 - Data: 52 + Data: 55 - Name: k__BackingField Entry: 9 - Data: 52 + Data: 55 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -931,19 +931,10 @@ MonoBehaviour: Data: 60|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 - Data: 61|UnityEngine.TooltipAttribute, UnityEngine.CoreModule - - Name: tooltip - Entry: 1 - Data: Override amount of pellets needed to clear stage, set to -1 to disable. - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 61|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -964,25 +955,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: maze + Data: pelletCountOverride - Name: $v Entry: 7 - Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: maze + Data: pelletCountOverride - Name: k__BackingField - Entry: 7 - Data: 64|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: Marro.PacManUdon.Maze, Assembly-CSharp - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 55 - Name: k__BackingField Entry: 9 - Data: 10 + Data: 55 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -994,13 +979,28 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 - Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 2 + - Name: + Entry: 7 + Data: 64|UnityEngine.TooltipAttribute, UnityEngine.CoreModule + - Name: tooltip + Entry: 1 + Data: Override amount of pellets needed to clear stage, set to -1 to disable. + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 65|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -1018,25 +1018,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pelletPool + Data: maze - Name: $v Entry: 7 Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pelletPool + Data: maze - Name: k__BackingField Entry: 7 Data: 67|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDK3.Components.VRCObjectPool, VRCSDK3 + Data: Marro.PacManUdon.Maze, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 67 + Data: 10 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1072,19 +1072,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: mazeSpriteAnimator + Data: pelletPool - Name: $v Entry: 7 Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: mazeSpriteAnimator + Data: pelletPool - Name: k__BackingField - Entry: 9 - Data: 41 + Entry: 7 + Data: 70|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDK3.Components.VRCObjectPool, VRCSDK3 + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 41 + Data: 70 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1099,7 +1105,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1120,67 +1126,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: pelletCountTotal + Data: intermission2Pole - Name: $v Entry: 7 - Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: pelletCountTotal + Data: intermission2Pole - Name: k__BackingField - Entry: 9 - Data: 52 + Entry: 7 + Data: 73|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: Marro.PacManUdon.Intermission2Pole, Assembly-CSharp + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 52 - - 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 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: pelletCountRemaining - - Name: $v - Entry: 7 - Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: pelletCountRemaining - - Name: k__BackingField - Entry: 9 - Data: 52 - - Name: k__BackingField - Entry: 9 - Data: 52 + Data: 10 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1216,25 +1180,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: attractScreenElements + Data: mazeSpriteAnimator - Name: $v Entry: 7 Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: attractScreenElements + Data: mazeSpriteAnimator - Name: k__BackingField - Entry: 7 - Data: 76|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.GameObject[], UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 44 - Name: k__BackingField Entry: 9 - Data: 76 + Data: 44 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1249,7 +1207,205 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: pelletCountTotal + - Name: $v + Entry: 7 + Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: pelletCountTotal + - Name: k__BackingField + Entry: 9 + Data: 55 + - Name: k__BackingField + Entry: 9 + Data: 55 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: pelletCountRemaining + - Name: $v + Entry: 7 + Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: pelletCountRemaining + - Name: k__BackingField + Entry: 9 + Data: 55 + - Name: k__BackingField + Entry: 9 + Data: 55 + - 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: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: attractScreenElements + - Name: $v + Entry: 7 + Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: attractScreenElements + - Name: k__BackingField + Entry: 7 + Data: 82|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.GameObject[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 82 + - 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: 83|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: intermissionScreenElements + - Name: $v + Entry: 7 + Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: intermissionScreenElements + - Name: k__BackingField + Entry: 9 + Data: 82 + - Name: k__BackingField + Entry: 9 + Data: 82 + - 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: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1273,13 +1429,13 @@ MonoBehaviour: Data: gameState - Name: $v Entry: 7 - Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: gameState - Name: k__BackingField Entry: 7 - Data: 79|System.RuntimeType, mscorlib + Data: 87|System.RuntimeType, mscorlib - Name: Entry: 1 Data: Marro.PacManUdon.PacManGameState, Assembly-CSharp @@ -1288,127 +1444,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 52 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 81|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 82|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: score - - Name: $v - Entry: 7 - Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: score - - Name: k__BackingField - Entry: 9 - Data: 52 - - Name: k__BackingField - Entry: 9 - Data: 52 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 85|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 86|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: level - - Name: $v - Entry: 7 - Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: level - - Name: k__BackingField - Entry: 9 - Data: 52 - - Name: k__BackingField - Entry: 9 - Data: 52 + Data: 55 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1456,19 +1492,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: highScore + Data: score - Name: $v Entry: 7 Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: highScore + Data: score - Name: k__BackingField Entry: 9 - Data: 52 + Data: 55 - Name: k__BackingField Entry: 9 - Data: 52 + Data: 55 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1516,19 +1552,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: extraLives + Data: level - Name: $v Entry: 7 Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: extraLives + Data: level - Name: k__BackingField Entry: 9 - Data: 52 + Data: 55 - Name: k__BackingField Entry: 9 - Data: 52 + Data: 55 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1576,31 +1612,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: currentlyInTimeSequence + Data: highScore - Name: $v Entry: 7 Data: 99|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: currentlyInTimeSequence + Data: highScore - Name: k__BackingField - Entry: 7 - Data: 100|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Boolean, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 55 - Name: k__BackingField Entry: 9 - Data: 100 + Data: 55 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 6 - Data: + Entry: 3 + Data: 1 - Name: Entry: 8 Data: @@ -1609,11 +1639,23 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 101|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 100|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 2 + - Name: + Entry: 7 + Data: 101|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 102|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -1631,31 +1673,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: currentTimeSequence + Data: extraLives - Name: $v Entry: 7 - Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 103|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: currentTimeSequence + Data: extraLives - Name: k__BackingField - Entry: 7 - Data: 103|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: Marro.PacManUdon.PacManTimeSequence, Assembly-CSharp - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 55 - Name: k__BackingField Entry: 9 - Data: 52 + Data: 55 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 6 - Data: + Entry: 3 + Data: 1 - Name: Entry: 8 Data: @@ -1668,7 +1704,19 @@ MonoBehaviour: mscorlib - Name: Entry: 12 - Data: 0 + Data: 2 + - Name: + Entry: 7 + Data: 105|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 106|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -1686,68 +1734,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: hasTimeSequenceQueued - - Name: $v - Entry: 7 - Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: hasTimeSequenceQueued - - Name: k__BackingField - Entry: 9 - Data: 100 - - Name: k__BackingField - Entry: 9 - Data: 100 - - 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: 106|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: timeSequenceQueue + Data: currentlyInTimeSequence - Name: $v Entry: 7 Data: 107|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: timeSequenceQueue + Data: currentlyInTimeSequence - Name: k__BackingField Entry: 7 Data: 108|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDK3.Data.DataList, VRCSDK3 + Data: System.Boolean, mscorlib - Name: Entry: 8 Data: @@ -1790,16 +1789,175 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: timeSequenceSecondsPassed + Data: currentTimeSequence - Name: $v Entry: 7 Data: 110|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: timeSequenceSecondsPassed + Data: currentTimeSequence - Name: k__BackingField Entry: 7 Data: 111|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: Marro.PacManUdon.PacManTimeSequence, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 55 + - 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: 112|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: hasTimeSequenceQueued + - Name: $v + Entry: 7 + Data: 113|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: hasTimeSequenceQueued + - Name: k__BackingField + Entry: 9 + Data: 108 + - Name: k__BackingField + Entry: 9 + Data: 108 + - 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: 114|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: timeSequenceQueue + - Name: $v + Entry: 7 + Data: 115|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: timeSequenceQueue + - Name: k__BackingField + Entry: 7 + Data: 116|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDK3.Data.DataList, VRCSDK3 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 116 + - 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: 117|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: timeSequenceSecondsPassed + - Name: $v + Entry: 7 + Data: 118|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: timeSequenceSecondsPassed + - Name: k__BackingField + Entry: 7 + Data: 119|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Single, mscorlib @@ -1808,7 +1966,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 111 + Data: 119 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1823,14 +1981,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 112|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 120|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 113|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 121|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1854,16 +2012,16 @@ MonoBehaviour: Data: timeSequenceProgress - Name: $v Entry: 7 - Data: 114|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 122|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: timeSequenceProgress - Name: k__BackingField Entry: 9 - Data: 52 + Data: 55 - Name: k__BackingField Entry: 9 - Data: 52 + Data: 55 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1878,7 +2036,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 115|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 123|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -1903,13 +2061,13 @@ MonoBehaviour: Data: timeSequenceKeyframeTimes - Name: $v Entry: 7 - Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 124|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: timeSequenceKeyframeTimes - Name: k__BackingField Entry: 7 - Data: 117|System.RuntimeType, mscorlib + Data: 125|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Single[], mscorlib @@ -1918,7 +2076,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 117 + Data: 125 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1933,7 +2091,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 118|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 126|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 1f0b0ca..a0a27b0 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -38,6 +38,7 @@ namespace Marro.PacManUdon private Maze maze; private VRCObjectPool pelletPool; + private Intermission2Pole intermission2Pole; private Animator mazeSpriteAnimator; private int pelletCountTotal; @@ -53,10 +54,6 @@ namespace Marro.PacManUdon public void Start() { - 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++) { @@ -69,6 +66,11 @@ namespace Marro.PacManUdon intermissionScreenElements[i] = intermissionScreen.transform.GetChild(i).gameObject; } + maze = mazes[0]; + pelletPool = maze.pelletContainer.GetComponent(); + mazeSpriteAnimator = maze.mazeSprite.GetComponent(); + intermission2Pole = intermissionScreenElements[4].GetComponent(); + ghostManager.Initialize(maze.ghostTargets, pacMan, this); pacMan.Initialize(playerInput, pelletPool, this); bonusFruit.Initialize(); @@ -76,6 +78,9 @@ namespace Marro.PacManUdon statusDisplay.Initialize(); playerInput.Initialize(this); soundManager.Initialize(); + intermission2Pole.Initialize(this, ghostManager.Ghosts[0]); + + HideEverything(); SetScore(0); SetHighScore(0); @@ -258,6 +263,11 @@ namespace Marro.PacManUdon soundManager.SetGhostRetreat(false); } + public void Intermission2PoleUpdate() + { + TimeSequenceSkipToNextStep(); + } + void BoardClearAnimation() { ghostManager.gameObject.SetActive(false); @@ -273,6 +283,7 @@ namespace Marro.PacManUdon SetGhostsActive(false); SetPacManActive(false); SetPressStartButtonScreenVisible(false); + SetIntermissionScreenVisible(false); statusDisplay.SetGameOverTextVisible(false); statusDisplay.SetExtraLivesDisplayVisible(false); statusDisplay.SetLevelDisplayVisible(false); @@ -311,6 +322,11 @@ namespace Marro.PacManUdon pressStartButtonScreen.SetActive(visible); } + void SetIntermissionScreenVisible(bool visible) + { + intermissionScreen.SetActive(visible); + } + void SetGameState(PacManGameState newGameState) { // Debug.Log($"{gameObject} State transitioning from {gameState} to {newGameState}"); @@ -622,6 +638,9 @@ namespace Marro.PacManUdon case PacManTimeSequence.Intermission1: TimeSequenceStepIntermission1(sequenceProgress); break; + case PacManTimeSequence.Intermission2: + TimeSequenceStepIntermission2(sequenceProgress); + break; } } @@ -657,6 +676,8 @@ namespace Marro.PacManUdon return DeltaToAbsolute(new float[] { 0, 1.95f }); case PacManTimeSequence.Intermission1: return DeltaToAbsolute(new float[] { 0, 0.316f, 4.26f, 2.15f, 4.03f }); + case PacManTimeSequence.Intermission2: + return DeltaToAbsolute(new float[] { 0, 0.25f, 0.083f, 0.3f, 1.43f, 2.5f, 1.816f, 1.25f, 0.017f, 1f, 1.966f, 0.033f }); } } diff --git a/Assets/Scripts/Ghost.asset b/Assets/Scripts/Ghost.asset index cc88d1b..27a1d7b 100644 --- a/Assets/Scripts/Ghost.asset +++ b/Assets/Scripts/Ghost.asset @@ -43,7 +43,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 37 + Data: 38 - Name: Entry: 7 Data: @@ -1057,13 +1057,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: followingPredefinedPath + Data: specialLook - Name: $v Entry: 7 Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: followingPredefinedPath + Data: specialLook - Name: k__BackingField Entry: 9 Data: 48 @@ -1105,25 +1105,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: predefinedPath + Data: followingPredefinedPath - Name: $v Entry: 7 Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: predefinedPath + Data: followingPredefinedPath - Name: k__BackingField - Entry: 7 - Data: 59|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Vector2[], UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 48 - Name: k__BackingField Entry: 9 - Data: 59 + Data: 48 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1138,7 +1132,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 60|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1159,19 +1153,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: predefinedPathIndex + Data: predefinedPath - Name: $v Entry: 7 - Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: predefinedPathIndex + Data: predefinedPath - Name: k__BackingField - Entry: 9 - Data: 4 + Entry: 7 + Data: 61|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Vector2[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 4 + Data: 61 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1207,13 +1207,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: rngState + Data: predefinedPathIndex - Name: $v Entry: 7 Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: rngState + Data: predefinedPathIndex - Name: k__BackingField Entry: 9 Data: 4 @@ -1224,8 +1224,8 @@ MonoBehaviour: Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: @@ -1235,12 +1235,60 @@ MonoBehaviour: - Name: _fieldAttributes Entry: 7 Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: rngState + - Name: $v + Entry: 7 + Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: rngState + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 65|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 67|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1264,7 +1312,7 @@ MonoBehaviour: Data: syncedPosition - Name: $v Entry: 7 - Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: syncedPosition @@ -1288,13 +1336,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 68|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 70|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1318,13 +1366,13 @@ MonoBehaviour: Data: speed - Name: $v Entry: 7 - Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: speed - Name: k__BackingField Entry: 7 - Data: 70|System.RuntimeType, mscorlib + Data: 72|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Single, mscorlib @@ -1333,7 +1381,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 70 + Data: 72 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1348,13 +1396,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 72|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 74|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1378,7 +1426,7 @@ MonoBehaviour: Data: direction - Name: $v Entry: 7 - Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: direction @@ -1402,13 +1450,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 75|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 77|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1432,7 +1480,7 @@ MonoBehaviour: Data: target - Name: $v Entry: 7 - Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: target @@ -1456,13 +1504,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 78|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 80|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1486,7 +1534,7 @@ MonoBehaviour: Data: offGrid - Name: $v Entry: 7 - Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: offGrid @@ -1510,13 +1558,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 81|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 83|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1540,7 +1588,7 @@ MonoBehaviour: Data: inTunnel - Name: $v Entry: 7 - Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: inTunnel @@ -1564,13 +1612,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 84|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 86|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1594,13 +1642,13 @@ MonoBehaviour: Data: ghostState - Name: $v Entry: 7 - Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: ghostState - Name: k__BackingField Entry: 7 - Data: 86|System.RuntimeType, mscorlib + Data: 88|System.RuntimeType, mscorlib - Name: Entry: 1 Data: Marro.PacManUdon.PacManGhostState, Assembly-CSharp @@ -1624,13 +1672,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 88|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 90|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1654,7 +1702,7 @@ MonoBehaviour: Data: isScared - Name: $v Entry: 7 - Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: isScared @@ -1678,13 +1726,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 90|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 92|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 91|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 93|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1708,7 +1756,7 @@ MonoBehaviour: Data: scattering - Name: $v Entry: 7 - Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: scattering @@ -1732,13 +1780,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 95|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 94|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 96|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1762,13 +1810,13 @@ MonoBehaviour: Data: frozenState - Name: $v Entry: 7 - Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 97|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: frozenState - Name: k__BackingField Entry: 7 - Data: 96|System.RuntimeType, mscorlib + Data: 98|System.RuntimeType, mscorlib - Name: Entry: 1 Data: Marro.PacManUdon.PacManGhostFrozenState, Assembly-CSharp @@ -1792,13 +1840,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 98|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 100|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1822,7 +1870,7 @@ MonoBehaviour: Data: hideUntilUnfrozen - Name: $v Entry: 7 - Data: 99|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 101|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: hideUntilUnfrozen @@ -1846,14 +1894,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 100|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 102|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 101|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 103|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1877,7 +1925,7 @@ MonoBehaviour: Data: housePelletCounter - Name: $v Entry: 7 - Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 104|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: housePelletCounter @@ -1901,14 +1949,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 103|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 105|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 104|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 106|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1932,7 +1980,7 @@ MonoBehaviour: Data: housePelletCounterActive - Name: $v Entry: 7 - Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 107|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: housePelletCounterActive @@ -1956,14 +2004,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 106|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 108|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 107|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 109|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1987,7 +2035,7 @@ MonoBehaviour: Data: turnAroundSoon - Name: $v Entry: 7 - Data: 108|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 110|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: turnAroundSoon @@ -2011,14 +2059,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 109|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 111|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 110|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 112|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: diff --git a/Assets/Scripts/Ghost.cs b/Assets/Scripts/Ghost.cs index f302a00..62521a6 100644 --- a/Assets/Scripts/Ghost.cs +++ b/Assets/Scripts/Ghost.cs @@ -18,7 +18,8 @@ namespace Marro.PacManUdon Blinky, Pinky, Inky, - Clyde + Clyde, + Special, } public enum PacManGhostState @@ -65,6 +66,7 @@ namespace Marro.PacManUdon private int housePelletCounterLimit; private bool faceInStartingDirectionUntilUnfrozen; + private bool specialLook; private bool followingPredefinedPath; private Vector2[] predefinedPath; @@ -137,7 +139,7 @@ namespace Marro.PacManUdon kinematic = false; followingPredefinedPath = false; turnAroundSoon = false; - // scattering = true; + specialLook = false; rngState = 1; UpdateSpeed(); @@ -145,7 +147,7 @@ namespace Marro.PacManUdon faceInStartingDirectionUntilUnfrozen = true; UpdateAnimator(); RequestSerialization(); - // animator.Play(0, -1, 0); + // Debug.Log($"{gameObject} reset with state: {state}, target: {target}, offGrid: {offGrid}"); } @@ -482,7 +484,11 @@ namespace Marro.PacManUdon return; // Debug.Log($"{gameObject} UpdateAnimator with state: {ghostState}, isScared: {isScared}, direction: {direction}"); - if (isScared) + if (specialLook) + { + animator.SetFloat("GhostType", GhostTypeToAnimationValue(PacManGhostType.Special)); + } + else if (isScared) { float currentGhostType = animator.GetFloat("GhostType"); if (currentGhostType > 0.5f && currentGhostType < 2.5f) @@ -519,7 +525,7 @@ namespace Marro.PacManUdon animator.SetFloat("DirX", 0); animator.SetFloat("DirY", -1); } - else if (!direction.Equals(Vector2.zero)) + else if (specialLook || !direction.Equals(Vector2.zero)) { animator.SetFloat("DirX", direction.x); animator.SetFloat("DirY", direction.y); @@ -531,6 +537,8 @@ namespace Marro.PacManUdon switch (ghostType) { default: + Debug.LogError("Invalid ghost animation value!"); + return 0; case PacManGhostType.Caught: return 0; case PacManGhostType.Scared: @@ -545,6 +553,8 @@ namespace Marro.PacManUdon return 5; case PacManGhostType.Clyde: return 6; + case PacManGhostType.Special: + return 7; } } @@ -754,12 +764,18 @@ namespace Marro.PacManUdon predefinedPathIndex = 0; } - void SetInTunnel(bool inTunnel) + public void SetInTunnel(bool inTunnel) { this.inTunnel = inTunnel; UpdateSpeed(); } + public void SetSpecialLook(bool enabled) + { + specialLook = enabled; + UpdateAnimator(); + } + void SetVisibility(bool visible) { renderer.enabled = visible; @@ -794,6 +810,12 @@ namespace Marro.PacManUdon RequestSerialization(); } + public void SetSpeed(float speed) + { + this.speed = speed; + UpdateAnimator(); + } + public override void OnPreSerialization() { syncedPosition = GetPosition(); diff --git a/Assets/Scripts/GhostManager.cs b/Assets/Scripts/GhostManager.cs index 9fefc51..536b697 100644 --- a/Assets/Scripts/GhostManager.cs +++ b/Assets/Scripts/GhostManager.cs @@ -143,7 +143,6 @@ void UpdatePowerPellet() { - powerPelletCountdown -= Time.deltaTime; if (powerPelletCountdown <= 0) { diff --git a/Assets/Scripts/Intermission2Pole.asset b/Assets/Scripts/Intermission2Pole.asset new file mode 100644 index 0000000..4cc2f8d --- /dev/null +++ b/Assets/Scripts/Intermission2Pole.asset @@ -0,0 +1,280 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: Intermission2Pole + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: 33352f027da089a48a08445f114d9370, type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: 5561162f0532eab4ea6c388cb2d33504, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 0 + hasInteractEvent: 0 + scriptID: 288864006765975011 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 4 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _animator + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _animator + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Animator, UnityEngine.AnimationModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 3 + - 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: 4|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: _gameManager + - Name: $v + Entry: 7 + Data: 5|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _gameManager + - Name: k__BackingField + Entry: 7 + Data: 6|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: Marro.PacManUdon.GameManager, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 7|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.Udon.UdonBehaviour, VRC.Udon + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 8|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: _ghost + - Name: $v + Entry: 7 + Data: 9|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ghost + - Name: k__BackingField + Entry: 7 + Data: 10|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: Marro.PacManUdon.Ghost, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 7 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 11|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: _lastUpdate + - Name: $v + Entry: 7 + Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _lastUpdate + - Name: k__BackingField + Entry: 7 + Data: 13|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: Marro.PacManUdon.PoleStrechLevels, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 14|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 15|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: + - Name: + Entry: 8 + Data: diff --git a/Assets/Scripts/Intermission2Pole.asset.meta b/Assets/Scripts/Intermission2Pole.asset.meta new file mode 100644 index 0000000..99dc5d4 --- /dev/null +++ b/Assets/Scripts/Intermission2Pole.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 69101ecb2e061304d8eab6d8ab57a356 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Intermission2Pole.cs b/Assets/Scripts/Intermission2Pole.cs new file mode 100644 index 0000000..630baf3 --- /dev/null +++ b/Assets/Scripts/Intermission2Pole.cs @@ -0,0 +1,140 @@ +using UdonSharp; +using UnityEngine; +using VRC.SDKBase; +using VRC.Udon; + +namespace Marro.PacManUdon +{ + public enum PoleStrechLevels + { + None = 0, + Strech1 = 1, + Strech2 = 2, + Strech3 = 3, + Separated = 4, + } + + [RequireComponent(typeof(Animator))] + public class Intermission2Pole : UdonSharpBehaviour + { + Animator _animator; + + GameManager _gameManager; + Ghost _ghost; + + PoleStrechLevels _lastUpdate; + + const float Strech1Distance = 0f; + const float Strech2Distance = 0.250f; + const float Strech3Distance = 0.625f; + const float SeparatedDistance = 1f; + + public void Initialize(GameManager gameManager, Ghost ghost) + { + _ghost = ghost; + _gameManager = gameManager; + _animator = GetComponent(); + Reset(); + } + + public void Reset() + { + _lastUpdate = PoleStrechLevels.None; + SetStrechLevel(PoleStrechLevels.None); + } + + public void FixedUpdate() + { + if (!_ghost.gameObject.activeInHierarchy) + { + return; + } + + var ghostDistance = -(_ghost.GetPosition().x - GetPosition().x); + // Debug.Log(ghostDistance); + + if (ghostDistance < 0) + { + return; + } + + var level = PoleStrechLevels.None; + + if (ghostDistance >= SeparatedDistance) + { + level = PoleStrechLevels.Separated; + } + else if (ghostDistance >= Strech3Distance) + { + level = PoleStrechLevels.Strech3; + } + else if (ghostDistance >= Strech2Distance) + { + level = PoleStrechLevels.Strech2; + } + else if (ghostDistance >= Strech1Distance) + { + level = PoleStrechLevels.Strech1; + } + + ProcessDistanceUpdate(level); + } + + private void ProcessDistanceUpdate(PoleStrechLevels level) + { + if ((int)_lastUpdate >= (int)level) + { + return; + } + + _lastUpdate = level; + + if (level != PoleStrechLevels.Separated) // This one is done later via the timed procedure + { + SetStrechLevel(level); + } + else + { + // Align ghost nicely with pole :) + _ghost.SetPosition(new Vector2(GetPosition().x - SeparatedDistance, _ghost.GetPosition().y)); + } + + if (level == PoleStrechLevels.Strech1 || level == PoleStrechLevels.Separated) // Step forward timed procedure + { + Debug.Log($"Intermission2Pole Intermission2PoleUpdate"); + _gameManager.Intermission2PoleUpdate(); + } + } + + public void SetStrechLevel(PoleStrechLevels level) + { + Debug.Log($"Intermission2Pole SetStrechLevel {level}"); + _animator.SetFloat("Strech", GetAnimatorValueForStrechLevel(level)); + } + + private float GetAnimatorValueForStrechLevel(PoleStrechLevels level) + { + switch (level) + { + case PoleStrechLevels.None: + return 0f; + case PoleStrechLevels.Strech1: + return 1f; + case PoleStrechLevels.Strech2: + return 2f; + case PoleStrechLevels.Strech3: + return 3f; + case PoleStrechLevels.Separated: + return 4f; + default: + Debug.LogError("Invalid pole strech level!"); + return 0f; + } + } + + public Vector2 GetPosition() + { + return (Vector2)transform.localPosition; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Sequences/WaitForTimeout copy 2.cs.meta b/Assets/Scripts/Intermission2Pole.cs.meta similarity index 83% rename from Assets/Scripts/Sequences/WaitForTimeout copy 2.cs.meta rename to Assets/Scripts/Intermission2Pole.cs.meta index fa90da8..8b46771 100644 --- a/Assets/Scripts/Sequences/WaitForTimeout copy 2.cs.meta +++ b/Assets/Scripts/Intermission2Pole.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 07078a284b77f1345b55f46089841280 +guid: 5561162f0532eab4ea6c388cb2d33504 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Sequences/Intermission1.cs b/Assets/Scripts/Sequences/Intermission1.cs index 1a20d03..b01fcd3 100644 --- a/Assets/Scripts/Sequences/Intermission1.cs +++ b/Assets/Scripts/Sequences/Intermission1.cs @@ -16,9 +16,10 @@ namespace Marro.PacManUdon statusDisplay.SetLevelDisplayVisible(true); break; case 1: - // Start animation, blinky chasing pacman + // Start animation, pacman running and blinky prepared to chase soundManager.SuppressSound(false); soundManager.StartIntermissionSound(); + pacMan.Reset(); pacMan.SetLevel(4); pacMan.SetPowerPellet(false); // Update speed @@ -35,10 +36,14 @@ namespace Marro.PacManUdon blinky.SetPosition(intermissionScreenElements[1].transform.localPosition); blinky.SetDirection(Vector2.left); blinky.SetState(PacManGhostState.Normal); - blinky.SetActive(true); + SetFrozen(false); break; case 2: + // Start blinky chasing + blinky.SetActive(true); + break; + case 3: // Reached end, make ghost scared and turn around blinky.BecomeScared(); blinky.SetPosition(intermissionScreenElements[3].transform.localPosition); @@ -47,12 +52,12 @@ namespace Marro.PacManUdon pacMan.SetPowerPellet(true); break; - case 3: + case 4: // Pacman starts changing ghosts pacMan.SetDirection(Vector2.right); pacMan.BecomeBig(); break; - case 4: + case 5: // End cutscene soundManager.StopAllSound(); SetFrozen(true); diff --git a/Assets/Scripts/Sequences/Intermission2.cs b/Assets/Scripts/Sequences/Intermission2.cs new file mode 100644 index 0000000..a565105 --- /dev/null +++ b/Assets/Scripts/Sequences/Intermission2.cs @@ -0,0 +1,89 @@ +using UnityEngine; + +namespace Marro.PacManUdon +{ + public partial class GameManager + { + private void TimeSequenceStepIntermission2(int sequenceProgress) + { + var blinky = ghostManager.Ghosts[0]; + + switch (sequenceProgress) + { + case 0: + // Show just level display + RestartLevel(); + statusDisplay.SetLevelDisplayVisible(true); + break; + case 1: + // Show pole + SetIntermissionScreenVisible(true); + intermission2Pole.Reset(); + break; + case 2: + // Start music + soundManager.SuppressSound(false); + soundManager.StartIntermissionSound(); + break; + case 3: + // Start animation, pacman running and blinky prepared to chase + 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); + + SetFrozen(false); + break; + case 4: + // Start blinky chasing + blinky.SetActive(true); + break; + case 5: + // Blinky catches on pole + blinky.SetSpeed(1.25f); + break; + case 6: + // Blinky cover about to tear + blinky.SetFrozen(true); + break; + case 7: + // Blinky cover tears + intermission2Pole.SetStrechLevel(PoleStrechLevels.Separated); + break; + case 8: + // Blinky sprite updates with broken cover + blinky.SetSpecialLook(true); + blinky.SetDirection(Vector2.up); + blinky.SetPosition(blinky.GetPosition() + new Vector2(-0.250f, 0f)); + break; + case 9: + // Blinky looks at broken cover + blinky.SetDirection(Vector2.down); + break; + case 10: + // Cutscene starts to unload + blinky.SetDirection(Vector2.zero); + break; + case 11: + // End cutscene + SetIntermissionScreenVisible(false); + soundManager.StopAllSound(); + SetFrozen(true); + StartTimeSequence(PacManTimeSequence.StartNewLevel); + break; + } + } + } +} diff --git a/Assets/Scripts/Sequences/Intermission2.cs.meta b/Assets/Scripts/Sequences/Intermission2.cs.meta new file mode 100644 index 0000000..ddf5128 --- /dev/null +++ b/Assets/Scripts/Sequences/Intermission2.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 902323f14d974674c82c40bb2061609b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Sequences/WaitForTimeout copy 2.cs b/Assets/Scripts/Sequences/WaitForTimeout copy 2.cs deleted file mode 100644 index 4734fce..0000000 --- a/Assets/Scripts/Sequences/WaitForTimeout copy 2.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Marro.PacManUdon -{ - public partial class GameManager - { - - } -} diff --git a/Assets/Sprites/spritesheet.png b/Assets/Sprites/spritesheet.png index 16f56f7..85b15b5 100644 Binary files a/Assets/Sprites/spritesheet.png and b/Assets/Sprites/spritesheet.png differ diff --git a/Assets/Sprites/spritesheet.png.meta b/Assets/Sprites/spritesheet.png.meta index 5011a98..088c1eb 100644 --- a/Assets/Sprites/spritesheet.png.meta +++ b/Assets/Sprites/spritesheet.png.meta @@ -2268,7 +2268,7 @@ TextureImporter: width: 24 height: 8 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -2280,6 +2280,27 @@ TextureImporter: indices: edges: [] weights: [] + - serializedVersion: 2 + name: spritesheet_5 + rect: + serializedVersion: 2 + x: 192 + y: 128 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e3bd0e1b9d7f32149a3d79585ccb2ccb + internalID: 1819377783 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] diff --git a/Assets/Sprites/spritesheet.xcf b/Assets/Sprites/spritesheet.xcf index 9139801..63e2fce 100644 Binary files a/Assets/Sprites/spritesheet.xcf and b/Assets/Sprites/spritesheet.xcf differ