diff --git a/Assets/Prefabs/Coffee.prefab b/Assets/Prefabs/Coffee.prefab index ab02dee..7249181 100644 --- a/Assets/Prefabs/Coffee.prefab +++ b/Assets/Prefabs/Coffee.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 1747974818995494046} - component: {fileID: 5520736153122788072} - component: {fileID: 1518483160148691188} + - component: {fileID: 6284992550610256572} m_Layer: 0 m_Name: Coffee m_TagString: Untagged @@ -71,7 +72,8 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 66b61c174b527e14e9b5ad791405c46e, type: 3} + m_Sprite: {fileID: 7517966211872351750, guid: 9c84b707645e8ef48a94be5c93579154, + type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -99,7 +101,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1.5, y: 1.5} + oldSize: {x: 0.32, y: 0.4} newSize: {x: 1.5, y: 1.5} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -129,3 +131,22 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!95 &6284992550610256572 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6870250841519595495} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 072f9246749cb8f4b995b74546503fd4, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index 55d0c72..2880398 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -1433,12 +1433,12 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.x - value: 68.03 + value: 67.98 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.y - value: -17.31 + value: -16.84 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -48310,12 +48310,12 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.x - value: 62.25 + value: 63 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.y - value: 13.71 + value: 14.5 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} diff --git a/Assets/Sprites/Collectibles/CoffeAnim.anim b/Assets/Sprites/Collectibles/CoffeAnim.anim new file mode 100644 index 0000000..f518912 --- /dev/null +++ b/Assets/Sprites/Collectibles/CoffeAnim.anim @@ -0,0 +1,89 @@ +%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: CoffeAnim + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 7517966211872351750, guid: 9c84b707645e8ef48a94be5c93579154, + type: 3} + - time: 0.06666667 + value: {fileID: -1599933099690305131, guid: 9c84b707645e8ef48a94be5c93579154, + type: 3} + - time: 0.13333334 + value: {fileID: -7233012564116182953, guid: 9c84b707645e8ef48a94be5c93579154, + type: 3} + - time: 0.2 + value: {fileID: 1030234472550356571, guid: 9c84b707645e8ef48a94be5c93579154, + type: 3} + - time: 0.26666668 + value: {fileID: 1045035048788072705, guid: 9c84b707645e8ef48a94be5c93579154, + type: 3} + - time: 0.33333334 + value: {fileID: -5154125455451761606, guid: 9c84b707645e8ef48a94be5c93579154, + type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 15 + 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 + pptrCurveMapping: + - {fileID: 7517966211872351750, guid: 9c84b707645e8ef48a94be5c93579154, type: 3} + - {fileID: -1599933099690305131, guid: 9c84b707645e8ef48a94be5c93579154, type: 3} + - {fileID: -7233012564116182953, guid: 9c84b707645e8ef48a94be5c93579154, type: 3} + - {fileID: 1030234472550356571, guid: 9c84b707645e8ef48a94be5c93579154, type: 3} + - {fileID: 1045035048788072705, guid: 9c84b707645e8ef48a94be5c93579154, type: 3} + - {fileID: -5154125455451761606, guid: 9c84b707645e8ef48a94be5c93579154, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.4 + 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/Assets/Sprites/Collectibles/CoffeAnim.anim.meta b/Assets/Sprites/Collectibles/CoffeAnim.anim.meta new file mode 100644 index 0000000..30b0b5a --- /dev/null +++ b/Assets/Sprites/Collectibles/CoffeAnim.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7401b18ee010c0c4984e74ff6162d843 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Collectibles/CoffeAnimation.controller b/Assets/Sprites/Collectibles/CoffeAnimation.controller new file mode 100644 index 0000000..9e8a7b9 --- /dev/null +++ b/Assets/Sprites/Collectibles/CoffeAnimation.controller @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-1651270238232514040 +AnimatorStateMachine: + serializedVersion: 5 + 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: 3727255730747774863} + m_Position: {x: 200, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5665259318948550073} + m_Position: {x: 235, y: 65, 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: 5665259318948550073} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CoffeAnimation + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -1651270238232514040} + 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} +--- !u!1102 &3727255730747774863 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CoffeAnimated + 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: 3be0fbec98719384f8085bb2d7fd454a, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &5665259318948550073 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CoffeAnim + 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: 7401b18ee010c0c4984e74ff6162d843, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Sprites/Collectibles/CoffeAnimation.controller.meta b/Assets/Sprites/Collectibles/CoffeAnimation.controller.meta new file mode 100644 index 0000000..064e251 --- /dev/null +++ b/Assets/Sprites/Collectibles/CoffeAnimation.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 072f9246749cb8f4b995b74546503fd4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Collectibles/CoffeeAnimated.png b/Assets/Sprites/Collectibles/CoffeeAnimated.png new file mode 100644 index 0000000..f3f4a49 Binary files /dev/null and b/Assets/Sprites/Collectibles/CoffeeAnimated.png differ diff --git a/Assets/Sprites/Collectibles/CoffeeAnimated.png.meta b/Assets/Sprites/Collectibles/CoffeeAnimated.png.meta new file mode 100644 index 0000000..c194906 --- /dev/null +++ b/Assets/Sprites/Collectibles/CoffeeAnimated.png.meta @@ -0,0 +1,259 @@ +fileFormatVersion: 2 +guid: 9c84b707645e8ef48a94be5c93579154 +TextureImporter: + internalIDToNameTable: + - first: + 213: 7517966211872351750 + second: CoffeeAnimated_0 + - first: + 213: -1599933099690305131 + second: CoffeeAnimated_1 + - first: + 213: -7233012564116182953 + second: CoffeeAnimated_2 + - first: + 213: 1030234472550356571 + second: CoffeeAnimated_3 + - first: + 213: 1045035048788072705 + second: CoffeeAnimated_4 + - first: + 213: -5154125455451761606 + second: CoffeeAnimated_5 + externalObjects: {} + serializedVersion: 10 + 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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + 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: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: CoffeeAnimated_0 + rect: + serializedVersion: 2 + x: 0 + y: 80 + width: 32 + height: 40 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d200ed1e76c056d45bb2ecc761f028ed + internalID: 7517966211872351750 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CoffeeAnimated_1 + rect: + serializedVersion: 2 + x: 32 + y: 80 + width: 32 + height: 40 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 95c51386528e1814d829aa14f7f4c516 + internalID: -1599933099690305131 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CoffeeAnimated_2 + rect: + serializedVersion: 2 + x: 0 + y: 40 + width: 32 + height: 40 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d0ed18f7c3ad12a4bbddd0d5981b9c60 + internalID: -7233012564116182953 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CoffeeAnimated_3 + rect: + serializedVersion: 2 + x: 32 + y: 40 + width: 32 + height: 40 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c5e8f56f784277a44aacd431c521bbe8 + internalID: 1030234472550356571 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CoffeeAnimated_4 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 40 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2698c654ed39c7d4fa02be01d6969f65 + internalID: 1045035048788072705 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: CoffeeAnimated_5 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 40 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 054d9a81e6e7abe458b6f27e7a6059f5 + internalID: -5154125455451761606 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: