Fix bomb animation

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: 21300034, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - {fileID: 21300028, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - {fileID: 21300030, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - {fileID: 21300032, 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

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

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

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:

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

Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-03.png.meta

@@ -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: 

ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 2018.4.5f1
+m_EditorVersion: 2018.4.6f1