diff --git a/Game/Assets/Images/jumping right.anim b/Game/Assets/Images/jumping right.anim new file mode 100644 index 0000000..407e817 --- /dev/null +++ b/Game/Assets/Images/jumping right.anim @@ -0,0 +1,53 @@ +%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: jumping right + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + 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: [] + 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: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Game/Assets/Images/jumping right.anim.meta b/Game/Assets/Images/jumping right.anim.meta new file mode 100644 index 0000000..d9cec9a --- /dev/null +++ b/Game/Assets/Images/jumping right.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b76be1607809c9141a874ab201bedc8d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Images/jumping.PNG b/Game/Assets/Images/jumping.PNG new file mode 100644 index 0000000..d20e4c7 Binary files /dev/null and b/Game/Assets/Images/jumping.PNG differ diff --git a/Game/Assets/Images/jumping.PNG.meta b/Game/Assets/Images/jumping.PNG.meta new file mode 100644 index 0000000..6473f02 --- /dev/null +++ b/Game/Assets/Images/jumping.PNG.meta @@ -0,0 +1,299 @@ +fileFormatVersion: 2 +guid: 1a5743977543dfb44b01befce0908281 +TextureImporter: + internalIDToNameTable: + - first: + 213: -1981418222017897944 + second: jumping_0 + - first: + 213: -7642617639853138913 + second: jumping_1 + - first: + 213: 238710075600487543 + second: jumping_2 + - first: + 213: -4932991158002552226 + second: jumping_3 + - first: + 213: -5141622052053764728 + second: jumping_4 + - first: + 213: 4284155304752126467 + second: jumping_5 + - first: + 213: -2720617303241217330 + second: jumping_6 + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 2 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: jumping_0 + rect: + serializedVersion: 2 + x: 4 + y: 38 + width: 156 + height: 104 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 82a132500a69084e0800000000000000 + internalID: -1981418222017897944 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: jumping_1 + rect: + serializedVersion: 2 + x: 220 + y: 38 + width: 167 + height: 83 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: f1c5b66bfb7ffe590800000000000000 + internalID: -7642617639853138913 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: jumping_2 + rect: + serializedVersion: 2 + x: 420 + y: 42 + width: 156 + height: 102 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 774497c8c81105300800000000000000 + internalID: 238710075600487543 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: jumping_3 + rect: + serializedVersion: 2 + x: 618 + y: 42 + width: 132 + height: 143 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: e527d1b8dae7a8bb0800000000000000 + internalID: -4932991158002552226 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: jumping_4 + rect: + serializedVersion: 2 + x: 858 + y: 41 + width: 114 + height: 150 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 88535023cf945a8b0800000000000000 + internalID: -5141622052053764728 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: jumping_5 + rect: + serializedVersion: 2 + x: 1052 + y: 36 + width: 102 + height: 158 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 30a1b5e1d80647b30800000000000000 + internalID: 4284155304752126467 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: jumping_6 + rect: + serializedVersion: 2 + x: 1236 + y: 36 + width: 145 + height: 89 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: ecaa6862afc6e3ad0800000000000000 + internalID: -2720617303241217330 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: ecd8b52641d47ce4ba30158343de3163 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + jumping_0: -1981418222017897944 + jumping_1: -7642617639853138913 + jumping_2: 238710075600487543 + jumping_3: -4932991158002552226 + jumping_4: -5141622052053764728 + jumping_5: 4284155304752126467 + jumping_6: -2720617303241217330 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Images/jumping_0.controller b/Game/Assets/Images/jumping_0.controller new file mode 100644 index 0000000..a319ae7 --- /dev/null +++ b/Game/Assets/Images/jumping_0.controller @@ -0,0 +1,13 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: jumping_0 + serializedVersion: 6 + m_AnimatorParameters: [] + m_AnimatorLayers: [] + m_EvaluateTransitionsOnStart: 1 diff --git a/Game/Assets/Images/jumping_0.controller.meta b/Game/Assets/Images/jumping_0.controller.meta new file mode 100644 index 0000000..d585c01 --- /dev/null +++ b/Game/Assets/Images/jumping_0.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d69e2c8558680414eab773e1b26ede06 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index 9ea8f6b..589bcdf 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -55,10 +55,10 @@ public class DropletMovement : MonoBehaviour { rb.linearVelocity = new Vector2(rb.linearVelocity.x, jumpingPower); } - if (rb.linearVelocityY > 2) + if (rb.linearVelocityY > 1) { animator.SetBool("Jumping", true); - } else if (rb.linearVelocityY < 2) + } else if (rb.linearVelocityY < 1) { animator.SetBool("Jumping", false); }