From 06e4db40ec14a07d22dd54db891695aed8c60134 Mon Sep 17 00:00:00 2001 From: saladplainzone <31338325+saladplainzone@users.noreply.github.com> Date: Sun, 26 Feb 2023 19:05:33 -0800 Subject: [PATCH] Sneaky Spirits Visual Fixes (#318) * Sneaky Spirits - Fix Easing gost go woosh * Sneaky Spirits - Tree Tweaks Stops during slowdown now and realigned second animation frame --- Assets/Resources/Games/sneakySpirits.prefab | 109 +++++++++++- .../Games/SneakySpirits/Animations/Move.anim | 78 +++++++-- .../SneakySpirits/Animations/MoveDown.anim | 118 +++++++++++-- .../Animations/Tree Stationary.controller | 72 ++++++++ .../Tree Stationary.controller.meta | 8 + .../Games/SneakySpirits/Animations/Tree.anim | 164 +++++++++++++++++- .../SneakySpirits/Animations/TreeSlow.anim | 68 ++++++++ .../Animations/TreeSlow.anim.meta | 8 + .../Games/SneakySpirits/SneakySpirits.cs | 6 + .../Games/SneakySpirits/SneakySpiritsGhost.cs | 2 +- 10 files changed, 598 insertions(+), 35 deletions(-) create mode 100644 Assets/Resources/Sprites/Games/SneakySpirits/Animations/Tree Stationary.controller create mode 100644 Assets/Resources/Sprites/Games/SneakySpirits/Animations/Tree Stationary.controller.meta create mode 100644 Assets/Resources/Sprites/Games/SneakySpirits/Animations/TreeSlow.anim create mode 100644 Assets/Resources/Sprites/Games/SneakySpirits/Animations/TreeSlow.anim.meta diff --git a/Assets/Resources/Games/sneakySpirits.prefab b/Assets/Resources/Games/sneakySpirits.prefab index 9644b9c9..85dd03d4 100644 --- a/Assets/Resources/Games/sneakySpirits.prefab +++ b/Assets/Resources/Games/sneakySpirits.prefab @@ -540,6 +540,108 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1797221870344534972 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7299739838847650180} + - component: {fileID: 4555321251154060235} + - component: {fileID: 9097994185587061652} + m_Layer: 0 + m_Name: Tree Stationary + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &7299739838847650180 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1797221870344534972} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2.507, y: 0.008, z: 0} + m_LocalScale: {x: 1.0726686, y: 1.073848, z: 0.8787301} + m_Children: [] + m_Father: {fileID: 4558759897136001682} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4555321251154060235 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1797221870344534972} + 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: 2 + m_Sprite: {fileID: -497912792735699408, guid: ca4775e289092c04791daaf42e19cacb, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.27, y: 1.43} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &9097994185587061652 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1797221870344534972} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b2ddd3720e2d4b24689d3a5da96f4c17, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &1968233374726614765 GameObject: m_ObjectHideFlags: 0 @@ -11092,7 +11194,7 @@ Transform: m_LocalScale: {x: 21.347832, y: 22.163277, z: 7.4091277} m_Children: [] m_Father: {fileID: 4558759897136001682} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &6369357212135186976 SpriteRenderer: @@ -16850,6 +16952,7 @@ Transform: - {fileID: 3622164540072062771} - {fileID: 2406286284811947565} - {fileID: 5146816075258604540} + - {fileID: 7299739838847650180} - {fileID: 5263040342208347829} m_Father: {fileID: 6485095134079790937} m_RootOrder: 0 @@ -16977,6 +17080,8 @@ MonoBehaviour: - {fileID: 9019885175047260189} normalRain: {fileID: 2010818742874192372} slowRain: {fileID: 7630866677535136957} + normalTree: {fileID: 8894877081344012036} + slowTree: {fileID: 1797221870344534972} --- !u!1 &7556994794361785014 GameObject: m_ObjectHideFlags: 0 @@ -22429,7 +22534,7 @@ GameObject: - component: {fileID: 7971237727563639138} - component: {fileID: 1480726122682328834} m_Layer: 0 - m_Name: Tree_1 + m_Name: Tree m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Resources/Sprites/Games/SneakySpirits/Animations/Move.anim b/Assets/Resources/Sprites/Games/SneakySpirits/Animations/Move.anim index 05929b07..83193559 100644 --- a/Assets/Resources/Sprites/Games/SneakySpirits/Animations/Move.anim +++ b/Assets/Resources/Sprites/Games/SneakySpirits/Animations/Move.anim @@ -21,17 +21,44 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 66.42622, z: 0} + outSlope: {x: 0, y: 66.42622, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.5015167, z: 0.33333334} + - serializedVersion: 3 + time: 0.033333335 + value: {x: 0, y: 0.80982614, z: 0} + inSlope: {x: 0, y: 11.050255, z: 0} + outSlope: {x: 0, y: 11.050255, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.25266224, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.19571394, z: 0.33333334} + - serializedVersion: 3 + time: 0.083333336 + value: {x: 0, y: 1.1290812, z: 0} + inSlope: {x: 0, y: 11.090193, z: 0} + outSlope: {x: 0, y: 11.090193, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.510438, z: 0.33333334} + - serializedVersion: 3 + time: 0.13333334 + value: {x: 0, y: 1.3479997, z: 0} + inSlope: {x: 0, y: 12.1912985, z: 0} + outSlope: {x: 0, y: 12.1912985, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.5685828, z: 0.33333334} - serializedVersion: 3 time: 0.16666667 value: {x: 0, y: 1.48, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 8.965399, z: 0} + outSlope: {x: 0, y: 8.965399, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -113,18 +140,45 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: 66.42622 + outSlope: 66.42622 + tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.33333334 + outWeight: 0.5015167 + - serializedVersion: 3 + time: 0.033333335 + value: 0.80982614 + inSlope: 11.050255 + outSlope: 11.050255 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.25266224 + outWeight: 0.19571394 + - serializedVersion: 3 + time: 0.083333336 + value: 1.1290812 + inSlope: 11.090193 + outSlope: 11.090193 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.510438 + - serializedVersion: 3 + time: 0.13333334 + value: 1.3479997 + inSlope: 12.1912985 + outSlope: 12.1912985 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.5685828 - serializedVersion: 3 time: 0.16666667 value: 1.48 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: 8.965399 + outSlope: 8.965399 + tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 diff --git a/Assets/Resources/Sprites/Games/SneakySpirits/Animations/MoveDown.anim b/Assets/Resources/Sprites/Games/SneakySpirits/Animations/MoveDown.anim index 3676f7d9..acf2b441 100644 --- a/Assets/Resources/Sprites/Games/SneakySpirits/Animations/MoveDown.anim +++ b/Assets/Resources/Sprites/Games/SneakySpirits/Animations/MoveDown.anim @@ -28,13 +28,58 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.06666667 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + time: 0.016666668 + value: {x: 0, y: 1.4355109, z: 0} + inSlope: {x: 0, y: -6.7954473, z: 0} + outSlope: {x: 0, y: -6.7954473, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.6864182, z: 0.33333334} + - serializedVersion: 3 + time: 0.033333335 + value: {x: 0, y: 1.2767336, z: 0} + inSlope: {x: 0, y: -9.142371, z: 0} + outSlope: {x: 0, y: -9.142371, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.78418094, z: 0.33333334} + - serializedVersion: 3 + time: 0.05 + value: {x: 0, y: 1.0466847, z: 0} + inSlope: {x: 0, y: -13.169052, z: 0} + outSlope: {x: 0, y: -13.169052, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.62739, z: 0.33333334} + - serializedVersion: 3 + time: 0.06666667 + value: {x: 0, y: 0.72619957, z: 0} + inSlope: {x: 0, y: -20.09873, z: 0} + outSlope: {x: 0, y: -20.09873, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.566057, z: 0.33333334} + - serializedVersion: 3 + time: 0.083333336 + value: {x: 0, y: 0.37393823, z: 0} + inSlope: {x: 0, y: -26.007656, z: 0} + outSlope: {x: 0, y: -26.007656, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.07186911, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.61609095, z: 0.33333334} + - serializedVersion: 3 + time: 0.1 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: -28.083841, z: 0} + outSlope: {x: 0, y: -28.083841, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.53370833, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -55,7 +100,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.06666667 + time: 0.1 value: 0 inSlope: Infinity outSlope: Infinity @@ -98,7 +143,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.06666667 + m_StopTime: 0.1 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -127,7 +172,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.06666667 + time: 0.1 value: 0 inSlope: Infinity outSlope: Infinity @@ -155,7 +200,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 + time: 0.1 value: 0 inSlope: 0 outSlope: 0 @@ -183,13 +228,58 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + time: 0.016666668 + value: 1.4355109 + inSlope: -6.7954473 + outSlope: -6.7954473 + tangentMode: 0 weightedMode: 0 inWeight: 0.33333334 + outWeight: 0.6864182 + - serializedVersion: 3 + time: 0.033333335 + value: 1.2767336 + inSlope: -9.142371 + outSlope: -9.142371 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.78418094 + - serializedVersion: 3 + time: 0.05 + value: 1.0466847 + inSlope: -13.169052 + outSlope: -13.169052 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.62739 + - serializedVersion: 3 + time: 0.06666667 + value: 0.72619957 + inSlope: -20.09873 + outSlope: -20.09873 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.566057 + - serializedVersion: 3 + time: 0.083333336 + value: 0.37393823 + inSlope: -26.007656 + outSlope: -26.007656 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.07186911 + outWeight: 0.61609095 + - serializedVersion: 3 + time: 0.1 + value: 0 + inSlope: -28.083841 + outSlope: -28.083841 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.53370833 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 @@ -211,7 +301,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 + time: 0.1 value: 0 inSlope: 0 outSlope: 0 diff --git a/Assets/Resources/Sprites/Games/SneakySpirits/Animations/Tree Stationary.controller b/Assets/Resources/Sprites/Games/SneakySpirits/Animations/Tree Stationary.controller new file mode 100644 index 00000000..da294473 --- /dev/null +++ b/Assets/Resources/Sprites/Games/SneakySpirits/Animations/Tree Stationary.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Tree Stationary + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 2331230812924960030} + 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 &2331230812924960030 +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: 7603340987291268025} + m_Position: {x: 200, y: 0, 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: 7603340987291268025} +--- !u!1102 &7603340987291268025 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: TreeSlow + 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: 7400000, guid: d4c870423b2cd8a4591597483b9ea386, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/SneakySpirits/Animations/Tree Stationary.controller.meta b/Assets/Resources/Sprites/Games/SneakySpirits/Animations/Tree Stationary.controller.meta new file mode 100644 index 00000000..4d65a357 --- /dev/null +++ b/Assets/Resources/Sprites/Games/SneakySpirits/Animations/Tree Stationary.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b2ddd3720e2d4b24689d3a5da96f4c17 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/SneakySpirits/Animations/Tree.anim b/Assets/Resources/Sprites/Games/SneakySpirits/Animations/Tree.anim index cac16232..e945b172 100644 --- a/Assets/Resources/Sprites/Games/SneakySpirits/Animations/Tree.anim +++ b/Assets/Resources/Sprites/Games/SneakySpirits/Animations/Tree.anim @@ -14,16 +14,50 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 2.507, y: 0.008, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.05 + value: {x: 2.505, y: -0.006, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.1 + value: {x: 2.507, y: 0.008, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: - curve: - time: 0 value: {fileID: -497912792735699408, guid: ca4775e289092c04791daaf42e19cacb, type: 3} - - time: 0.033333335 + - time: 0.05 value: {fileID: 1748789042723271327, guid: ca4775e289092c04791daaf42e19cacb, type: 3} - - time: 0.06666667 + - time: 0.1 value: {fileID: -497912792735699408, guid: ca4775e289092c04791daaf42e19cacb, type: 3} attribute: m_Sprite path: @@ -36,6 +70,13 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 0 attribute: 0 @@ -52,7 +93,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.083333336 + m_StopTime: 0.11666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -67,8 +108,119 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 2.507 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 2.505 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 2.507 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.008 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: -0.006 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 0.008 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 + m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Resources/Sprites/Games/SneakySpirits/Animations/TreeSlow.anim b/Assets/Resources/Sprites/Games/SneakySpirits/Animations/TreeSlow.anim new file mode 100644 index 00000000..f12b355d --- /dev/null +++ b/Assets/Resources/Sprites/Games/SneakySpirits/Animations/TreeSlow.anim @@ -0,0 +1,68 @@ +%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: TreeSlow + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -497912792735699408, guid: ca4775e289092c04791daaf42e19cacb, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + 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 + pptrCurveMapping: + - {fileID: -497912792735699408, guid: ca4775e289092c04791daaf42e19cacb, 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: 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/Resources/Sprites/Games/SneakySpirits/Animations/TreeSlow.anim.meta b/Assets/Resources/Sprites/Games/SneakySpirits/Animations/TreeSlow.anim.meta new file mode 100644 index 00000000..9154a970 --- /dev/null +++ b/Assets/Resources/Sprites/Games/SneakySpirits/Animations/TreeSlow.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d4c870423b2cd8a4591597483b9ea386 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs b/Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs index a437cfbd..1b34f92d 100644 --- a/Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs +++ b/Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs @@ -73,6 +73,8 @@ namespace HeavenStudio.Games [SerializeField] List ghostPositions = new List(); [SerializeField] GameObject normalRain; [SerializeField] GameObject slowRain; + [SerializeField] GameObject normalTree; + [SerializeField] GameObject slowTree; [Header("Variables")] private static List queuedGhosts = new List(); private bool hasArrowLoaded; @@ -307,6 +309,8 @@ namespace HeavenStudio.Games { slowRain.SetActive(true); normalRain.SetActive(false); + slowTree.SetActive(true); + normalTree.SetActive(false); Conductor.instance.SetMinigamePitch(0.25f); } @@ -319,6 +323,8 @@ namespace HeavenStudio.Games doorAnim.DoScaledAnimationAsync("DoorClose", 0.5f); slowRain.SetActive(false); normalRain.SetActive(true); + slowTree.SetActive(false); + normalTree.SetActive(true); }) }); } diff --git a/Assets/Scripts/Games/SneakySpirits/SneakySpiritsGhost.cs b/Assets/Scripts/Games/SneakySpirits/SneakySpiritsGhost.cs index c68b0c14..a4223740 100644 --- a/Assets/Scripts/Games/SneakySpirits/SneakySpiritsGhost.cs +++ b/Assets/Scripts/Games/SneakySpirits/SneakySpiritsGhost.cs @@ -20,7 +20,7 @@ namespace HeavenStudio.Games.Scripts_SneakySpirits { BeatAction.New(game.gameObject, new List() { - new BeatAction.Action(spawnBeat - 0.2f, delegate { anim.DoScaledAnimationAsync("Move", 1f); }), + new BeatAction.Action(spawnBeat + 0.001f, delegate { anim.DoScaledAnimationAsync("Move", 1f); }), new BeatAction.Action(spawnBeat + length - 0.5f, delegate { anim.DoScaledAnimationAsync("MoveDown", 1f); }), new BeatAction.Action(spawnBeat + length, delegate { Destroy(gameObject); }), });