From a0c1070b93d777daab6a394df38d7d65c2595820 Mon Sep 17 00:00:00 2001 From: Jenny Crowe Date: Wed, 9 Feb 2022 00:08:22 -0700 Subject: [PATCH] Tweezers: Added clamp effect to tweezer pluck animation --- Assets/Resources/Games/rhythmTweezers.prefab | 88 ++++++++++++++++++- .../Animations/Tweezers_Pluck.anim | 63 +++++++++++++ 2 files changed, 149 insertions(+), 2 deletions(-) diff --git a/Assets/Resources/Games/rhythmTweezers.prefab b/Assets/Resources/Games/rhythmTweezers.prefab index 0d21825d..670c1d55 100644 --- a/Assets/Resources/Games/rhythmTweezers.prefab +++ b/Assets/Resources/Games/rhythmTweezers.prefab @@ -195,6 +195,88 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &3082739543595333088 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4348353426286950626} + - component: {fileID: 8734625411924137723} + m_Layer: 0 + m_Name: Clamp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &4348353426286950626 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3082739543595333088} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: -5.6, z: 0} + m_LocalScale: {x: 3.9, y: 3.9, z: 1} + m_Children: [] + m_Father: {fileID: 3942464277001988917} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8734625411924137723 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3082739543595333088} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 3 + m_Sprite: {fileID: 7399396556213270179, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.92, y: 1.24} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &3177931334588542204 GameObject: m_ObjectHideFlags: 0 @@ -335,6 +417,7 @@ Transform: m_Children: - {fileID: 2763505388420312793} - {fileID: 3093870637168933024} + - {fileID: 4348353426286950626} m_Father: {fileID: 5813499711186931250} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -60} @@ -440,7 +523,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 2 + m_SortingOrder: 3 m_Sprite: {fileID: 949200655566714557, guid: 8b24cfccb5b27054bbfccc7d7a912b73, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -907,6 +990,7 @@ MonoBehaviour: EligibleHits: [] firstEnable: 0 Vegetable: {fileID: 3177931334588542204} + VegetableAnimator: {fileID: 0} Tweezers: {fileID: 3391455012319192365} HairsHolder: {fileID: 2002856028339003249} tweezersBeatOffset: 2 @@ -1230,7 +1314,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 100 - m_Sprite: {fileID: 21300000, guid: 2723b94c2b1ab8e44898a44a546f7ceb, type: 3} + m_Sprite: {fileID: 21300000, guid: e465c09ac032ad14ba3010212810392c, type: 3} m_Color: {r: 0, g: 0.58743, b: 1, a: 0.36078432} m_FlipX: 0 m_FlipY: 0 diff --git a/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Tweezers_Pluck.anim b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Tweezers_Pluck.anim index a498d4e7..b4f85b29 100644 --- a/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Tweezers_Pluck.anim +++ b/Assets/Resources/Sprites/Games/RhythmTweezers/Animations/Tweezers_Pluck.anim @@ -86,6 +86,34 @@ AnimationClip: path: Zoom classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.05 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Clamp + classID: 1 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -117,6 +145,13 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 1640126718 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 183621861 attribute: 0 @@ -324,6 +359,34 @@ AnimationClip: path: Zoom classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.05 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Clamp + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0