From 5ef12a9efafcdb3253958a1b8bc4132676d2fbf3 Mon Sep 17 00:00:00 2001 From: minenice55 Date: Sat, 30 Dec 2023 19:07:38 -0500 Subject: [PATCH] monkey colour change --- Assets/Resources/Games/pajamaParty.prefab | 94 ++- .../Games/PajamaParty/Anime/BG/Bg.controller | 122 ++- .../PajamaParty/Anime/BG/CastleAppear.anim | 331 ++++++++ .../Anime/BG/CastleAppear.anim.meta | 8 + .../PajamaParty/Anime/BG/CastleNoPose.anim | 223 +++++ .../Anime/BG/CastleNoPose.anim.meta | 8 + .../Anime/Mako/MakoReadySleep01_H.anim | 784 +++++++++--------- .../PajamaParty/Anime/Mako/MakoThrough_H.anim | 90 ++ .../Games/PajamaParty/CtrPillowMonkey.cs | 34 +- .../Games/PajamaParty/CtrPillowPlayer.cs | 25 +- .../Scripts/Games/PajamaParty/PajamaParty.cs | 25 +- 11 files changed, 1318 insertions(+), 426 deletions(-) create mode 100644 Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/CastleAppear.anim create mode 100644 Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/CastleAppear.anim.meta create mode 100644 Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/CastleNoPose.anim create mode 100644 Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/CastleNoPose.anim.meta diff --git a/Assets/Resources/Games/pajamaParty.prefab b/Assets/Resources/Games/pajamaParty.prefab index a5d6aa419..f42052587 100644 --- a/Assets/Resources/Games/pajamaParty.prefab +++ b/Assets/Resources/Games/pajamaParty.prefab @@ -112,7 +112,8 @@ Transform: m_LocalPosition: {x: 0, y: 2.85, z: 0} m_LocalScale: {x: 2.25, y: 2.25, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 400267928559341365} m_Father: {fileID: 46492560261295527} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -123,7 +124,7 @@ SpriteRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 368769097014296941} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -1850,7 +1851,10 @@ MonoBehaviour: Castle: {fileID: 368769097014296941} BgAnimator: {fileID: 4303970282923767126} SpawnRoot: {fileID: 8290289124980938567} - HighCameraHeight: 9 + HighCameraHeight: 11 + monkeyNrmColour: {r: 0.9137255, g: 0.91764706, b: 0.07450981, a: 1} + monkeyHighColour: {r: 0.6666667, g: 0.9843137, b: 1, a: 1} + monkeyColMat: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} --- !u!1 &4353645626337265336 GameObject: m_ObjectHideFlags: 0 @@ -2626,6 +2630,90 @@ Transform: m_Father: {fileID: 1830610768569119064} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6382317575483491216 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 400267928559341365} + - component: {fileID: 4358525168255984144} + m_Layer: 0 + m_Name: Square + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &400267928559341365 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6382317575483491216} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -2, z: 0} + m_LocalScale: {x: 10, y: 2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1809402391655381251} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4358525168255984144 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6382317575483491216} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: -10 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0.8078432, g: 1, b: 0.5921569, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &6457555235649756579 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/Bg.controller b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/Bg.controller index dbcd7c839..2b420961f 100644 --- a/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/Bg.controller +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/Bg.controller @@ -52,6 +52,58 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-5777124616892334998 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CastleAppear + 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: bf5284b82327b0341b3eaf34a3096cda, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-4142630576024567518 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CastleHide + m_Speed: -1 + m_CycleOffset: 1 + 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: bf5284b82327b0341b3eaf34a3096cda, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-2889309577850128088 AnimatorState: serializedVersion: 6 @@ -100,6 +152,46 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: Castle + m_StateMachine: {fileID: 1188403599466832934} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &1188403599466832934 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Castle + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -4142630576024567518} + m_Position: {x: 372.22638, y: 138.17264, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5777124616892334998} + m_Position: {x: 372.22638, y: 88.17264, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8884440280193841666} + m_Position: {x: 370, y: 40, 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: 8884440280193841666} --- !u!1107 &8548079407425394027 AnimatorStateMachine: serializedVersion: 6 @@ -111,13 +203,13 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -2889309577850128088} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 290, y: 20, z: 0} - serializedVersion: 1 m_State: {fileID: -7351194649355570482} m_Position: {x: 290, y: 70, z: 0} - serializedVersion: 1 m_State: {fileID: -6994252768423587492} - m_Position: {x: 340, y: 130, z: 0} + m_Position: {x: 290, y: 120, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -128,3 +220,29 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -2889309577850128088} +--- !u!1102 &8884440280193841666 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CastleNoPose + 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: 9c701f49b4f877e40972210c2bd4b878, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/CastleAppear.anim b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/CastleAppear.anim new file mode 100644 index 000000000..db4572114 --- /dev/null +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/CastleAppear.anim @@ -0,0 +1,331 @@ +%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: CastleAppear + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: -2.25, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 5.1, 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} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 2.85, z: 0} + inSlope: {x: -0, y: 5.1, z: -0} + outSlope: {x: 0, y: 0, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: castle + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: castle + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: castle/Square + classID: 212 + script: {fileID: 0} + m_PPtrCurves: [] + 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: 1158872104 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1158872104 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 4160526403 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + 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: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 5 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: castle + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -2.25 + inSlope: 0 + outSlope: 5.1 + tangentMode: 65 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 2.85 + inSlope: 5.1 + outSlope: 0 + tangentMode: 5 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: castle + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 5 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: castle + 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 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: castle + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: castle/Square + classID: 212 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/CastleAppear.anim.meta b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/CastleAppear.anim.meta new file mode 100644 index 000000000..3ee4c0b52 --- /dev/null +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/CastleAppear.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bf5284b82327b0341b3eaf34a3096cda +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/CastleNoPose.anim b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/CastleNoPose.anim new file mode 100644 index 000000000..b6a798d7c --- /dev/null +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/CastleNoPose.anim @@ -0,0 +1,223 @@ +%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: CastleNoPose + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: -2.25, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: castle + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + 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_Enabled + path: castle + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + 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_Enabled + path: castle/Square + classID: 212 + script: {fileID: 0} + m_PPtrCurves: [] + 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: 1158872104 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 4160526403 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1158872104 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + 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: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: castle + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -2.25 + inSlope: 0 + outSlope: 5.1 + tangentMode: 65 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: castle + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: castle + 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 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: castle + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + 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_Enabled + path: castle/Square + classID: 212 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/CastleNoPose.anim.meta b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/CastleNoPose.anim.meta new file mode 100644 index 000000000..e85da0ec1 --- /dev/null +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/CastleNoPose.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9c701f49b4f877e40972210c2bd4b878 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Mako/MakoReadySleep01_H.anim b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Mako/MakoReadySleep01_H.anim index 808701842..469e794ef 100644 --- a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Mako/MakoReadySleep01_H.anim +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Mako/MakoReadySleep01_H.anim @@ -246,25 +246,16 @@ AnimationClip: time: 0 value: {x: 0.361, y: 0.2690001, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: 0, y: -1.9750016, z: 0} + outSlope: {x: 0, y: -1.1700027, 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} - serializedVersion: 3 - time: 0.06666667 - value: {x: 0.361, y: 0.13733333, z: 0} - inSlope: {x: -0, y: -1.9750016, z: -0} - outSlope: {x: 0, y: 2.4050012, 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} - - serializedVersion: 3 - time: 0.2 - value: {x: 0.361, y: 0.45800012, z: 0} - inSlope: {x: -0, y: 2.4050012, z: -0} - outSlope: {x: 0, y: 0, z: 0} + time: 0.033333335 + value: {x: 0.361, y: 0.23000002, z: 0} + inSlope: {x: -0, y: -1.1700027, z: -0} + outSlope: {x: 0, y: 1.0523082, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -272,16 +263,25 @@ AnimationClip: - serializedVersion: 3 time: 0.25 value: {x: 0.361, y: 0.45800012, z: 0} - inSlope: {x: -0, y: -0, z: -0} - outSlope: {x: 0, y: -0.36000112, z: 0} + inSlope: {x: -0, y: 1.0523082, z: -0} + outSlope: {x: 0, y: 0, 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} - serializedVersion: 3 - time: 0.41666666 + time: 0.3 + value: {x: 0.361, y: 0.45800012, z: 0} + inSlope: {x: -0, y: -0, z: -0} + outSlope: {x: 0, y: -0.30000094, 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} + - serializedVersion: 3 + time: 0.5 value: {x: 0.361, y: 0.39799994, z: 0} - inSlope: {x: -0, y: -0.36000112, z: -0} + inSlope: {x: -0, y: -0.30000094, z: -0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 @@ -314,25 +314,16 @@ AnimationClip: time: 0 value: {x: -0.361, y: 0.2690001, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: 0, y: -1.9750018, z: 0} + outSlope: {x: 0, y: -1.1700032, 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} - serializedVersion: 3 - time: 0.06666667 - value: {x: -0.361, y: 0.13733332, z: 0} - inSlope: {x: -0, y: -1.9750018, z: -0} - outSlope: {x: 0, y: 2.4050007, 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} - - serializedVersion: 3 - time: 0.2 - value: {x: -0.361, y: 0.45800006, z: 0} - inSlope: {x: -0, y: 2.4050007, z: -0} - outSlope: {x: 0, y: 0, z: 0} + time: 0.033333335 + value: {x: -0.361, y: 0.23, z: 0} + inSlope: {x: -0, y: -1.1700032, z: -0} + outSlope: {x: 0, y: 1.052308, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -340,16 +331,25 @@ AnimationClip: - serializedVersion: 3 time: 0.25 value: {x: -0.361, y: 0.45800006, z: 0} - inSlope: {x: -0, y: -0, z: -0} - outSlope: {x: 0, y: -0.36000112, z: 0} + inSlope: {x: -0, y: 1.052308, z: -0} + outSlope: {x: 0, y: 0, 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} - serializedVersion: 3 - time: 0.41666666 + time: 0.3 + value: {x: -0.361, y: 0.45800006, z: 0} + inSlope: {x: -0, y: -0, z: -0} + outSlope: {x: 0, y: -0.30000094, 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} + - serializedVersion: 3 + time: 0.5 value: {x: -0.361, y: 0.39799988, z: 0} - inSlope: {x: -0, y: -0.36000112, z: -0} + inSlope: {x: -0, y: -0.30000094, z: -0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 @@ -382,42 +382,42 @@ AnimationClip: time: 0 value: {x: 0, y: 0.6630001, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: 0, y: 1.3849996, z: 0} + outSlope: {x: 0, y: 2.7699993, 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} - serializedVersion: 3 - time: 0.06666667 + time: 0.033333335 value: {x: 0, y: 0.7553334, z: 0} - inSlope: {x: -0, y: 1.3849996, z: -0} - outSlope: {x: 0, y: 2.1525006, 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} - - serializedVersion: 3 - time: 0.2 - value: {x: 0, y: 1.0423335, z: 0} - inSlope: {x: -0, y: 2.1525006, z: -0} - outSlope: {x: 0, y: 5.7400017, z: 0} + inSlope: {x: -0, y: 2.7699993, z: -0} + outSlope: {x: 0, y: 1.3246156, 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} - serializedVersion: 3 time: 0.25 - value: {x: 0, y: 1.3293335, z: 0} - inSlope: {x: -0, y: 5.7400017, z: -0} - outSlope: {x: 0, y: 1.6679994, z: 0} + value: {x: 0, y: 1.0423335, z: 0} + inSlope: {x: -0, y: 1.3246156, z: -0} + outSlope: {x: 0, y: 5.74, 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} - serializedVersion: 3 - time: 0.41666666 + time: 0.3 + value: {x: 0, y: 1.3293335, z: 0} + inSlope: {x: -0, y: 5.74, z: -0} + outSlope: {x: 0, y: 1.3899995, 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} + - serializedVersion: 3 + time: 0.5 value: {x: 0, y: 1.6073334, z: 0} - inSlope: {x: -0, y: 1.6679994, z: -0} + inSlope: {x: -0, y: 1.3899995, z: -0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 @@ -434,16 +434,7 @@ AnimationClip: time: 0 value: {x: -0.011, y: -0.975, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: 0, y: 0.42000026, 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} - - serializedVersion: 3 - time: 0.2 - value: {x: -0.011, y: -0.891, z: 0} - inSlope: {x: -0, y: 0.42000026, z: -0} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: 0, y: 0.3360002, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -451,6 +442,15 @@ AnimationClip: - serializedVersion: 3 time: 0.25 value: {x: -0.011, y: -0.891, z: 0} + inSlope: {x: -0, y: 0.3360002, z: -0} + 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.3 + value: {x: -0.011, y: -0.891, z: 0} inSlope: {x: -0, y: -0, z: -0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -468,25 +468,16 @@ AnimationClip: time: 0 value: {x: -0.01, y: -0.017, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: 0, y: 0.765, z: 0} + outSlope: {x: 0, y: 1.53, 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} - serializedVersion: 3 - time: 0.06666667 + time: 0.033333335 value: {x: -0.01, y: 0.034, z: 0} - inSlope: {x: -0, y: 0.765, z: -0} - outSlope: {x: 0, y: 0.84000003, 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} - - serializedVersion: 3 - time: 0.2 - value: {x: -0.01, y: 0.146, z: 0} - inSlope: {x: -0, y: 0.84000003, z: -0} - outSlope: {x: 0, y: 0, z: 0} + inSlope: {x: -0, y: 1.53, z: -0} + outSlope: {x: 0, y: 0.51692307, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -494,16 +485,25 @@ AnimationClip: - serializedVersion: 3 time: 0.25 value: {x: -0.01, y: 0.146, z: 0} - inSlope: {x: -0, y: -0, z: -0} - outSlope: {x: 0, y: -0.34800002, z: 0} + inSlope: {x: -0, y: 0.51692307, z: -0} + outSlope: {x: 0, y: 0, 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} - serializedVersion: 3 - time: 0.41666666 + time: 0.3 + value: {x: -0.01, y: 0.146, z: 0} + inSlope: {x: -0, y: -0, z: -0} + outSlope: {x: 0, y: -0.29000002, 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} + - serializedVersion: 3 + time: 0.5 value: {x: -0.01, y: 0.088, z: 0} - inSlope: {x: -0, y: -0.34800002, z: -0} + inSlope: {x: -0, y: -0.29000002, z: -0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 @@ -584,25 +584,16 @@ AnimationClip: time: 0 value: {x: -0.023, y: 0.9010001, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: 0, y: -2.500001, z: 0} + outSlope: {x: 0, y: -2.2200017, 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} - serializedVersion: 3 - time: 0.06666667 - value: {x: -0.023, y: 0.73433334, z: 0} - inSlope: {x: -0, y: -2.500001, z: -0} - outSlope: {x: 0, y: 2.6450012, 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} - - serializedVersion: 3 - time: 0.2 - value: {x: -0.023, y: 1.0870001, z: 0} - inSlope: {x: -0, y: 2.6450012, z: -0} - outSlope: {x: 0, y: 0, z: 0} + time: 0.033333335 + value: {x: -0.023, y: 0.827, z: 0} + inSlope: {x: -0, y: -2.2200017, z: -0} + outSlope: {x: 0, y: 1.2000005, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -610,16 +601,25 @@ AnimationClip: - serializedVersion: 3 time: 0.25 value: {x: -0.023, y: 1.0870001, z: 0} - inSlope: {x: -0, y: -0, z: -0} - outSlope: {x: 0, y: -0.34800056, z: 0} + inSlope: {x: -0, y: 1.2000005, z: -0} + outSlope: {x: 0, y: 0, 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} - serializedVersion: 3 - time: 0.41666666 + time: 0.3 + value: {x: -0.023, y: 1.0870001, z: 0} + inSlope: {x: -0, y: -0, z: -0} + outSlope: {x: 0, y: -0.29000047, 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} + - serializedVersion: 3 + time: 0.5 value: {x: -0.023, y: 1.029, z: 0} - inSlope: {x: -0, y: -0.34800056, z: -0} + inSlope: {x: -0, y: -0.29000047, z: -0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 @@ -636,25 +636,16 @@ AnimationClip: time: 0 value: {x: 0.004, y: -0.81299984, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: 0, y: 0.2149987, z: 0} + outSlope: {x: 0, y: 0.4299974, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0, y: 0, z: 0} outWeight: {x: 0, y: 0, z: 0} - serializedVersion: 3 - time: 0.06666667 + time: 0.033333335 value: {x: 0.004, y: -0.7986666, z: 0} - inSlope: {x: -0, y: 0.2149987, z: -0} - outSlope: {x: 0, y: 0.28999957, 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} - - serializedVersion: 3 - time: 0.2 - value: {x: 0.004, y: -0.76, z: 0} - inSlope: {x: -0, y: 0.28999957, z: -0} - outSlope: {x: Infinity, y: Infinity, z: Infinity} + inSlope: {x: -0, y: 0.4299974, z: -0} + outSlope: {x: 0, y: 0.17846125, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -662,16 +653,25 @@ AnimationClip: - serializedVersion: 3 time: 0.25 value: {x: 0.004, y: -0.76, z: 0} - inSlope: {x: -0, y: -0, z: -0} - outSlope: {x: 0, y: -0.19200112, z: 0} + inSlope: {x: -0, y: 0.17846125, z: -0} + 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.41666666 + time: 0.3 + value: {x: 0.004, y: -0.76, z: 0} + inSlope: {x: -0, y: -0, z: -0} + outSlope: {x: 0, y: -0.16000094, 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} + - serializedVersion: 3 + time: 0.5 value: {x: 0.004, y: -0.7920002, z: 0} - inSlope: {x: -0, y: -0.19200112, z: -0} + inSlope: {x: -0, y: -0.16000094, z: -0} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 @@ -817,16 +817,7 @@ AnimationClip: time: 0 value: {x: 1.083, y: 0.95, z: 1} inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: -0.41499972, y: 0.25000006, 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} - - serializedVersion: 3 - time: 0.2 - value: {x: 1, y: 1, z: 1} - inSlope: {x: -0.41499972, y: 0.25000006, z: -0} - outSlope: {x: 0, y: 0, z: 0} + outSlope: {x: -0.33199978, y: 0.20000005, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -834,6 +825,15 @@ AnimationClip: - serializedVersion: 3 time: 0.25 value: {x: 1, y: 1, z: 1} + inSlope: {x: -0.33199978, y: 0.20000005, z: -0} + outSlope: {x: 0, y: 0, 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} + - serializedVersion: 3 + time: 0.3 + value: {x: 1, y: 1, z: 1} inSlope: {x: -0, y: -0, z: -0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -931,33 +931,33 @@ AnimationClip: time: 0 value: {x: 1, y: 1, z: 1} inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: -0.5000001, y: 0.5000001, z: 0} + outSlope: {x: -0.4000001, y: 0.4000001, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0, y: 0, z: 0} outWeight: {x: 0, y: 0, z: 0} - serializedVersion: 3 - time: 0.2 + time: 0.25 value: {x: 0.9, y: 1.1, z: 1} - inSlope: {x: -0.5000001, y: 0.5000001, z: -0} + inSlope: {x: -0.4000001, y: 0.4000001, z: -0} 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.25 + time: 0.3 value: {x: 0.9, y: 1.1, z: 1} inSlope: {x: -0, y: -0, z: -0} - outSlope: {x: 0.3000001, y: -0.30000046, z: 0} + outSlope: {x: 0.2500001, y: -0.2500004, 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} - serializedVersion: 3 - time: 0.41666666 + time: 0.5 value: {x: 0.95, y: 1.05, z: 1} - inSlope: {x: 0.3000001, y: -0.30000046, z: -0} + inSlope: {x: 0.2500001, y: -0.2500004, z: -0} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 @@ -2411,7 +2411,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.41666666 + m_StopTime: 0.5 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -2440,16 +2440,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 - value: 0.361 - inSlope: -0 - outSlope: 0 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 + time: 0.033333335 value: 0.361 inSlope: -0 outSlope: 0 @@ -2467,7 +2458,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.3 + value: 0.361 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 value: 0.361 inSlope: -0 outSlope: 0 @@ -2489,25 +2489,16 @@ AnimationClip: time: 0 value: 0.2690001 inSlope: Infinity - outSlope: -1.9750016 + outSlope: -1.1700027 tangentMode: 71 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 - value: 0.13733333 - inSlope: -1.9750016 - outSlope: 2.4050012 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0.45800012 - inSlope: 2.4050012 - outSlope: 0 + time: 0.033333335 + value: 0.23000002 + inSlope: -1.1700027 + outSlope: 1.0523082 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 @@ -2515,16 +2506,25 @@ AnimationClip: - serializedVersion: 3 time: 0.25 value: 0.45800012 - inSlope: -0 - outSlope: -0.36000112 + inSlope: 1.0523082 + outSlope: 0 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.3 + value: 0.45800012 + inSlope: -0 + outSlope: -0.30000094 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 value: 0.39799994 - inSlope: -0.36000112 + inSlope: -0.30000094 outSlope: 0 tangentMode: 69 weightedMode: 0 @@ -2550,16 +2550,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: -0 - outSlope: 0 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 + time: 0.033333335 value: 0 inSlope: -0 outSlope: 0 @@ -2577,7 +2568,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.3 + value: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 value: 0 inSlope: -0 outSlope: 0 @@ -2985,16 +2985,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 - value: -0.361 - inSlope: -0 - outSlope: 0 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 + time: 0.033333335 value: -0.361 inSlope: -0 outSlope: 0 @@ -3012,7 +3003,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.3 + value: -0.361 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 value: -0.361 inSlope: -0 outSlope: 0 @@ -3034,25 +3034,16 @@ AnimationClip: time: 0 value: 0.2690001 inSlope: Infinity - outSlope: -1.9750018 + outSlope: -1.1700032 tangentMode: 71 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 - value: 0.13733332 - inSlope: -1.9750018 - outSlope: 2.4050007 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0.45800006 - inSlope: 2.4050007 - outSlope: 0 + time: 0.033333335 + value: 0.23 + inSlope: -1.1700032 + outSlope: 1.052308 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 @@ -3060,16 +3051,25 @@ AnimationClip: - serializedVersion: 3 time: 0.25 value: 0.45800006 - inSlope: -0 - outSlope: -0.36000112 + inSlope: 1.052308 + outSlope: 0 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.3 + value: 0.45800006 + inSlope: -0 + outSlope: -0.30000094 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 value: 0.39799988 - inSlope: -0.36000112 + inSlope: -0.30000094 outSlope: 0 tangentMode: 69 weightedMode: 0 @@ -3095,16 +3095,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: -0 - outSlope: 0 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 + time: 0.033333335 value: 0 inSlope: -0 outSlope: 0 @@ -3122,7 +3113,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.3 + value: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 value: 0 inSlope: -0 outSlope: 0 @@ -3511,16 +3511,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: -0 - outSlope: 0 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 + time: 0.033333335 value: 0 inSlope: -0 outSlope: 0 @@ -3538,7 +3529,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.3 + value: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 value: 0 inSlope: -0 outSlope: 0 @@ -3560,42 +3560,42 @@ AnimationClip: time: 0 value: 0.6630001 inSlope: Infinity - outSlope: 1.3849996 + outSlope: 2.7699993 tangentMode: 71 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 + time: 0.033333335 value: 0.7553334 - inSlope: 1.3849996 - outSlope: 2.1525006 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 1.0423335 - inSlope: 2.1525006 - outSlope: 5.7400017 + inSlope: 2.7699993 + outSlope: 1.3246156 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 - value: 1.3293335 - inSlope: 5.7400017 - outSlope: 1.6679994 + value: 1.0423335 + inSlope: 1.3246156 + outSlope: 5.74 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.3 + value: 1.3293335 + inSlope: 5.74 + outSlope: 1.3899995 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 value: 1.6073334 - inSlope: 1.6679994 + inSlope: 1.3899995 outSlope: 0 tangentMode: 69 weightedMode: 0 @@ -3621,16 +3621,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: -0 - outSlope: 0 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 + time: 0.033333335 value: 0 inSlope: -0 outSlope: 0 @@ -3648,7 +3639,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.3 + value: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 value: 0 inSlope: -0 outSlope: 0 @@ -3847,7 +3847,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.2 + time: 0.25 value: -0.011 inSlope: -0 outSlope: Infinity @@ -3856,7 +3856,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.3 value: -0.011 inSlope: -0 outSlope: 0 @@ -3878,22 +3878,22 @@ AnimationClip: time: 0 value: -0.975 inSlope: Infinity - outSlope: 0.42000026 + outSlope: 0.3360002 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.2 + time: 0.25 value: -0.891 - inSlope: 0.42000026 + inSlope: 0.3360002 outSlope: Infinity tangentMode: 101 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.3 value: -0.891 inSlope: -0 outSlope: 0 @@ -3921,7 +3921,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.2 + time: 0.25 value: 0 inSlope: -0 outSlope: Infinity @@ -3930,7 +3930,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.3 value: 0 inSlope: -0 outSlope: 0 @@ -4091,16 +4091,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 - value: -0.01 - inSlope: -0 - outSlope: 0 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 + time: 0.033333335 value: -0.01 inSlope: -0 outSlope: 0 @@ -4118,7 +4109,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.3 + value: -0.01 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 value: -0.01 inSlope: -0 outSlope: 0 @@ -4140,25 +4140,16 @@ AnimationClip: time: 0 value: -0.017 inSlope: Infinity - outSlope: 0.765 + outSlope: 1.53 tangentMode: 71 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 + time: 0.033333335 value: 0.034 - inSlope: 0.765 - outSlope: 0.84000003 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0.146 - inSlope: 0.84000003 - outSlope: 0 + inSlope: 1.53 + outSlope: 0.51692307 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 @@ -4166,16 +4157,25 @@ AnimationClip: - serializedVersion: 3 time: 0.25 value: 0.146 - inSlope: -0 - outSlope: -0.34800002 + inSlope: 0.51692307 + outSlope: 0 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.3 + value: 0.146 + inSlope: -0 + outSlope: -0.29000002 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 value: 0.088 - inSlope: -0.34800002 + inSlope: -0.29000002 outSlope: 0 tangentMode: 69 weightedMode: 0 @@ -4201,16 +4201,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: -0 - outSlope: 0 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 + time: 0.033333335 value: 0 inSlope: -0 outSlope: 0 @@ -4228,7 +4219,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.3 + value: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 value: 0 inSlope: -0 outSlope: 0 @@ -4307,22 +4307,22 @@ AnimationClip: time: 0 value: 1.083 inSlope: Infinity - outSlope: -0.41499972 + outSlope: -0.33199978 tangentMode: 71 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.2 + time: 0.25 value: 1 - inSlope: -0.41499972 + inSlope: -0.33199978 outSlope: 0 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.3 value: 1 inSlope: -0 outSlope: 0 @@ -4344,22 +4344,22 @@ AnimationClip: time: 0 value: 0.95 inSlope: Infinity - outSlope: 0.25000006 + outSlope: 0.20000005 tangentMode: 71 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.2 + time: 0.25 value: 1 - inSlope: 0.25000006 + inSlope: 0.20000005 outSlope: 0 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.3 value: 1 inSlope: -0 outSlope: 0 @@ -4387,7 +4387,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.2 + time: 0.25 value: 1 inSlope: -0 outSlope: 0 @@ -4396,7 +4396,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.3 value: 1 inSlope: -0 outSlope: 0 @@ -5298,16 +5298,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 - value: -0.023 - inSlope: -0 - outSlope: 0 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 + time: 0.033333335 value: -0.023 inSlope: -0 outSlope: 0 @@ -5325,7 +5316,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.3 + value: -0.023 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 value: -0.023 inSlope: -0 outSlope: 0 @@ -5347,25 +5347,16 @@ AnimationClip: time: 0 value: 0.9010001 inSlope: Infinity - outSlope: -2.500001 + outSlope: -2.2200017 tangentMode: 71 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 - value: 0.73433334 - inSlope: -2.500001 - outSlope: 2.6450012 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 1.0870001 - inSlope: 2.6450012 - outSlope: 0 + time: 0.033333335 + value: 0.827 + inSlope: -2.2200017 + outSlope: 1.2000005 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 @@ -5373,16 +5364,25 @@ AnimationClip: - serializedVersion: 3 time: 0.25 value: 1.0870001 - inSlope: -0 - outSlope: -0.34800056 + inSlope: 1.2000005 + outSlope: 0 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.3 + value: 1.0870001 + inSlope: -0 + outSlope: -0.29000047 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 value: 1.029 - inSlope: -0.34800056 + inSlope: -0.29000047 outSlope: 0 tangentMode: 69 weightedMode: 0 @@ -5408,16 +5408,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: -0 - outSlope: 0 - tangentMode: 69 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 + time: 0.033333335 value: 0 inSlope: -0 outSlope: 0 @@ -5435,7 +5426,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.3 + value: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 value: 0 inSlope: -0 outSlope: 0 @@ -5596,7 +5596,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.06666667 + time: 0.033333335 value: 0.004 inSlope: -0 outSlope: 0 @@ -5605,7 +5605,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.2 + time: 0.25 value: 0.004 inSlope: -0 outSlope: Infinity @@ -5614,7 +5614,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.3 value: 0.004 inSlope: -0 outSlope: 0 @@ -5623,7 +5623,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.5 value: 0.004 inSlope: -0 outSlope: Infinity @@ -5645,42 +5645,42 @@ AnimationClip: time: 0 value: -0.81299984 inSlope: Infinity - outSlope: 0.2149987 + outSlope: 0.4299974 tangentMode: 69 weightedMode: 0 inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.06666667 + time: 0.033333335 value: -0.7986666 - inSlope: 0.2149987 - outSlope: 0.28999957 + inSlope: 0.4299974 + outSlope: 0.17846125 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: -0.76 - inSlope: 0.28999957 - outSlope: Infinity - tangentMode: 101 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.25 value: -0.76 + inSlope: 0.17846125 + outSlope: Infinity + tangentMode: 101 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: -0.76 inSlope: -0 - outSlope: -0.19200112 + outSlope: -0.16000094 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.5 value: -0.7920002 - inSlope: -0.19200112 + inSlope: -0.16000094 outSlope: Infinity tangentMode: 101 weightedMode: 0 @@ -5706,7 +5706,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.06666667 + time: 0.033333335 value: 0 inSlope: -0 outSlope: 0 @@ -5715,7 +5715,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.2 + time: 0.25 value: 0 inSlope: -0 outSlope: Infinity @@ -5724,7 +5724,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.3 value: 0 inSlope: -0 outSlope: 0 @@ -5733,7 +5733,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.5 value: 0 inSlope: -0 outSlope: Infinity @@ -5812,33 +5812,33 @@ AnimationClip: time: 0 value: 1 inSlope: Infinity - outSlope: -0.5000001 + outSlope: -0.4000001 tangentMode: 69 weightedMode: 0 inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.2 + time: 0.25 value: 0.9 - inSlope: -0.5000001 + inSlope: -0.4000001 outSlope: Infinity tangentMode: 101 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.3 value: 0.9 inSlope: -0 - outSlope: 0.3000001 + outSlope: 0.2500001 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.5 value: 0.95 - inSlope: 0.3000001 + inSlope: 0.2500001 outSlope: Infinity tangentMode: 101 weightedMode: 0 @@ -5858,33 +5858,33 @@ AnimationClip: time: 0 value: 1 inSlope: Infinity - outSlope: 0.5000001 + outSlope: 0.4000001 tangentMode: 69 weightedMode: 0 inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.2 + time: 0.25 value: 1.1 - inSlope: 0.5000001 + inSlope: 0.4000001 outSlope: Infinity tangentMode: 101 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.3 value: 1.1 inSlope: -0 - outSlope: -0.30000046 + outSlope: -0.2500004 tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.5 value: 1.05 - inSlope: -0.30000046 + inSlope: -0.2500004 outSlope: Infinity tangentMode: 101 weightedMode: 0 @@ -5910,7 +5910,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.2 + time: 0.25 value: 1 inSlope: -0 outSlope: Infinity @@ -5919,7 +5919,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.25 + time: 0.3 value: 1 inSlope: -0 outSlope: 0 @@ -5928,7 +5928,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 + time: 0.5 value: 1 inSlope: -0 outSlope: Infinity diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Mako/MakoThrough_H.anim b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Mako/MakoThrough_H.anim index 499ba4973..89befdcff 100644 --- a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Mako/MakoThrough_H.anim +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Mako/MakoThrough_H.anim @@ -900,6 +900,44 @@ AnimationClip: path: LegOther classID: 212 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: Leg + classID: 212 + 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: LegOther + classID: 212 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -1161,6 +1199,20 @@ AnimationClip: typeID: 212 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 1302185647 + attribute: 3762991556 + script: {fileID: 0} + typeID: 212 + customType: 26 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 164936018 + attribute: 3762991556 + script: {fileID: 0} + typeID: 212 + customType: 26 + isPPtrCurve: 0 - serializedVersion: 2 path: 4204807211 attribute: 0 @@ -3750,6 +3802,44 @@ AnimationClip: path: Leg 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: Leg + classID: 212 + 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: LegOther + classID: 212 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/Assets/Scripts/Games/PajamaParty/CtrPillowMonkey.cs b/Assets/Scripts/Games/PajamaParty/CtrPillowMonkey.cs index 4b9533ab2..30ba1fb04 100644 --- a/Assets/Scripts/Games/PajamaParty/CtrPillowMonkey.cs +++ b/Assets/Scripts/Games/PajamaParty/CtrPillowMonkey.cs @@ -31,10 +31,10 @@ namespace HeavenStudio.Games.Scripts_PajamaParty double startThrowTime = double.MinValue; float throwLength = 4f; - float throwHeight = 12f; + float throwHeight = 14f; private bool hasThrown = false; - + void Awake() { anim = Monkey.GetComponent(); @@ -51,9 +51,9 @@ namespace HeavenStudio.Games.Scripts_PajamaParty { hasJumped = true; float yMul = jumpPos * 2f - 1f; - float yWeight = -(yMul*yMul) + 1f; + float yWeight = -(yMul * yMul) + 1f; Monkey.transform.localPosition = new Vector3(0, jumpHeight * yWeight); - Shadow.transform.localScale = new Vector3((1f-yWeight*0.2f) * 1.2f, (1f-yWeight*0.2f) * 0.8f, 1f); + Shadow.transform.localScale = new Vector3((1f - yWeight * 0.2f) * 1.2f, (1f - yWeight * 0.2f) * 0.8f, 1f); if (jumpAlt > 1) { float t; @@ -89,8 +89,8 @@ namespace HeavenStudio.Games.Scripts_PajamaParty { hasThrown = true; float yMul = jumpPos * 2f - 1f; - float yWeight = -(yMul*yMul) + 1f; - Projectile.transform.localPosition = new Vector3(0, throwHeight * yWeight + 1.5f); + float yWeight = -(yMul * yMul) + 1f; + Projectile.transform.localPosition = new Vector3(0, (throwHeight * yWeight) + 1.5f); Projectile.transform.rotation = Quaternion.Euler(0, 0, Projectile.transform.rotation.eulerAngles.z - (360f * Time.deltaTime)); } else @@ -108,7 +108,7 @@ namespace HeavenStudio.Games.Scripts_PajamaParty } } - private void LateUpdate() + private void LateUpdate() { if (Conductor.instance.ReportBeat(ref lastReportedBeat) && anim.IsAnimationNotPlaying() && !hasThrown && !shouldntBop && shouldBop) { @@ -155,31 +155,31 @@ namespace HeavenStudio.Games.Scripts_PajamaParty startJumpTime = double.MinValue; Monkey.transform.localPosition = new Vector3(0, 0); Shadow.transform.localScale = new Vector3(1.2f, 0.8f, 1f); - - List seq = + + List seq = new List() { new BeatAction.Action( beat, delegate { anim.DoScaledAnimationAsync("MonkeySleep00"); }), new BeatAction.Action( beat + 0.5f, delegate { anim.DoUnscaledAnimation("MonkeySleep01"); }), }; - + if (col == 0 || col == 4) { - seq.Add(new BeatAction.Action( beat + 1f, delegate { anim.DoScaledAnimationAsync("MonkeySleep02"); })); + seq.Add(new BeatAction.Action(beat + 1f, delegate { anim.DoScaledAnimationAsync("MonkeySleep02"); })); } else if (col == 1 || col == 3) { - seq.Add(new BeatAction.Action( beat + 1.5f, delegate { anim.DoScaledAnimationAsync("MonkeyReadySleep"); })); - seq.Add(new BeatAction.Action( beat + 2.5f, delegate { anim.DoScaledAnimationAsync("MonkeySleep02"); })); + seq.Add(new BeatAction.Action(beat + 1.5f, delegate { anim.DoScaledAnimationAsync("MonkeyReadySleep"); })); + seq.Add(new BeatAction.Action(beat + 2.5f, delegate { anim.DoScaledAnimationAsync("MonkeySleep02"); })); } else { - seq.Add(new BeatAction.Action( beat + 3f, delegate { anim.DoScaledAnimationAsync("MonkeyReadySleep"); })); - seq.Add(new BeatAction.Action( beat + 4f, delegate { anim.DoScaledAnimationAsync("MonkeySleep02"); })); + seq.Add(new BeatAction.Action(beat + 3f, delegate { anim.DoScaledAnimationAsync("MonkeyReadySleep"); })); + seq.Add(new BeatAction.Action(beat + 4f, delegate { anim.DoScaledAnimationAsync("MonkeySleep02"); })); } - if (action != (int) PajamaParty.SleepType.NoAwake) - seq.Add(new BeatAction.Action( beat + 7f, delegate { anim.DoScaledAnimationAsync("MonkeyAwake"); })); + if (action != (int)PajamaParty.SleepType.NoAwake) + seq.Add(new BeatAction.Action(beat + 7f, delegate { anim.DoScaledAnimationAsync("MonkeyAwake"); })); BeatAction.New(this, seq); } diff --git a/Assets/Scripts/Games/PajamaParty/CtrPillowPlayer.cs b/Assets/Scripts/Games/PajamaParty/CtrPillowPlayer.cs index 9a38491fc..2ae456d40 100644 --- a/Assets/Scripts/Games/PajamaParty/CtrPillowPlayer.cs +++ b/Assets/Scripts/Games/PajamaParty/CtrPillowPlayer.cs @@ -37,7 +37,7 @@ namespace HeavenStudio.Games.Scripts_PajamaParty private bool startedSleeping = false; double startThrowTime = double.MinValue; - float throwLength = 0; + double throwLength = 0; float throwHeight = 0; bool throwType = true; // true = throw, false = dropped ("Out") @@ -181,15 +181,15 @@ namespace HeavenStudio.Games.Scripts_PajamaParty if (drop) { throwType = false; - throwLength = 0.5f; + throwLength = 0.5; Projectile.GetComponent().DoScaledAnimation("ThrowOut", startThrowTime, throwLength); Projectile.transform.rotation = Quaternion.Euler(0, 0, 360f * UnityEngine.Random.Range(0f, 1f)); } else { throwType = true; - throwHeight = ng ? 1.5f : 12f; - throwLength = ng ? 1f : 4f; + throwHeight = ng ? 1.5f : 14f; + throwLength = ng ? 1 : 4; } } @@ -227,11 +227,19 @@ namespace HeavenStudio.Games.Scripts_PajamaParty { new ( - beat + 1, + beat + 0.5, + delegate + { + game.ToggleHighState(hit && !ng, beat + 0.5); + } + ), + new + ( + beat + 2, delegate { - game.ToggleHighState(hit); anim.DoUnscaledAnimation("MakoThrow" + animSuffix, 1); + game.PrepareHighState(); } ) }); @@ -347,12 +355,13 @@ namespace HeavenStudio.Games.Scripts_PajamaParty if (state <= -1f || state >= 1f) { SoundByte.PlayOneShot("miss"); - EndCharge(cond.songPositionInBeatsAsDouble, true, true); + throwNg = true; + EndCharge(cond.songPositionInBeatsAsDouble, true, throwNg); } else { SoundByte.PlayOneShotGame("pajamaParty/throw5"); - EndCharge(cond.songPositionInBeatsAsDouble, true, (throwNg || false)); + EndCharge(cond.songPositionInBeatsAsDouble, true, throwNg); } caller.CanHit(false); } diff --git a/Assets/Scripts/Games/PajamaParty/PajamaParty.cs b/Assets/Scripts/Games/PajamaParty/PajamaParty.cs index 589252429..bc330cf04 100644 --- a/Assets/Scripts/Games/PajamaParty/PajamaParty.cs +++ b/Assets/Scripts/Games/PajamaParty/PajamaParty.cs @@ -110,6 +110,11 @@ namespace HeavenStudio.Games [SerializeField] Transform SpawnRoot; [SerializeField] float HighCameraHeight; + [Header("Materials")] + [SerializeField] Color monkeyNrmColour; + [SerializeField] Color monkeyHighColour; + [SerializeField] Material monkeyColMat; + //game scene public static PajamaParty instance; @@ -118,6 +123,7 @@ namespace HeavenStudio.Games CtrPillowMonkey[,] monkeys; double cameraHighStart = double.MaxValue; + double castleAppearStart = double.MaxValue; bool bgState, highState, expectHigh; //cues while unoaded @@ -217,7 +223,7 @@ namespace HeavenStudio.Games void Start() { - Castle.SetActive(false); + monkeyColMat.SetColor("_ColorAlpha", highState ? monkeyHighColour : monkeyNrmColour); } void Update() @@ -232,6 +238,11 @@ namespace HeavenStudio.Games additional.y = yWeight * HighCameraHeight; } GameCamera.AdditionalPosition = additional; + + if (cond.songPositionInBeatsAsDouble >= castleAppearStart) + { + BgAnimator.DoScaledAnimation(highState ? "CastleAppear" : "CastleHide", castleAppearStart, 3.5, animLayer: 1, clamp: true); + } } public override void OnGameSwitch(double beat) @@ -546,16 +557,16 @@ namespace HeavenStudio.Games bgState = !bgState; if (instant) { - BgAnimator.Play(bgState ? "SlideOpen" : "SlideClose", -1, 1); + BgAnimator.Play(bgState ? "SlideOpen" : "SlideClose", 0, 1); BgAnimator.speed = 0; } else { - BgAnimator.DoScaledAnimationAsync(bgState ? "SlideOpen" : "SlideClose", (float)(1.0 / length)); + BgAnimator.DoScaledAnimationAsync(bgState ? "SlideOpen" : "SlideClose", (float)(1.0 / length), animLayer: 0); } } - public void ToggleHighState(bool hit) + public void ToggleHighState(bool hit, double beat) { expectHigh = false; if (hit && !highState) @@ -566,6 +577,12 @@ namespace HeavenStudio.Games { highState = false; } + castleAppearStart = beat; + } + + public void PrepareHighState() + { + monkeyColMat.SetColor("_ColorAlpha", highState ? monkeyHighColour : monkeyNrmColour); } } }