diff --git a/Game/Assets/Images/background draft_0.controller b/Game/Assets/Images/background draft_0.controller new file mode 100644 index 0000000..0ca7608 --- /dev/null +++ b/Game/Assets/Images/background draft_0.controller @@ -0,0 +1,73 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-844201901049536714 +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: -108618924015659875} + 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: -108618924015659875} +--- !u!1102 &-108618924015659875 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: drop down + 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: 7dc1730080821604590361ec8a2ce9a5, 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: background draft_0 + serializedVersion: 6 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -844201901049536714} + 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/background draft_0.controller.meta b/Game/Assets/Images/background draft_0.controller.meta new file mode 100644 index 0000000..ccfb913 --- /dev/null +++ b/Game/Assets/Images/background draft_0.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9ff0ec360fdada94dbec8a37c2f49c13 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Images/drop down.PNG b/Game/Assets/Images/drop down.PNG new file mode 100644 index 0000000..2964456 Binary files /dev/null and b/Game/Assets/Images/drop down.PNG differ diff --git a/Game/Assets/Images/drop down.PNG.meta b/Game/Assets/Images/drop down.PNG.meta new file mode 100644 index 0000000..7c89064 --- /dev/null +++ b/Game/Assets/Images/drop down.PNG.meta @@ -0,0 +1,416 @@ +fileFormatVersion: 2 +guid: 0dbed7c6bfebbbf4e9ef9b8a0c509359 +TextureImporter: + internalIDToNameTable: + - first: + 213: 1693947562976584006 + second: drop down_0 + - first: + 213: 4647063366316319478 + second: drop down_1 + - first: + 213: 3661698911924640465 + second: drop down_2 + - first: + 213: -8335023682811112812 + second: drop down_3 + - first: + 213: -3622804229256288518 + second: drop down_4 + - first: + 213: 7743985285511160238 + second: drop down_5 + - first: + 213: 7742456258712309561 + second: drop down_6 + - first: + 213: -7358445219900629428 + second: drop down_7 + - first: + 213: 6879999240475031715 + second: drop down_8 + - first: + 213: -401902748771934166 + second: drop down_9 + - first: + 213: 8192290844968782505 + second: drop down_10 + - first: + 213: -7765996919172209082 + second: drop down_11 + - first: + 213: 7548467791387054874 + second: drop down_12 + - first: + 213: -2796635709170994973 + second: drop down_13 + 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: drop down_0 + rect: + serializedVersion: 2 + x: 619 + y: 23 + width: 181 + height: 136 + 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: 641ab57655c128710800000000000000 + internalID: 1693947562976584006 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: drop down_1 + rect: + serializedVersion: 2 + x: 833 + y: 12 + width: 144 + height: 168 + 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: 6f2e30ea28fad7040800000000000000 + internalID: 4647063366316319478 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: drop down_2 + rect: + serializedVersion: 2 + x: 1031 + y: 6 + width: 139 + height: 169 + 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: 1dad3b782c7f0d230800000000000000 + internalID: 3661698911924640465 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: drop down_4 + 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: af665687fb639bdc0800000000000000 + internalID: -3622804229256288518 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: drop down_6 + rect: + serializedVersion: 2 + x: 221 + y: 22 + width: 168 + height: 109 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 93f0c8d22fab27b60800000000000000 + internalID: 7742456258712309561 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: drop down_7 + rect: + serializedVersion: 2 + x: 408 + y: 23 + width: 183 + height: 97 + 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: c4ed6a82f0d81e990800000000000000 + internalID: -7358445219900629428 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: drop down_9 + rect: + serializedVersion: 2 + x: 1406 + y: 10 + width: 172 + height: 99 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: a20223154972c6af0800000000000000 + internalID: -401902748771934166 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: drop down_10 + rect: + serializedVersion: 2 + x: 1605 + y: 20 + width: 186 + height: 91 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 9aa8c0f6e1dd0b170800000000000000 + internalID: 8192290844968782505 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: drop down_11 + rect: + serializedVersion: 2 + x: 1813 + y: 25 + width: 185 + height: 67 + alignment: 7 + pivot: {x: 0.5, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 64666f1b2f2a93490800000000000000 + internalID: -7765996919172209082 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: drop down_13 + rect: + serializedVersion: 2 + x: 2031 + y: 26 + 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: 3e0b0b4c3aa5039d0800000000000000 + internalID: -2796635709170994973 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: drop down_14 + rect: + serializedVersion: 2 + x: 1228 + y: 7 + width: 132 + height: 169 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 12f3bb02b257c734f9990713238395d9 + internalID: 131576111 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: f65211e97727b2447ab2b460e705b028 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + drop down_0: 1693947562976584006 + drop down_1: 4647063366316319478 + drop down_10: 8192290844968782505 + drop down_11: -7765996919172209082 + drop down_12: 7548467791387054874 + drop down_13: -2796635709170994973 + drop down_14: 131576111 + drop down_2: 3661698911924640465 + drop down_3: -8335023682811112812 + drop down_4: -3622804229256288518 + drop down_5: 7743985285511160238 + drop down_6: 7742456258712309561 + drop down_7: -7358445219900629428 + drop down_8: 6879999240475031715 + drop down_9: -401902748771934166 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Images/drop down.anim b/Game/Assets/Images/drop down.anim new file mode 100644 index 0000000..5a54034 --- /dev/null +++ b/Game/Assets/Images/drop down.anim @@ -0,0 +1,99 @@ +%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: drop down + 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: -3622804229256288518, guid: 0dbed7c6bfebbbf4e9ef9b8a0c509359, type: 3} + - time: 0.16666667 + value: {fileID: 7742456258712309561, guid: 0dbed7c6bfebbbf4e9ef9b8a0c509359, type: 3} + - time: 0.25 + value: {fileID: -7358445219900629428, guid: 0dbed7c6bfebbbf4e9ef9b8a0c509359, type: 3} + - time: 0.41666666 + value: {fileID: 1693947562976584006, guid: 0dbed7c6bfebbbf4e9ef9b8a0c509359, type: 3} + - time: 0.5833333 + value: {fileID: 4647063366316319478, guid: 0dbed7c6bfebbbf4e9ef9b8a0c509359, type: 3} + - time: 0.75 + value: {fileID: 3661698911924640465, guid: 0dbed7c6bfebbbf4e9ef9b8a0c509359, type: 3} + - time: 1 + value: {fileID: -401902748771934166, guid: 0dbed7c6bfebbbf4e9ef9b8a0c509359, type: 3} + - time: 1.0833334 + value: {fileID: 8192290844968782505, guid: 0dbed7c6bfebbbf4e9ef9b8a0c509359, type: 3} + - time: 1.1666666 + value: {fileID: -7765996919172209082, guid: 0dbed7c6bfebbbf4e9ef9b8a0c509359, type: 3} + - time: 1.4166666 + value: {fileID: -2796635709170994973, guid: 0dbed7c6bfebbbf4e9ef9b8a0c509359, 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: -3622804229256288518, guid: 0dbed7c6bfebbbf4e9ef9b8a0c509359, type: 3} + - {fileID: 7742456258712309561, guid: 0dbed7c6bfebbbf4e9ef9b8a0c509359, type: 3} + - {fileID: -7358445219900629428, guid: 0dbed7c6bfebbbf4e9ef9b8a0c509359, type: 3} + - {fileID: 1693947562976584006, guid: 0dbed7c6bfebbbf4e9ef9b8a0c509359, type: 3} + - {fileID: 4647063366316319478, guid: 0dbed7c6bfebbbf4e9ef9b8a0c509359, type: 3} + - {fileID: 3661698911924640465, guid: 0dbed7c6bfebbbf4e9ef9b8a0c509359, type: 3} + - {fileID: -401902748771934166, guid: 0dbed7c6bfebbbf4e9ef9b8a0c509359, type: 3} + - {fileID: 8192290844968782505, guid: 0dbed7c6bfebbbf4e9ef9b8a0c509359, type: 3} + - {fileID: -7765996919172209082, guid: 0dbed7c6bfebbbf4e9ef9b8a0c509359, type: 3} + - {fileID: -2796635709170994973, guid: 0dbed7c6bfebbbf4e9ef9b8a0c509359, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.5 + 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/drop down.anim.meta b/Game/Assets/Images/drop down.anim.meta new file mode 100644 index 0000000..4e52d79 --- /dev/null +++ b/Game/Assets/Images/drop down.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7dc1730080821604590361ec8a2ce9a5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Images/drop down_0.controller b/Game/Assets/Images/drop down_0.controller new file mode 100644 index 0000000..1cdccde --- /dev/null +++ b/Game/Assets/Images/drop down_0.controller @@ -0,0 +1,73 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-4455177721347192495 +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: 5110075243988375715} + 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: 5110075243988375715} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: drop down_0 + serializedVersion: 6 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -4455177721347192495} + 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 &5110075243988375715 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: drop down + 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: 7dc1730080821604590361ec8a2ce9a5, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Game/Assets/Images/drop down_0.controller.meta b/Game/Assets/Images/drop down_0.controller.meta new file mode 100644 index 0000000..9df8032 --- /dev/null +++ b/Game/Assets/Images/drop down_0.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9ce5a7d6e9b3f9f4587bad30e016cdbe +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Images/idle sprites fixed_0.controller b/Game/Assets/Images/idle sprites fixed_0.controller index 55e8d1d..22d1931 100644 --- a/Game/Assets/Images/idle sprites fixed_0.controller +++ b/Game/Assets/Images/idle sprites fixed_0.controller @@ -18,6 +18,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 1292901503783358426} m_Position: {x: 400, y: 200, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4100425624255115093} + m_Position: {x: 390, y: 10, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -28,6 +31,33 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 4867714824566219673} +--- !u!1102 &-4100425624255115093 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: drop down + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1902467679799337346} + 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: 7dc1730080821604590361ec8a2ce9a5, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &-3489521878920140281 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -161,6 +191,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: Dropping + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -259,6 +295,37 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &1902467679799337346 +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: Dropping + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: WalkingRight + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: WalkingLeft + 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.7692308 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &4867714824566219673 AnimatorState: serializedVersion: 6 @@ -272,6 +339,7 @@ AnimatorState: m_Transitions: - {fileID: -1912279150782776439} - {fileID: 1899649019099201245} + - {fileID: 7253676799287818117} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -287,6 +355,37 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &7253676799287818117 +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: Dropping + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: WalkingRight + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: WalkingLeft + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4100425624255115093} + 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!1102 &8946204458583563640 AnimatorState: serializedVersion: 6 diff --git a/Game/Assets/Scenes/MainScene.unity b/Game/Assets/Scenes/MainScene.unity index b15284c..ee919fe 100644 --- a/Game/Assets/Scenes/MainScene.unity +++ b/Game/Assets/Scenes/MainScene.unity @@ -480,11 +480,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7329357223832181834, guid: 2104fa77ddd078b48b1f646a4be3ccf8, type: 3} propertyPath: m_LocalPosition.x - value: -0.4 + value: -1.0878242 objectReference: {fileID: 0} - target: {fileID: 7329357223832181834, guid: 2104fa77ddd078b48b1f646a4be3ccf8, type: 3} propertyPath: m_LocalPosition.y - value: 12.02 + value: 16.791779 objectReference: {fileID: 0} - target: {fileID: 7329357223832181834, guid: 2104fa77ddd078b48b1f646a4be3ccf8, type: 3} propertyPath: m_LocalPosition.z diff --git a/Game/Assets/Scripts/DropletMovement.cs b/Game/Assets/Scripts/DropletMovement.cs index 11baa7b..07f8ec0 100644 --- a/Game/Assets/Scripts/DropletMovement.cs +++ b/Game/Assets/Scripts/DropletMovement.cs @@ -97,6 +97,7 @@ public class DropletMovement : MonoBehaviour if (!isGrounded){return;} if (Input.GetKeyDown(KeyCode.DownArrow) || Input.GetKeyDown(KeyCode.S)) { + DropDown(); } @@ -200,8 +201,12 @@ public class DropletMovement : MonoBehaviour if (isGrounded && (Input.GetKeyDown(KeyCode.S) || Input.GetKeyDown(KeyCode.DownArrow))) { + animator.SetBool("Dropping", true); + animator.SetBool("WalkingRight", false); + animator.SetBool("WalkingLeft", false); StartCoroutine(DropRoutine()); } + } private IEnumerator DropRoutine() @@ -232,5 +237,6 @@ public class DropletMovement : MonoBehaviour playerCollider.isTrigger = false; isDropping = false; isGrounded = false; + animator.SetBool("Dropping", false); } } \ No newline at end of file