diff --git a/Game/Assets/Images/Animations.meta b/Game/Assets/Images/Animations.meta new file mode 100644 index 0000000..a956149 --- /dev/null +++ b/Game/Assets/Images/Animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 23c826d2928b9394c9f07d7e3d6d9ee3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Images/drop down.anim b/Game/Assets/Images/Animations/drop down.anim similarity index 100% rename from Game/Assets/Images/drop down.anim rename to Game/Assets/Images/Animations/drop down.anim diff --git a/Game/Assets/Images/drop down.anim.meta b/Game/Assets/Images/Animations/drop down.anim.meta similarity index 100% rename from Game/Assets/Images/drop down.anim.meta rename to Game/Assets/Images/Animations/drop down.anim.meta diff --git a/Game/Assets/Images/idle.anim b/Game/Assets/Images/Animations/idle.anim similarity index 100% rename from Game/Assets/Images/idle.anim rename to Game/Assets/Images/Animations/idle.anim diff --git a/Game/Assets/Images/idle.anim.meta b/Game/Assets/Images/Animations/idle.anim.meta similarity index 100% rename from Game/Assets/Images/idle.anim.meta rename to Game/Assets/Images/Animations/idle.anim.meta diff --git a/Game/Assets/Images/Animations/jumping right.anim b/Game/Assets/Images/Animations/jumping right.anim new file mode 100644 index 0000000..f8c4db7 --- /dev/null +++ b/Game/Assets/Images/Animations/jumping right.anim @@ -0,0 +1,90 @@ +%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: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -1981418222017897944, guid: 1a5743977543dfb44b01befce0908281, type: 3} + - time: 0.16666667 + value: {fileID: -7642617639853138913, guid: 1a5743977543dfb44b01befce0908281, type: 3} + - time: 0.33333334 + value: {fileID: 238710075600487543, guid: 1a5743977543dfb44b01befce0908281, type: 3} + - time: 0.5 + value: {fileID: -4932991158002552226, guid: 1a5743977543dfb44b01befce0908281, type: 3} + - time: 0.75 + value: {fileID: -5141622052053764728, guid: 1a5743977543dfb44b01befce0908281, type: 3} + - time: 0.9166667 + value: {fileID: 4284155304752126467, guid: 1a5743977543dfb44b01befce0908281, type: 3} + - time: 1.0833334 + value: {fileID: -2720617303241217330, guid: 1a5743977543dfb44b01befce0908281, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -1981418222017897944, guid: 1a5743977543dfb44b01befce0908281, type: 3} + - {fileID: -7642617639853138913, guid: 1a5743977543dfb44b01befce0908281, type: 3} + - {fileID: 238710075600487543, guid: 1a5743977543dfb44b01befce0908281, type: 3} + - {fileID: -4932991158002552226, guid: 1a5743977543dfb44b01befce0908281, type: 3} + - {fileID: -5141622052053764728, guid: 1a5743977543dfb44b01befce0908281, type: 3} + - {fileID: 4284155304752126467, guid: 1a5743977543dfb44b01befce0908281, type: 3} + - {fileID: -2720617303241217330, guid: 1a5743977543dfb44b01befce0908281, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.1666667 + 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/Animations/jumping right.anim.meta b/Game/Assets/Images/Animations/jumping right.anim.meta new file mode 100644 index 0000000..58935a4 --- /dev/null +++ b/Game/Assets/Images/Animations/jumping right.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1f41f029adcef21428ddff934d63f2be +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Images/move left.anim b/Game/Assets/Images/Animations/move left.anim similarity index 100% rename from Game/Assets/Images/move left.anim rename to Game/Assets/Images/Animations/move left.anim diff --git a/Game/Assets/Images/move left.anim.meta b/Game/Assets/Images/Animations/move left.anim.meta similarity index 100% rename from Game/Assets/Images/move left.anim.meta rename to Game/Assets/Images/Animations/move left.anim.meta diff --git a/Game/Assets/Images/move right.anim b/Game/Assets/Images/Animations/move right.anim similarity index 100% rename from Game/Assets/Images/move right.anim rename to Game/Assets/Images/Animations/move right.anim diff --git a/Game/Assets/Images/move right.anim.meta b/Game/Assets/Images/Animations/move right.anim.meta similarity index 100% rename from Game/Assets/Images/move right.anim.meta rename to Game/Assets/Images/Animations/move right.anim.meta diff --git a/Game/Assets/Images/idle sprites_0 3.controller b/Game/Assets/Images/background draft_0 1.controller similarity index 88% rename from Game/Assets/Images/idle sprites_0 3.controller rename to Game/Assets/Images/background draft_0 1.controller index bbfcad2..74f9027 100644 --- a/Game/Assets/Images/idle sprites_0 3.controller +++ b/Game/Assets/Images/background draft_0 1.controller @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1107 &-9124365243215731928 +--- !u!1107 &-6625659448953282070 AnimatorStateMachine: serializedVersion: 7 m_ObjectHideFlags: 1 @@ -10,7 +10,7 @@ AnimatorStateMachine: m_Name: Base Layer m_ChildStates: - serializedVersion: 1 - m_State: {fileID: -7610175620178156115} + m_State: {fileID: 2967134353725817636} m_Position: {x: 200, y: 0, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] @@ -21,8 +21,31 @@ AnimatorStateMachine: 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: -7610175620178156115} ---- !u!1102 &-7610175620178156115 + m_DefaultState: {fileID: 2967134353725817636} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: background draft_0 1 + serializedVersion: 6 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -6625659448953282070} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + m_EvaluateTransitionsOnStart: 1 +--- !u!1102 &2967134353725817636 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -48,26 +71,3 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: idle sprites_0 3 - serializedVersion: 6 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -9124365243215731928} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} - m_EvaluateTransitionsOnStart: 1 diff --git a/Game/Assets/Images/idle sprites_0 3.controller.meta b/Game/Assets/Images/background draft_0 1.controller.meta similarity index 79% rename from Game/Assets/Images/idle sprites_0 3.controller.meta rename to Game/Assets/Images/background draft_0 1.controller.meta index 84e28d2..a52704e 100644 --- a/Game/Assets/Images/idle sprites_0 3.controller.meta +++ b/Game/Assets/Images/background draft_0 1.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a9b46d3d37bd368f182de9e5205623c5 +guid: ce663a33f1b939d45ba7f296e089bbe1 NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/Game/Assets/Images/idle sprites fixed.png b/Game/Assets/Images/idle sprites fixed.png deleted file mode 100644 index 3eb4d81..0000000 Binary files a/Game/Assets/Images/idle sprites fixed.png and /dev/null differ diff --git a/Game/Assets/Images/idle sprites fixed.png.meta b/Game/Assets/Images/idle sprites fixed.png.meta deleted file mode 100644 index 616ac20..0000000 --- a/Game/Assets/Images/idle sprites fixed.png.meta +++ /dev/null @@ -1,416 +0,0 @@ -fileFormatVersion: 2 -guid: 3f7d9158938a30f4fb279dac54851345 -TextureImporter: - internalIDToNameTable: - - first: - 213: -7792483657037416151 - second: idle sprites fixed_0 - - first: - 213: -8279100836940419883 - second: idle sprites fixed_1 - - first: - 213: 6404895348788868116 - second: idle sprites fixed_2 - - first: - 213: -1544957121301416263 - second: idle sprites fixed_3 - - first: - 213: 4487137833266305692 - second: idle sprites fixed_4 - - first: - 213: 4653849531404390667 - second: idle sprites fixed_5 - - first: - 213: 1374861269149759241 - second: idle sprites fixed_6 - - first: - 213: -1479939526787242745 - second: idle sprites fixed_7 - - first: - 213: 5753144094745982381 - second: idle sprites fixed_8 - - first: - 213: 5052285103847608203 - second: idle sprites fixed_9 - - first: - 213: 476988466753665471 - second: idle sprites fixed_10 - 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 - - serializedVersion: 4 - buildTarget: WebGL - 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: idle sprites fixed_0 - rect: - serializedVersion: 2 - x: 6 - 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: 9297f3876698bd390800000000000000 - internalID: -7792483657037416151 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: idle sprites fixed_1 - rect: - serializedVersion: 2 - x: 202 - y: 39 - width: 155 - height: 92 - alignment: 7 - pivot: {x: 0.5, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 5dce68247a9ba1d80800000000000000 - internalID: -8279100836940419883 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: idle sprites fixed_2 - rect: - serializedVersion: 2 - x: 410 - y: 37 - width: 155 - height: 87 - alignment: 7 - pivot: {x: 0.5, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 414bc189262c2e850800000000000000 - internalID: 6404895348788868116 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: idle sprites fixed_3 - rect: - serializedVersion: 2 - x: 609 - y: 38 - width: 163 - 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: 9b67e970fa53f8ae0800000000000000 - internalID: -1544957121301416263 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: idle sprites fixed_4 - rect: - serializedVersion: 2 - x: 808 - y: 36 - width: 168 - height: 80 - alignment: 7 - pivot: {x: 0.5, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: c9add02e514854e30800000000000000 - internalID: 4487137833266305692 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: idle sprites fixed_5 - rect: - serializedVersion: 2 - x: 1003 - y: 35 - width: 177 - height: 76 - alignment: 7 - pivot: {x: 0.5, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: b011a7ddd7bc59040800000000000000 - internalID: 4653849531404390667 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: idle sprites fixed_6 - rect: - serializedVersion: 2 - x: 1203 - y: 37 - width: 182 - height: 64 - alignment: 7 - pivot: {x: 0.5, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 9073d1b3a0d741310800000000000000 - internalID: 1374861269149759241 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: idle sprites fixed_7 - rect: - serializedVersion: 2 - x: 1411 - y: 38 - width: 176 - height: 68 - alignment: 7 - pivot: {x: 0.5, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: 70569c867d2367be0800000000000000 - internalID: -1479939526787242745 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: idle sprites fixed_8 - rect: - serializedVersion: 2 - x: 1635 - y: 40 - width: 163 - height: 84 - alignment: 7 - pivot: {x: 0.5, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: da578fc921647df40800000000000000 - internalID: 5753144094745982381 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: idle sprites fixed_9 - rect: - serializedVersion: 2 - x: 1841 - y: 37 - width: 161 - height: 92 - alignment: 7 - pivot: {x: 0.5, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - customData: - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: b8f85d6a8825d1640800000000000000 - internalID: 5052285103847608203 - vertices: [] - indices: - edges: [] - weights: [] - - serializedVersion: 2 - name: idle sprites fixed_10 - rect: - serializedVersion: 2 - x: 2025 - y: 38 - width: 164 - 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: fb97fcabb7a9e9600800000000000000 - internalID: 476988466753665471 - vertices: [] - indices: - edges: [] - weights: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: fbad1284537742d408dc9b0a13c547a3 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: - idle sprites fixed_0: -7792483657037416151 - idle sprites fixed_1: -8279100836940419883 - idle sprites fixed_10: 476988466753665471 - idle sprites fixed_2: 6404895348788868116 - idle sprites fixed_3: -1544957121301416263 - idle sprites fixed_4: 4487137833266305692 - idle sprites fixed_5: 4653849531404390667 - idle sprites fixed_6: 1374861269149759241 - idle sprites fixed_7: -1479939526787242745 - idle sprites fixed_8: 5753144094745982381 - idle sprites fixed_9: 5052285103847608203 - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Game/Assets/Images/idle sprites fixed_0.controller b/Game/Assets/Images/idle sprites fixed_0.controller index c5c4ac0..20a7c44 100644 --- a/Game/Assets/Images/idle sprites fixed_0.controller +++ b/Game/Assets/Images/idle sprites fixed_0.controller @@ -11,16 +11,19 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 4867714824566219673} - m_Position: {x: 270, y: 110, z: 0} + m_Position: {x: 230, y: 120, z: 0} - serializedVersion: 1 m_State: {fileID: 8946204458583563640} m_Position: {x: 530, y: 110, z: 0} - serializedVersion: 1 m_State: {fileID: 1292901503783358426} - m_Position: {x: 400, y: 200, z: 0} + m_Position: {x: 350, y: 210, z: 0} - serializedVersion: 1 m_State: {fileID: -4100425624255115093} - m_Position: {x: 390, y: 10, z: 0} + m_Position: {x: 570, y: -40, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8147338675811118004} + m_Position: {x: 180, y: -70, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -31,6 +34,60 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 4867714824566219673} +--- !u!1102 &-8147338675811118004 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: jumping + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -7164727715467300533} + - {fileID: 8299691615723081430} + - {fileID: 6358289720488101823} + 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: 1f41f029adcef21428ddff934d63f2be, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-7164727715467300533 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Jumping + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4867714824566219673} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-5345594468514814611 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -62,6 +119,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-5211600808830441514 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Jumping + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8147338675811118004} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.7 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-4100425624255115093 AnimatorState: serializedVersion: 6 @@ -206,6 +288,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-649576450390845453 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Jumping + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8147338675811118004} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.7692308 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-282604017707346780 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -261,6 +368,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: Jumping + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -348,6 +461,7 @@ AnimatorState: - {fileID: -699895348011422805} - {fileID: 711880722001846590} - {fileID: 589212740603625067} + - {fileID: 6624324538121675385} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -436,6 +550,7 @@ AnimatorState: - {fileID: -1912279150782776439} - {fileID: 1899649019099201245} - {fileID: 7253676799287818117} + - {fileID: -649576450390845453} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -482,6 +597,59 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &6358289720488101823 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Jumping + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: WalkingLeft + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1292901503783358426} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.78571427 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &6624324538121675385 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Jumping + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8147338675811118004} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.72727275 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &7253676799287818117 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -513,6 +681,34 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &8299691615723081430 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: WalkingRight + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: Jumping + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8946204458583563640} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.78571427 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &8946204458583563640 AnimatorState: serializedVersion: 6 @@ -527,6 +723,7 @@ AnimatorState: - {fileID: -282604017707346780} - {fileID: -3489521878920140281} - {fileID: -5345594468514814611} + - {fileID: -5211600808830441514} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 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..56f9d60 --- /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: 0 + pivot: {x: 0, 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: 219 + y: 38 + width: 167 + height: 83 + alignment: 0 + pivot: {x: 0, 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: 0 + pivot: {x: 0, 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: 0 + pivot: {x: 0, 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, y: 0} + 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, y: 0} + 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, y: 0} + 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: + 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..b478d37 --- /dev/null +++ b/Game/Assets/Images/jumping_0.controller @@ -0,0 +1,73 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-3458591459711744064 +AnimatorStateMachine: + serializedVersion: 7 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -2860339697208317384} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -2860339697208317384} +--- !u!1102 &-2860339697208317384 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: jumping + 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: 1f41f029adcef21428ddff934d63f2be, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !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: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -3458591459711744064} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + 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/Scenes/0_MainScene.unity b/Game/Assets/Scenes/0_MainScene.unity index f2cbd64..0170351 100644 --- a/Game/Assets/Scenes/0_MainScene.unity +++ b/Game/Assets/Scenes/0_MainScene.unity @@ -2238,6 +2238,10 @@ PrefabInstance: propertyPath: m_GravityScale value: 1.6 objectReference: {fileID: 0} + - target: {fileID: 5971260404453589572, guid: d56297e435f8410a584581d73d99d2e4, type: 3} + propertyPath: m_Animations.Array.size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3} propertyPath: m_LocalPosition.x value: -3.64 diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index 6eb9099..d52a89e 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -55,6 +55,13 @@ public class DropletMovement : MonoBehaviour { rb.linearVelocity = new Vector2(rb.linearVelocity.x, jumpingPower); } + if (rb.linearVelocityY > 2) + { + animator.SetBool("Jumping", true); + } else if (rb.linearVelocityY < 2) + { + animator.SetBool("Jumping", false); + } if (movement.x > 0) { animator.SetBool("WalkingRight", true); animator.SetBool("WalkingLeft", false); diff --git a/pictures/jumping.PNG b/pictures/jumping.PNG new file mode 100644 index 0000000..d20e4c7 Binary files /dev/null and b/pictures/jumping.PNG differ