diff --git a/Assets/Resources/Games/chameleon.prefab b/Assets/Resources/Games/chameleon.prefab index 74d6dc23f..d47808499 100644 --- a/Assets/Resources/Games/chameleon.prefab +++ b/Assets/Resources/Games/chameleon.prefab @@ -1685,90 +1685,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &3837281008646696380 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4342462850220073813} - - component: {fileID: 5103918024028772301} - m_Layer: 0 - m_Name: ref - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &4342462850220073813 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3837281008646696380} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.3888888, y: 1.38888, z: 1.38888} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 5813499711186931250} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &5103918024028772301 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3837281008646696380} - m_Enabled: 1 - 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: 41 - m_Sprite: {fileID: 21300000, guid: b317aa9d1e1f1ee42aca5e4837fc8a8e, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 0.4392157} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 12.8, y: 7.2} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &4112505843487919075 GameObject: m_ObjectHideFlags: 0 @@ -2392,7 +2308,7 @@ Transform: - {fileID: 1613468318185572346} - {fileID: 6378355903632630101} m_Father: {fileID: 5813499711186931250} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &4338945315202714679 Animator: @@ -2458,7 +2374,7 @@ Transform: - {fileID: 6380654998219189923} - {fileID: 4287403599150962051} m_Father: {fileID: 5813499711186931250} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5489985989098915626 GameObject: @@ -2776,7 +2692,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4342462850220073813} - {fileID: 2619828408818896828} - {fileID: 4474597943635544359} - {fileID: 1483397584454175980} @@ -2801,6 +2716,7 @@ MonoBehaviour: chameleonAnim: {fileID: 4338945315202714679} chameleonEye: {fileID: 7162201852764403807} Crown: {fileID: 4991155891004858520} + currentFly: {fileID: 0} gradient: {fileID: 0} bgHigh: {fileID: 0} bgLow: {fileID: 0} @@ -3073,7 +2989,7 @@ Transform: - {fileID: 4045444775337384130} - {fileID: 7947859411872569364} m_Father: {fileID: 5813499711186931250} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &258713350272744346 SpriteRenderer: diff --git a/Assets/Resources/Sprites/Games/Chameleon/Animations/flyCloseCatch.anim b/Assets/Resources/Sprites/Games/Chameleon/Animations/flyCloseCatch.anim index 9d5aafae5..b72ebe6b2 100644 --- a/Assets/Resources/Sprites/Games/Chameleon/Animations/flyCloseCatch.anim +++ b/Assets/Resources/Sprites/Games/Chameleon/Animations/flyCloseCatch.anim @@ -36,7 +36,16 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 4.88, y: 1.3, z: 0} + value: {x: 2.75, y: 0.4, 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.033333335 + value: {x: 2.75, y: 0.4, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -46,8 +55,8 @@ AnimationClip: - serializedVersion: 3 time: 0.06666667 value: {x: 0.94, y: -0.39, z: 0} - inSlope: {x: -59.899998, y: -24.099998, z: 0} - outSlope: {x: -59.899998, y: -24.099998, z: 0} + inSlope: {x: -57.9, y: -22.650002, z: 0} + outSlope: {x: -57.9, y: -22.650002, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -65,7 +74,23 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: - m_ScaleCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: impact m_FloatCurves: - curve: serializedVersion: 2 @@ -124,13 +149,20 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3288973319 + attribute: 3 + 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.1 + m_StopTime: 0.13333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -151,7 +183,16 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 4.88 + value: 2.75 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 2.75 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -161,8 +202,8 @@ AnimationClip: - serializedVersion: 3 time: 0.06666667 value: 0.94 - inSlope: -59.899998 - outSlope: -59.899998 + inSlope: -57.9 + outSlope: -57.9 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -188,7 +229,16 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.3 + value: 0.4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0.4 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -198,8 +248,8 @@ AnimationClip: - serializedVersion: 3 time: 0.06666667 value: -0.39 - inSlope: -24.099998 - outSlope: -24.099998 + inSlope: -22.650002 + outSlope: -22.650002 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -226,6 +276,15 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -342,6 +401,63 @@ AnimationClip: path: impact classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: impact + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: impact + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: impact + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 @@ -375,4 +491,11 @@ AnimationClip: script: {fileID: 0} m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.13333334 + functionName: Destroy + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/Chameleon/Animations/flyCloseFall.anim b/Assets/Resources/Sprites/Games/Chameleon/Animations/flyCloseFall.anim index d47a55e42..04b29aaad 100644 --- a/Assets/Resources/Sprites/Games/Chameleon/Animations/flyCloseFall.anim +++ b/Assets/Resources/Sprites/Games/Chameleon/Animations/flyCloseFall.anim @@ -29,15 +29,6 @@ AnimationClip: - serializedVersion: 3 time: 0.1 value: {x: 0, y: 0, z: 25} - inSlope: {x: 0, y: 0, z: 136} - outSlope: {x: 0, y: 0, z: 136} - 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: 0, z: 110} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -54,7 +45,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 5.08, y: 1.88, z: 0} + value: {x: 1.38, y: 0.25, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -63,16 +54,16 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.1 - value: {x: 4.7, y: 2.65, z: 0} - inSlope: {x: -3.040001, y: 0, z: 0} - outSlope: {x: -3.040001, y: 0, z: 0} + value: {x: 1.2, y: 1.02, z: 0} + inSlope: {x: -1.7999995, y: 0, z: 0} + outSlope: {x: -1.7999995, 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.5 - value: {x: 3.5, y: -5.4, z: 0} + time: 0.4 + value: {x: 0.16, y: -5.75, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -243,7 +234,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.5 + m_StopTime: 0.4 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -264,7 +255,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 5.08 + value: 1.38 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -273,16 +264,16 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.1 - value: 4.7 - inSlope: -3.040001 - outSlope: -3.040001 + value: 1.2 + inSlope: -1.7999995 + outSlope: -1.7999995 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 - value: 3.5 + time: 0.4 + value: 0.16 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -301,7 +292,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.88 + value: 0.25 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -310,7 +301,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.1 - value: 2.65 + value: 1.02 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -318,8 +309,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.5 - value: -5.4 + time: 0.4 + value: -5.75 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -345,15 +336,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -414,15 +396,6 @@ AnimationClip: - serializedVersion: 3 time: 0.1 value: 25 - inSlope: 136 - outSlope: 136 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 110 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Sprites/Games/Chameleon/Animations/flyCloseGone.anim b/Assets/Resources/Sprites/Games/Chameleon/Animations/flyCloseGone.anim index bf98fc20c..2e0c2c1b0 100644 --- a/Assets/Resources/Sprites/Games/Chameleon/Animations/flyCloseGone.anim +++ b/Assets/Resources/Sprites/Games/Chameleon/Animations/flyCloseGone.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 5.15, y: 1.6, z: 0} + value: {x: 1.5, y: -0.25, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.33333334 - value: {x: 7.75, y: 5.35, z: 0} + value: {x: 6.7, y: 5.35, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -63,7 +63,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.33333334 + m_StopTime: 0.36666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -84,7 +84,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 5.15 + value: 1.5 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -93,7 +93,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: 7.75 + value: 6.7 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -112,7 +112,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.6 + value: -0.25 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -166,4 +166,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.36666667 + functionName: Destroy + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/Chameleon/Animations/flyCloseMove.anim b/Assets/Resources/Sprites/Games/Chameleon/Animations/flyCloseMove.anim index 99347ce0e..3e150f30c 100644 --- a/Assets/Resources/Sprites/Games/Chameleon/Animations/flyCloseMove.anim +++ b/Assets/Resources/Sprites/Games/Chameleon/Animations/flyCloseMove.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -4.5, y: 5.4, z: 0} + value: {x: -6, y: 5.4, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,70 +29,61 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.5 - value: {x: 3.2, y: 1.25, z: 0} - inSlope: {x: 15.825, y: -4.1999984, z: 0} - outSlope: {x: 15.825, y: -4.1999984, 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.6666667 - value: {x: 6.05, y: 0.55, z: 0} - inSlope: {x: 1.3714263, y: 0, z: 0} - outSlope: {x: 1.3714263, 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.73333335 - value: {x: 6.13, y: 1, z: 0} - inSlope: {x: 0, y: 4.3200006, z: 0} - outSlope: {x: 0, y: 4.3200006, z: 0} + value: {x: 0.2, y: 0.05, z: 0} + inSlope: {x: 4.3200006, y: 0, z: 0} + outSlope: {x: 4.3200006, 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.8333333 - value: {x: 5.82, y: 1.27, z: 0} - inSlope: {x: -2.6571424, y: 0, z: 0} - outSlope: {x: -2.6571424, y: 0, z: 0} + value: {x: 1.1, y: 0.7, z: 0} + inSlope: {x: 4.3, y: 0, z: 0} + outSlope: {x: 4.3, 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: 1.2 - value: {x: 4.24, y: 1.12, z: 0} - inSlope: {x: -2.2153826, y: 0, z: 0} - outSlope: {x: -2.2153826, y: 0, z: 0} + time: 0.9 + value: {x: 1.92, y: 0.45, z: 0} + inSlope: {x: 6.900004, y: 0, z: 0} + outSlope: {x: 6.900004, 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: 1.2666667 - value: {x: 4, y: 1.78, z: 0} - inSlope: {x: 0, y: 1.2000006, z: 0} - outSlope: {x: 0, y: 1.2000006, z: 0} + time: 0.96666664 + value: {x: 2.15, y: 0.55, z: 0} + inSlope: {x: 0, y: 4, z: 0} + outSlope: {x: 0, y: 4, 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.4666667 - value: {x: 5.52, y: 1.86, z: 0} - inSlope: {x: 2.399998, y: 1.2000008, z: 0} - outSlope: {x: 2.399998, y: 1.2000008, z: 0} + time: 1 + value: {x: 1.92, y: 0.86, z: 0} + inSlope: {x: -2.5090919, y: 0, z: 0} + outSlope: {x: -2.5090919, 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: 1.5333333 - value: {x: 5.68, y: 2.28, z: 0} + time: 1.3333334 + value: {x: 0.76, y: -0.6, z: 0} + inSlope: {x: -0.109090514, y: 0, z: 0} + outSlope: {x: -0.109090514, 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: 1.3666667 + value: {x: 0.75, y: -0.12, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -100,17 +91,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 1.6 - value: {x: 5.67, y: 2.12, z: 0} - inSlope: {x: -0.29999256, y: 0, z: 0} - outSlope: {x: -0.29999256, 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: 1.6666666 - value: {x: 5.08, y: 2.28, z: 0} + time: 1.5333333 + value: {x: 2.12, y: -0.35, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -119,34 +101,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1.7 - value: {x: 5.35, y: 1.84, z: 0} - inSlope: {x: 9.299991, y: -1.1999977, z: 0} - outSlope: {x: 9.299991, y: -1.1999977, 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.7333333 - value: {x: 5.7, y: 1.82, z: 0} - inSlope: {x: 0, y: -0.8, z: 0} - outSlope: {x: 0, y: -0.8, 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.8 - value: {x: 5.65, y: 1.5, z: 0} - inSlope: {x: -0.99999464, y: 0, z: 0} - outSlope: {x: -0.99999464, 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: 1.9333333 - value: {x: 4.7, y: 1.88, z: 0} + value: {x: 0.91, y: -0.05, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -154,44 +109,44 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 2.0333333 - value: {x: 5.73, y: 1.87, z: 0} - inSlope: {x: 0, y: -0.1499998, z: 0} - outSlope: {x: 0, y: -0.1499998, z: 0} + time: 1.8333334 + value: {x: 2, y: -0.65, 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} + - serializedVersion: 3 + time: 2 + value: {x: 0.9, y: -0.05, z: 0} + inSlope: {x: 0, y: 2.2500017, z: 0} + outSlope: {x: 0, y: 2.2500017, 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: 2.1 + value: {x: 1.23, y: 0.1, z: 0} + inSlope: {x: 5.499999, y: 0, z: 0} + outSlope: {x: 5.499999, 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: 2.2 - value: {x: 4.52, y: 1.36, z: 0} + value: {x: 2, y: -0.65, 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} - - serializedVersion: 3 - time: 2.3 - value: {x: 5.6, y: 1.5, z: 0} - inSlope: {x: 1.8000002, y: 4.2000036, z: 0} - outSlope: {x: 1.8000002, y: 4.2000036, 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: 2.3333333 - value: {x: 5.66, y: 1.92, 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} - - serializedVersion: 3 - time: 2.4666667 - value: {x: 4.76, y: 1.08, z: 0} + value: {x: 1.3, y: 0.38, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -200,34 +155,25 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 2.5 - value: {x: 4.8, y: 1.33, z: 0} - inSlope: {x: 1.2, y: 5.6250052, z: 0} - outSlope: {x: 1.2, y: 5.6250052, z: 0} + value: {x: 1.5, y: -0.8, z: 0} + inSlope: {x: 1.5, y: 0, z: 0} + outSlope: {x: 1.5, 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: 2.6 - value: {x: 5.7, y: 1.83, z: 0} - inSlope: {x: 0, y: 5.7749944, z: 0} - outSlope: {x: 0, y: 5.7749944, z: 0} + time: 2.5333333 + value: {x: 1.6, y: -0.15, z: 0} + inSlope: {x: 0, y: 4.499995, z: 0} + outSlope: {x: 0, y: 4.499995, 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: 2.6333334 - value: {x: 5.48, y: 2.1, z: 0} - inSlope: {x: -8.799979, y: 0, z: 0} - outSlope: {x: -8.799979, 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: 2.7 - value: {x: 4.7, y: 1.1, z: 0} + value: {x: 0.9, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -235,17 +181,17 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 2.8666666 - value: {x: 5.4, y: 1.9, z: 0} - inSlope: {x: 0, y: 4.7999997, z: 0} - outSlope: {x: 0, y: 4.7999997, z: 0} + time: 2.7333333 + value: {x: 2.08, y: -0.4, z: 0} + inSlope: {x: 0, y: -2.2000005, z: 0} + outSlope: {x: 0, y: -2.2000005, 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: 2.9333334 - value: {x: 5.18, y: 2.22, z: 0} + value: {x: 1.27, y: -0.66, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -253,8 +199,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 3.0333333 - value: {x: 5.23, y: 1, z: 0} + time: 3 + value: {x: 2, y: -0.66, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -262,8 +208,17 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 3.1666667 - value: {x: 4.6, y: 1.95, z: 0} + time: 3.0666666 + value: {x: 1.08, y: 0.15, 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} + - serializedVersion: 3 + time: 3.2666667 + value: {x: 2, y: -0.4, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -272,34 +227,16 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 3.3333333 - value: {x: 5.43, y: 1.28, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + value: {x: 1.5, y: -0.25, z: 0} + inSlope: {x: 0, y: 4.499996, z: 0} + outSlope: {x: 0, y: 4.499996, 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: 3.4 - value: {x: 5, y: 2, z: 0} - inSlope: {x: -4.724993, y: 0, z: 0} - outSlope: {x: -4.724993, 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: 3.4666667 - value: {x: 4.8, y: 1.85, z: 0} - inSlope: {x: 0, y: -4.5000033, z: 0} - outSlope: {x: 0, y: -4.5000033, 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: 3.5333333 - value: {x: 5.5, y: 1.05, z: 0} + value: {x: 1.9, y: 0.25, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -307,8 +244,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 3.6333334 - value: {x: 4.8, y: 1.85, z: 0} + time: 3.5 + value: {x: 1.31, y: -0.84, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -316,8 +253,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 3.6666667 - value: {x: 5.15, y: 1.6, z: 0} + time: 3.6 + value: {x: 1.5, y: -0.25, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -351,7 +288,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 3.6666667 + m_StopTime: 3.6 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -372,7 +309,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -4.5 + value: -6 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -381,52 +318,34 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 3.2 - inSlope: 15.825 - outSlope: 15.825 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.6666667 - value: 6.05 - inSlope: 1.3714263 - outSlope: 1.3714263 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.73333335 - value: 6.13 - inSlope: 0 - outSlope: 0 + value: 0.2 + inSlope: 4.3200006 + outSlope: 4.3200006 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.8333333 - value: 5.82 - inSlope: -2.6571424 - outSlope: -2.6571424 + value: 1.1 + inSlope: 4.3 + outSlope: 4.3 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2 - value: 4.24 - inSlope: -2.2153826 - outSlope: -2.2153826 + time: 0.9 + value: 1.92 + inSlope: 6.900004 + outSlope: 6.900004 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2666667 - value: 4 + time: 0.96666664 + value: 2.15 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -434,35 +353,35 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.4666667 - value: 5.52 - inSlope: 2.399998 - outSlope: 2.399998 + time: 1 + value: 1.92 + inSlope: -2.5090919 + outSlope: -2.5090919 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3333334 + value: 0.76 + inSlope: -0.109090514 + outSlope: -0.109090514 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3666667 + value: 0.75 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1.5333333 - value: 5.68 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.6 - value: 5.67 - inSlope: -0.29999256 - outSlope: -0.29999256 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.6666666 - value: 5.08 + value: 2.12 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -471,16 +390,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.7 - value: 5.35 - inSlope: 9.299991 - outSlope: 9.299991 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.7333333 - value: 5.7 + value: 0.91 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -488,17 +398,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.8 - value: 5.65 - inSlope: -0.99999464 - outSlope: -0.99999464 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.9333333 - value: 4.7 + time: 1.8333334 + value: 2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -506,44 +407,35 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.0333333 - value: 5.73 + time: 2 + value: 0.9 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.1 + value: 1.23 + inSlope: 5.499999 + outSlope: 5.499999 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 2.2 - value: 4.52 + value: 2 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.3 - value: 5.6 - inSlope: 1.8000002 - outSlope: 1.8000002 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 2.3333333 - value: 5.66 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.4666667 - value: 4.76 + value: 1.3 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -552,16 +444,16 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 2.5 - value: 4.8 - inSlope: 1.2 - outSlope: 1.2 + value: 1.5 + inSlope: 1.5 + outSlope: 1.5 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.6 - value: 5.7 + time: 2.5333333 + value: 1.6 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -570,16 +462,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 2.6333334 - value: 5.48 - inSlope: -8.799979 - outSlope: -8.799979 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.7 - value: 4.7 + value: 0.9 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -587,8 +470,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.8666666 - value: 5.4 + time: 2.7333333 + value: 2.08 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -597,7 +480,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 2.9333334 - value: 5.18 + value: 1.27 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -605,8 +488,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.0333333 - value: 5.23 + time: 3 + value: 2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -614,8 +497,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.1666667 - value: 4.6 + time: 3.0666666 + value: 1.08 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.2666667 + value: 2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -624,7 +516,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 3.3333333 - value: 5.43 + value: 1.5 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -633,16 +525,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 3.4 - value: 5 - inSlope: -4.724993 - outSlope: -4.724993 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.4666667 - value: 4.8 + value: 1.9 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -650,8 +533,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.5333333 - value: 5.5 + time: 3.5 + value: 1.31 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -659,17 +542,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.6333334 - value: 4.8 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.6666667 - value: 5.15 + time: 3.6 + value: 1.5 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -697,34 +571,16 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 1.25 - inSlope: -4.1999984 - outSlope: -4.1999984 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.6666667 - value: 0.55 + value: 0.05 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.73333335 - value: 1 - inSlope: 4.3200006 - outSlope: 4.3200006 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.8333333 - value: 1.27 + value: 0.7 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -732,8 +588,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2 - value: 1.12 + time: 0.9 + value: 0.45 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -741,44 +597,44 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2666667 - value: 1.78 - inSlope: 1.2000006 - outSlope: 1.2000006 + time: 0.96666664 + value: 0.55 + inSlope: 4 + outSlope: 4 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.4666667 - value: 1.86 - inSlope: 1.2000008 - outSlope: 1.2000008 + time: 1 + value: 0.86 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3333334 + value: -0.6 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3666667 + value: -0.12 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1.5333333 - value: 2.28 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.6 - value: 2.12 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.6666666 - value: 2.28 + value: -0.35 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -787,25 +643,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.7 - value: 1.84 - inSlope: -1.1999977 - outSlope: -1.1999977 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.7333333 - value: 1.82 - inSlope: -0.8 - outSlope: -0.8 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.8 - value: 1.5 + value: -0.05 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -813,8 +651,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.9333333 - value: 1.88 + time: 1.8333334 + value: -0.65 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -822,44 +660,35 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.0333333 - value: 1.87 - inSlope: -0.1499998 - outSlope: -0.1499998 + time: 2 + value: -0.05 + inSlope: 2.2500017 + outSlope: 2.2500017 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.1 + value: 0.1 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 2.2 - value: 1.36 + value: -0.65 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.3 - value: 1.5 - inSlope: 4.2000036 - outSlope: 4.2000036 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 2.3333333 - value: 1.92 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.4666667 - value: 1.08 + value: 0.38 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -868,25 +697,25 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 2.5 - value: 1.33 - inSlope: 5.6250052 - outSlope: 5.6250052 + value: -0.8 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.6 - value: 1.83 - inSlope: 5.7749944 - outSlope: 5.7749944 + time: 2.5333333 + value: -0.15 + inSlope: 4.499995 + outSlope: 4.499995 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 2.6333334 - value: 2.1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -894,26 +723,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.7 - value: 1.1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.8666666 - value: 1.9 - inSlope: 4.7999997 - outSlope: 4.7999997 + time: 2.7333333 + value: -0.4 + inSlope: -2.2000005 + outSlope: -2.2000005 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 2.9333334 - value: 2.22 + value: -0.66 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -921,8 +741,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.0333333 - value: 1 + time: 3 + value: -0.66 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -930,8 +750,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.1666667 - value: 1.95 + time: 3.0666666 + value: 0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.2666667 + value: -0.4 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -940,16 +769,16 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 3.3333333 - value: 1.28 - inSlope: 0 - outSlope: 0 + value: -0.25 + inSlope: 4.499996 + outSlope: 4.499996 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 3.4 - value: 2 + value: 0.25 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -957,17 +786,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.4666667 - value: 1.85 - inSlope: -4.5000033 - outSlope: -4.5000033 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.5333333 - value: 1.05 + time: 3.5 + value: -0.84 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -975,17 +795,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.6333334 - value: 1.85 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.6666667 - value: 1.6 + time: 3.6 + value: -0.25 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1020,24 +831,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.6666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.73333335 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.8333333 value: 0 @@ -1048,7 +841,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2 + time: 0.9 value: 0 inSlope: 0 outSlope: 0 @@ -1057,7 +850,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.2666667 + time: 0.96666664 value: 0 inSlope: 0 outSlope: 0 @@ -1066,7 +859,25 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.4666667 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.3666667 value: 0 inSlope: 0 outSlope: 0 @@ -1083,24 +894,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.6 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1.6666666 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 1.7 value: 0 @@ -1111,7 +904,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.7333333 + time: 1.8333334 value: 0 inSlope: 0 outSlope: 0 @@ -1120,7 +913,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.8 + time: 2 value: 0 inSlope: 0 outSlope: 0 @@ -1129,16 +922,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1.9333333 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.0333333 + time: 2.1 value: 0 inSlope: 0 outSlope: 0 @@ -1155,15 +939,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.3 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 2.3333333 value: 0 @@ -1173,15 +948,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.4666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 2.5 value: 0 @@ -1192,7 +958,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.6 + time: 2.5333333 value: 0 inSlope: 0 outSlope: 0 @@ -1210,16 +976,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 2.7 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2.8666666 + time: 2.7333333 value: 0 inSlope: 0 outSlope: 0 @@ -1237,7 +994,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.0333333 + time: 3 value: 0 inSlope: 0 outSlope: 0 @@ -1246,7 +1003,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.1666667 + time: 3.0666666 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.2666667 value: 0 inSlope: 0 outSlope: 0 @@ -1273,7 +1039,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.4666667 + time: 3.5 value: 0 inSlope: 0 outSlope: 0 @@ -1282,25 +1048,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.5333333 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.6333334 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3.6666667 + time: 3.6 value: 0 inSlope: 0 outSlope: 0 diff --git a/Assets/Resources/Sprites/Games/Chameleon/Animations/flyFarCatch.anim b/Assets/Resources/Sprites/Games/Chameleon/Animations/flyFarCatch.anim index 9230fe35d..e6f8100cb 100644 --- a/Assets/Resources/Sprites/Games/Chameleon/Animations/flyFarCatch.anim +++ b/Assets/Resources/Sprites/Games/Chameleon/Animations/flyFarCatch.anim @@ -37,6 +37,15 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 4.88, y: 1.3, 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.033333335 + value: {x: 4.88, y: 1.3, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -46,8 +55,8 @@ AnimationClip: - serializedVersion: 3 time: 0.06666667 value: {x: 0.94, y: -0.39, z: 0} - inSlope: {x: -59.899998, y: -24.099998, z: 0} - outSlope: {x: -59.899998, y: -24.099998, z: 0} + inSlope: {x: -89.85, y: -36.15, z: 0} + outSlope: {x: -89.85, y: -36.15, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -65,7 +74,23 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: - m_ScaleCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 2, y: 2, z: 2} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: impact m_FloatCurves: - curve: serializedVersion: 2 @@ -124,6 +149,13 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3288973319 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -152,6 +184,15 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 4.88 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 4.88 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -161,8 +202,8 @@ AnimationClip: - serializedVersion: 3 time: 0.06666667 value: 0.94 - inSlope: -59.899998 - outSlope: -59.899998 + inSlope: -89.85 + outSlope: -89.85 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -189,6 +230,15 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 1.3 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 1.3 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -198,8 +248,8 @@ AnimationClip: - serializedVersion: 3 time: 0.06666667 value: -0.39 - inSlope: -24.099998 - outSlope: -24.099998 + inSlope: -36.15 + outSlope: -36.15 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -226,6 +276,15 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -342,6 +401,63 @@ AnimationClip: path: impact classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: impact + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: impact + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: impact + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/Assets/Resources/Sprites/Games/Chameleon/Animations/flyFarFall.anim b/Assets/Resources/Sprites/Games/Chameleon/Animations/flyFarFall.anim index 0e575f128..616bcfef4 100644 --- a/Assets/Resources/Sprites/Games/Chameleon/Animations/flyFarFall.anim +++ b/Assets/Resources/Sprites/Games/Chameleon/Animations/flyFarFall.anim @@ -243,7 +243,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.53333336 + m_StopTime: 0.5 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -564,11 +564,4 @@ AnimationClip: script: {fileID: 0} m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: - - time: 0.53333336 - functionName: Destroy - data: - objectReferenceParameter: {fileID: 0} - floatParameter: 0 - intParameter: 0 - messageOptions: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/Chameleon/chameleon_main.png.meta b/Assets/Resources/Sprites/Games/Chameleon/chameleon_main.png.meta index d8f6f778f..e7f6ad8ec 100644 --- a/Assets/Resources/Sprites/Games/Chameleon/chameleon_main.png.meta +++ b/Assets/Resources/Sprites/Games/Chameleon/chameleon_main.png.meta @@ -402,10 +402,10 @@ TextureImporter: name: fly_wing rect: serializedVersion: 2 - x: 2928 - y: 3620 - width: 184 - height: 184 + x: 2944 + y: 3636 + width: 168 + height: 152 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -575,7 +575,7 @@ TextureImporter: width: 120 height: 3871 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] diff --git a/Assets/Resources/Sprites/Games/Chameleon/ref.png b/Assets/Resources/Sprites/Games/Chameleon/ref.png deleted file mode 100644 index 74a61c1a8..000000000 Binary files a/Assets/Resources/Sprites/Games/Chameleon/ref.png and /dev/null differ diff --git a/Assets/Resources/Sprites/Games/Chameleon/ref.png.meta b/Assets/Resources/Sprites/Games/Chameleon/ref.png.meta deleted file mode 100644 index 220d2d2d4..000000000 --- a/Assets/Resources/Sprites/Games/Chameleon/ref.png.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: b317aa9d1e1f1ee42aca5e4837fc8a8e -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Games/Chameleon/Chameleon.cs b/Assets/Scripts/Games/Chameleon/Chameleon.cs index 635516a09..66f46f8f5 100644 --- a/Assets/Scripts/Games/Chameleon/Chameleon.cs +++ b/Assets/Scripts/Games/Chameleon/Chameleon.cs @@ -248,13 +248,14 @@ namespace HeavenStudio.Games public void SpawnFly(double beat, double length, int type) { - currentFly = Instantiate(baseFly, transform).GetComponent(); - currentFly.startBeat = beat; - currentFly.flyType = (FlyType)type; + var newFly = Instantiate(baseFly, transform).GetComponent(); + newFly.startBeat = beat; + newFly.flyType = (FlyType)type; BeatAction.New(instance, new List() { new BeatAction.Action(beat, delegate { + currentFly = newFly; currentFly.gameObject.SetActive(true); currentFly.Init(); }), diff --git a/Assets/Scripts/Games/Chameleon/Fly.cs b/Assets/Scripts/Games/Chameleon/Fly.cs index a853abfcd..b173738d0 100644 --- a/Assets/Scripts/Games/Chameleon/Fly.cs +++ b/Assets/Scripts/Games/Chameleon/Fly.cs @@ -65,7 +65,7 @@ namespace HeavenStudio.Games.Scripts_Chameleon BeatAction.New(this, new List() { - new BeatAction.Action(startBeat + 8, delegate { + new BeatAction.Action(startBeat + 10, delegate { Destroy(); }), });