From 3589834a48743dcef13bc6cf1d84b67cb5f9b10c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denis=20Nu=C8=9Biu?= Date: Fri, 9 Aug 2019 20:32:32 +0300 Subject: [PATCH] Fix bomb animation --- Assets/Animations/Ammo/Bomb.anim | 39 ++++---- Assets/Animations/Ammo/Explosion.anim | 16 ++-- Assets/Animations/Enemies/SnowEnemy.anim | 2 +- .../Animations/Enemies/SnowEnemy.controller | 2 +- Assets/Resources/Ammo/Bomb.prefab | 20 ---- .../Ammo/bman_spritesheet_bomb_v01-03.png | Bin 23854 -> 0 bytes .../bman_spritesheet_bomb_v01-03.png.meta | 88 ------------------ ...n_spritesheet_bomb_v01-02.png => bomb.png} | Bin ...eet_bomb_v01-02.png.meta => bomb.png.meta} | 0 ProjectSettings/ProjectVersion.txt | 2 +- 10 files changed, 29 insertions(+), 140 deletions(-) delete mode 100644 Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-03.png delete mode 100644 Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-03.png.meta rename Assets/Sprites/Ammo/{bman_spritesheet_bomb_v01-02.png => bomb.png} (100%) rename Assets/Sprites/Ammo/{bman_spritesheet_bomb_v01-02.png.meta => bomb.png.meta} (100%) diff --git a/Assets/Animations/Ammo/Bomb.anim b/Assets/Animations/Ammo/Bomb.anim index ed929f8..dcb18ab 100644 --- a/Assets/Animations/Ammo/Bomb.anim +++ b/Assets/Animations/Ammo/Bomb.anim @@ -32,35 +32,33 @@ AnimationClip: - time: 1 value: {fileID: 21300010, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - time: 1.2 - value: {fileID: 21300014, guid: 1611b607563ac5b4d919348f10e92487, type: 3} + value: {fileID: 21300012, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - time: 1.4 - value: {fileID: 21300016, guid: 1611b607563ac5b4d919348f10e92487, type: 3} + value: {fileID: 21300014, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - time: 1.6 - value: {fileID: 21300018, guid: 1611b607563ac5b4d919348f10e92487, type: 3} + value: {fileID: 21300016, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - time: 1.8 - value: {fileID: 21300020, guid: 1611b607563ac5b4d919348f10e92487, type: 3} + value: {fileID: 21300018, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - time: 2 - value: {fileID: 21300022, guid: 1611b607563ac5b4d919348f10e92487, type: 3} + value: {fileID: 21300020, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - time: 2.2 - value: {fileID: 21300024, guid: 1611b607563ac5b4d919348f10e92487, type: 3} + value: {fileID: 21300022, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - time: 2.4 - value: {fileID: 21300026, guid: 1611b607563ac5b4d919348f10e92487, type: 3} + value: {fileID: 21300024, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - time: 2.6 - value: {fileID: 21300028, guid: 1611b607563ac5b4d919348f10e92487, type: 3} + value: {fileID: 21300034, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - time: 2.8 - value: {fileID: 21300030, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - time: 3 - value: {fileID: 21300032, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - time: 3.2 value: {fileID: 21300036, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - time: 3.4 + - time: 3 value: {fileID: 21300038, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - time: 3.6 + - time: 3.2 value: {fileID: 21300040, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - time: 3.8 + - time: 3.4 value: {fileID: 21300042, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - time: 4 + - time: 3.6 value: {fileID: 21300044, guid: 1611b607563ac5b4d919348f10e92487, type: 3} + - time: 3.8 + value: {fileID: 21300046, guid: 1611b607563ac5b4d919348f10e92487, type: 3} attribute: m_Sprite path: classID: 212 @@ -86,27 +84,26 @@ AnimationClip: - {fileID: 21300006, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - {fileID: 21300008, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - {fileID: 21300010, guid: 1611b607563ac5b4d919348f10e92487, type: 3} + - {fileID: 21300012, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - {fileID: 21300014, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - {fileID: 21300016, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - {fileID: 21300018, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - {fileID: 21300020, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - {fileID: 21300022, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - {fileID: 21300024, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - {fileID: 21300026, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - {fileID: 21300028, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - {fileID: 21300030, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - {fileID: 21300032, guid: 1611b607563ac5b4d919348f10e92487, type: 3} + - {fileID: 21300034, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - {fileID: 21300036, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - {fileID: 21300038, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - {fileID: 21300040, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - {fileID: 21300042, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - {fileID: 21300044, guid: 1611b607563ac5b4d919348f10e92487, type: 3} + - {fileID: 21300046, guid: 1611b607563ac5b4d919348f10e92487, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 4.2 + m_StopTime: 4 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/Ammo/Explosion.anim b/Assets/Animations/Ammo/Explosion.anim index cb09551..c6e0a89 100644 --- a/Assets/Animations/Ammo/Explosion.anim +++ b/Assets/Animations/Ammo/Explosion.anim @@ -21,23 +21,23 @@ AnimationClip: - curve: - time: 0 value: {fileID: 21300046, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - time: 0.2 + - time: 0.1 value: {fileID: 21300048, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - time: 0.4 + - time: 0.2 value: {fileID: 21300050, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - time: 0.6 + - time: 0.3 value: {fileID: 21300052, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - time: 0.8 + - time: 0.4 value: {fileID: 21300054, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - time: 1 + - time: 0.5 value: {fileID: 21300056, guid: 1611b607563ac5b4d919348f10e92487, type: 3} - - time: 1.2 + - time: 0.6 value: {fileID: 21300058, guid: 1611b607563ac5b4d919348f10e92487, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} - m_SampleRate: 5 + m_SampleRate: 10 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -64,7 +64,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.4000001 + m_StopTime: 0.70000005 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/Enemies/SnowEnemy.anim b/Assets/Animations/Enemies/SnowEnemy.anim index 2fa0ad4..bca60f3 100644 --- a/Assets/Animations/Enemies/SnowEnemy.anim +++ b/Assets/Animations/Enemies/SnowEnemy.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Dumber + m_Name: SnowEnemy serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/Animations/Enemies/SnowEnemy.controller b/Assets/Animations/Enemies/SnowEnemy.controller index c9c1773..f9b1b23 100644 --- a/Assets/Animations/Enemies/SnowEnemy.controller +++ b/Assets/Animations/Enemies/SnowEnemy.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Dumber + m_Name: SnowEnemy serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Assets/Resources/Ammo/Bomb.prefab b/Assets/Resources/Ammo/Bomb.prefab index 5368d88..49712f2 100644 --- a/Assets/Resources/Ammo/Bomb.prefab +++ b/Assets/Resources/Ammo/Bomb.prefab @@ -110,7 +110,6 @@ GameObject: - component: {fileID: 6884214445299032247} - component: {fileID: 8277411166637495994} - component: {fileID: 1412018915745597861} - - component: {fileID: 662054772667612550} m_Layer: 9 m_Name: Bomb m_TagString: Bomb @@ -169,25 +168,6 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 4 ---- !u!95 &662054772667612550 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5909392949477884267} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 59ef0a1e37fe3024a8d436860c0fcafb, 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 --- !u!1 &8683250532155440700 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-03.png b/Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-03.png deleted file mode 100644 index ecb5637d0b2da8044d9683c10980916417660fe9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23854 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 diff --git a/Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-03.png.meta b/Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-03.png.meta deleted file mode 100644 index 434b35a..0000000 --- a/Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-03.png.meta +++ /dev/null @@ -1,88 +0,0 @@ -fileFormatVersion: 2 -guid: 4c4ca1cd54e20a048ac5674d71a90858 -TextureImporter: - fileIDToRecycleName: {} - externalObjects: {} - serializedVersion: 9 - 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: -1 - aniso: -1 - mipBias: -100 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - 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 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: f834b41e5db02f440ba85b29a7440b42 - vertices: [] - indices: - edges: [] - weights: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-02.png b/Assets/Sprites/Ammo/bomb.png similarity index 100% rename from Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-02.png rename to Assets/Sprites/Ammo/bomb.png diff --git a/Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-02.png.meta b/Assets/Sprites/Ammo/bomb.png.meta similarity index 100% rename from Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-02.png.meta rename to Assets/Sprites/Ammo/bomb.png.meta diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 90c2f6e..4afedaa 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.4.5f1 +m_EditorVersion: 2018.4.6f1