diff --git a/Game/Assets/Images/falling.PNG b/Game/Assets/Images/falling.PNG new file mode 100644 index 0000000..98ed8b1 Binary files /dev/null and b/Game/Assets/Images/falling.PNG differ diff --git a/Game/Assets/Images/falling.PNG.meta b/Game/Assets/Images/falling.PNG.meta new file mode 100644 index 0000000..2eba748 --- /dev/null +++ b/Game/Assets/Images/falling.PNG.meta @@ -0,0 +1,441 @@ +fileFormatVersion: 2 +guid: b87d6d166e2ebfe42b7f49d28cd77f8b +TextureImporter: + internalIDToNameTable: + - first: + 213: -9014768415921902150 + second: falling_0 + - first: + 213: 7243568698272222819 + second: falling_1 + - first: + 213: 5901366788083902546 + second: falling_2 + - first: + 213: -1641019651515972851 + second: falling_3 + - first: + 213: -5125741572750995838 + second: falling_4 + - first: + 213: -5840372690814078366 + second: falling_5 + - first: + 213: -3224941837257050973 + second: falling_6 + - first: + 213: 5689984790565849692 + second: falling_7 + - first: + 213: -8259552608206265137 + second: falling_8 + - first: + 213: 2444421081260162075 + second: falling_9 + - first: + 213: 5766961013973082264 + second: falling_10 + - first: + 213: 6001597033787815126 + second: falling_11 + - first: + 213: -437042242247633254 + second: falling_12 + - first: + 213: 2432024164053691447 + second: falling_13 + - first: + 213: -1341544785123701876 + second: falling_14 + 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: falling_0 + rect: + serializedVersion: 2 + x: 13 + y: 834 + width: 116 + height: 79 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: abd609453eb15e280800000000000000 + internalID: -9014768415921902150 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: falling_1 + rect: + serializedVersion: 2 + x: 162 + y: 834 + width: 93 + height: 118 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 36e87ae5a53568460800000000000000 + internalID: 7243568698272222819 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: falling_2 + rect: + serializedVersion: 2 + x: 290 + y: 821 + width: 72 + height: 159 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 2586705b3ddd5e150800000000000000 + internalID: 5901366788083902546 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: falling_3 + rect: + serializedVersion: 2 + x: 416 + y: 826 + width: 74 + height: 158 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: d0384f9425de939e0800000000000000 + internalID: -1641019651515972851 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: falling_4 + rect: + serializedVersion: 2 + x: 549 + y: 829 + width: 78 + 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: 28e89b96235bdd8b0800000000000000 + internalID: -5125741572750995838 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: falling_5 + rect: + serializedVersion: 2 + x: 670 + y: 828 + width: 111 + height: 113 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 26272283bf3d2fea0800000000000000 + internalID: -5840372690814078366 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: falling_6 + rect: + serializedVersion: 2 + x: 818 + y: 829 + width: 122 + height: 63 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 3a47ff84c74be33d0800000000000000 + internalID: -3224941837257050973 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: falling_7 + rect: + serializedVersion: 2 + x: 988 + y: 835 + width: 120 + height: 50 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: c5a8d0b2503e6fe40800000000000000 + internalID: 5689984790565849692 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: falling_8 + rect: + serializedVersion: 2 + x: 1136 + y: 838 + width: 108 + height: 59 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: fc4e630f9ac206d80800000000000000 + internalID: -8259552608206265137 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: falling_10 + rect: + serializedVersion: 2 + x: 1268 + y: 838 + width: 138 + height: 75 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 890646fcc7c580050800000000000000 + internalID: 5766961013973082264 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: falling_12 + rect: + serializedVersion: 2 + x: 1426 + y: 839 + width: 138 + height: 106 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: a965dfe65605fe9f0800000000000000 + internalID: -437042242247633254 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: falling_14 + rect: + serializedVersion: 2 + x: 1588 + y: 831 + width: 152 + height: 106 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: c8b8c603020e16de0800000000000000 + internalID: -1341544785123701876 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 46ecefb60cbcd5243988c43756d3c8ee + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + falling_0: -9014768415921902150 + falling_1: 7243568698272222819 + falling_10: 5766961013973082264 + falling_11: 6001597033787815126 + falling_12: -437042242247633254 + falling_13: 2432024164053691447 + falling_14: -1341544785123701876 + falling_2: 5901366788083902546 + falling_3: -1641019651515972851 + falling_4: -5125741572750995838 + falling_5: -5840372690814078366 + falling_6: -3224941837257050973 + falling_7: 5689984790565849692 + falling_8: -8259552608206265137 + falling_9: 2444421081260162075 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Images/falling.anim b/Game/Assets/Images/falling.anim new file mode 100644 index 0000000..12fe24a --- /dev/null +++ b/Game/Assets/Images/falling.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: falling + 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/falling.anim.meta b/Game/Assets/Images/falling.anim.meta new file mode 100644 index 0000000..05c18da --- /dev/null +++ b/Game/Assets/Images/falling.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 82cffab4bd48f3b4db6e7e86cf2c5f5c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Images/falling_0.controller b/Game/Assets/Images/falling_0.controller new file mode 100644 index 0000000..e07e4cf --- /dev/null +++ b/Game/Assets/Images/falling_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: falling_0 + serializedVersion: 6 + m_AnimatorParameters: [] + m_AnimatorLayers: [] + m_EvaluateTransitionsOnStart: 1 diff --git a/Game/Assets/Images/falling_0.controller.meta b/Game/Assets/Images/falling_0.controller.meta new file mode 100644 index 0000000..f3ccc63 --- /dev/null +++ b/Game/Assets/Images/falling_0.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70a63cd6a7cec004bba2e64e91e1d960 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index 0bb898a..185ccab 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -63,10 +63,17 @@ public class DropletMovement : MonoBehaviour if (rb.linearVelocityY > 1) { animator.SetBool("Jumping", true); - } else if (rb.linearVelocityY < 1) + } else { animator.SetBool("Jumping", false); } + if (rb.linearVelocityY < -0.5 && !isGrounded) + { + animator.SetBool("Falling", true); + } else + { + animator.SetBool("Falling", false); + } //Walk animation if (movement.x > 0) { diff --git a/pictures/falling.PNG b/pictures/falling.PNG new file mode 100644 index 0000000..98ed8b1 Binary files /dev/null and b/pictures/falling.PNG differ