Merge pull request #68 from dnutiu/bomb-anim

Bomb anim
2019-08-09 21:06:24 +03:00 · 2019-08-09 21:06:24 +03:00 · 408d26c736
commit 408d26c736
parent f28a1efbef 8909f1fbbf
23 changed files with 67 additions and 265 deletions
--- a/Assets/Animations/Ammo/Bomb.anim
+++ b/Assets/Animations/Ammo/Bomb.anim
@ -21,51 +21,57 @@ AnimationClip:
  - curve:
    - time: 0
      value: {fileID: 21300000, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - time: 0.2
+    - time: 0.16666667
      value: {fileID: 21300002, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - time: 0.4
+    - time: 0.33333334
      value: {fileID: 21300004, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - time: 0.6
+    - time: 0.5
      value: {fileID: 21300006, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - time: 0.8
+    - time: 0.6666667
      value: {fileID: 21300008, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - time: 1
+    - time: 0.8333333
      value: {fileID: 21300010, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - time: 1.2
+    - time: 1
+      value: {fileID: 21300012, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
+    - time: 1.1666666
      value: {fileID: 21300014, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - time: 1.4
+    - time: 1.3333334
      value: {fileID: 21300016, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - time: 1.6
+    - time: 1.5
      value: {fileID: 21300018, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - time: 1.8
+    - time: 1.6666666
      value: {fileID: 21300020, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - time: 2
+    - time: 1.8333334
      value: {fileID: 21300022, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - time: 2.2
+    - time: 2
      value: {fileID: 21300024, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - time: 2.4
+    - time: 2.1666667
      value: {fileID: 21300026, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - time: 2.6
+    - time: 2.3333333
      value: {fileID: 21300028, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - time: 2.8
+    - time: 2.5
      value: {fileID: 21300030, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - time: 3
+    - time: 2.6666667
      value: {fileID: 21300032, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - time: 3.2
+    - time: 2.8333333
+      value: {fileID: 21300034, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
+    - time: 3
      value: {fileID: 21300036, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - time: 3.4
+    - time: 3.1666667
      value: {fileID: 21300038, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - time: 3.6
+    - time: 3.3333333
      value: {fileID: 21300040, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - time: 3.8
+    - time: 3.5
      value: {fileID: 21300042, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
-    - time: 4
+    - time: 3.6666667
      value: {fileID: 21300044, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
+    - time: 3.8333333
+      value: {fileID: 21300046, guid: 1611b607563ac5b4d919348f10e92487, type: 3}
    attribute: m_Sprite
    path: 
    classID: 212
    script: {fileID: 0}
-  m_SampleRate: 5
+  m_SampleRate: 6
  m_WrapMode: 0
  m_Bounds:
    m_Center: {x: 0, y: 0, z: 0}
@ -86,6 +92,7 @@ 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}
@ -96,17 +103,19 @@ AnimationClip:
    - {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
--- 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
--- 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
@ -20,9 +20,9 @@ AnimationClip:
  m_PPtrCurves:
  - curve:
    - time: 0
-      value: {fileID: 21300000, guid: 7fe20d448d7a54c2a8c561fb5736f00b, type: 3}
+      value: {fileID: 21300000, guid: 0c80326efa3e64cfca08717f4109832b, type: 3}
    - time: 0.16666667
-      value: {fileID: 21300002, guid: 7fe20d448d7a54c2a8c561fb5736f00b, type: 3}
+      value: {fileID: 21300002, guid: 0c80326efa3e64cfca08717f4109832b, type: 3}
    attribute: m_Sprite
    path: 
    classID: 212
@ -42,8 +42,8 @@ AnimationClip:
      customType: 23
      isPPtrCurve: 1
    pptrCurveMapping:
-    - {fileID: 21300000, guid: 7fe20d448d7a54c2a8c561fb5736f00b, type: 3}
-    - {fileID: 21300002, guid: 7fe20d448d7a54c2a8c561fb5736f00b, type: 3}
+    - {fileID: 21300000, guid: 0c80326efa3e64cfca08717f4109832b, type: 3}
+    - {fileID: 21300002, guid: 0c80326efa3e64cfca08717f4109832b, type: 3}
  m_AnimationClipSettings:
    serializedVersion: 2
    m_AdditiveReferencePoseClip: {fileID: 0}
--- 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:
--- a/Assets/DevMocks/Resources/DevMocks/DummyEnemy.prefab
+++ b/Assets/DevMocks/Resources/DevMocks/DummyEnemy.prefab
@ -162,7 +162,7 @@ SpriteRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 55fee6a02b8d5bc4e993261a717e89cc, type: 3}
+  m_Sprite: {fileID: 21300002, guid: 0c80326efa3e64cfca08717f4109832b, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
  m_FlipY: 0
--- a/Assets/DevMocks/enemy1.png
+++ b/Assets/DevMocks/enemy1.png
--- a/Assets/DevMocks/enemy1.png.meta
+++ b/Assets/DevMocks/enemy1.png.meta
@ -1,99 +0,0 @@
-fileFormatVersion: 2
-guid: 55fee6a02b8d5bc4e993261a717e89cc
-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: 0
-    aniso: -1
-    mipBias: -100
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 6
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 32
-  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: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5d310d0120df55e4c86df3d39d7addcc
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- 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
--- a/Assets/Resources/Enemies/SnowEnemyCollision.prefab
+++ b/Assets/Resources/Enemies/SnowEnemyCollision.prefab
@ -13,7 +13,7 @@ GameObject:
  - component: {fileID: 3292464784200894759}
  - component: {fileID: 2823282795561844331}
  m_Layer: 14
-  m_Name: Dumber
+  m_Name: SnowEnemyCollision
  m_TagString: Enemy
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -181,7 +181,7 @@ SpriteRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 7fe20d448d7a54c2a8c561fb5736f00b, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0c80326efa3e64cfca08717f4109832b, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
  m_FlipY: 0
--- a/Assets/Resources/Enemies/SnowEnemyCollision.prefab.meta
+++ b/Assets/Resources/Enemies/SnowEnemyCollision.prefab.meta
--- a/Assets/Resources/Enemies/SnowEnemyRandom.prefab
+++ b/Assets/Resources/Enemies/SnowEnemyRandom.prefab
@ -69,7 +69,7 @@ SpriteRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 7fe20d448d7a54c2a8c561fb5736f00b, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0c80326efa3e64cfca08717f4109832b, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
  m_FlipY: 0
@ -113,7 +113,7 @@ GameObject:
  - component: {fileID: 7110750718968962680}
  - component: {fileID: 430766997717814334}
  m_Layer: 14
-  m_Name: Dumb
+  m_Name: SnowEnemyRandom
  m_TagString: Enemy
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
--- a/Assets/Resources/Enemies/SnowEnemyRandom.prefab.meta
+++ b/Assets/Resources/Enemies/SnowEnemyRandom.prefab.meta
--- a/Assets/Scenes/GameScene.unity
+++ b/Assets/Scenes/GameScene.unity
@ -299,7 +299,7 @@ PrefabInstance:
    - target: {fileID: 485484359815032853, guid: a977eab75b5324ec4b659c2e2a0e9cfd,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: 7.7734566
+      value: 12.62452
      objectReference: {fileID: 0}
    - target: {fileID: 485484359815032853, guid: a977eab75b5324ec4b659c2e2a0e9cfd,
        type: 3}
@ -309,7 +309,7 @@ PrefabInstance:
    - target: {fileID: 485484359815032853, guid: a977eab75b5324ec4b659c2e2a0e9cfd,
        type: 3}
      propertyPath: m_LocalPosition.z
-      value: -2.7893844
+      value: -10
      objectReference: {fileID: 0}
    - target: {fileID: 485484359815032853, guid: a977eab75b5324ec4b659c2e2a0e9cfd,
        type: 3}
--- a/Assets/Scripts/src/Helpers/PrefabAtlas.cs
+++ b/Assets/Scripts/src/Helpers/PrefabAtlas.cs
@ -21,7 +21,7 @@ namespace src.Helpers
            Resources.Load<GameObject>("DevMocks/FlameUpgrade");

        /* Enemies */
-        public static readonly GameObject GreenEnemy = Resources.Load<GameObject>("Enemies/Dumber");
-        public static readonly GameObject RedEnemy = Resources.Load<GameObject>("DevMocks/Dumb");
+        public static readonly GameObject GreenEnemy = Resources.Load<GameObject>("Enemies/SnowEnemyRandom");
+        public static readonly GameObject RedEnemy = Resources.Load<GameObject>("Enemies/SnowEnemyCollision");
    }
 }
--- a/Assets/Scripts/src/Level/LevelManager.cs
+++ b/Assets/Scripts/src/Level/LevelManager.cs
@ -12,8 +12,8 @@ namespace src.Level
    public class LevelManager : GameplayComponent, IDynamicLevelData
    {
        /** Safe-zone coordinates to prevent enemies to instantly kill you*/
-        private const int XMaxEnemyPosition = 4;
-        private const int YMinEnemyPosition = -4;
+        private const int XMaxEnemyPosition = 5;
+        private const int YMinEnemyPosition = -5;

        public Count DestructibleWallCount
        {
--- a/Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-03.png
+++ b/Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-03.png
--- a/Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-03.png.meta
+++ b/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: 
--- a/Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-02.png
+++ b/Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-02.png
--- a/Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-02.png.meta
+++ b/Assets/Sprites/Ammo/bman_spritesheet_bomb_v01-02.png.meta
--- a/Assets/Sprites/Enemies/snowenemy.png
+++ b/Assets/Sprites/Enemies/snowenemy.png
--- a/Assets/Sprites/Enemies/snowenemyv2.png
+++ b/Assets/Sprites/Enemies/snowenemyv2.png
--- a/Assets/Sprites/Enemies/snowenemyv2.png.meta
+++ b/Assets/Sprites/Enemies/snowenemyv2.png.meta
@ -1,9 +1,9 @@
 fileFormatVersion: 2
-guid: 7fe20d448d7a54c2a8c561fb5736f00b
+guid: 0c80326efa3e64cfca08717f4109832b
 TextureImporter:
  fileIDToRecycleName:
-    21300000: snowenemy_0
-    21300002: snowenemy_1
+    21300000: snowenemyv2_0
+    21300002: snowenemyv2_1
  externalObjects: {}
  serializedVersion: 9
  mipmaps:
@ -45,8 +45,8 @@ TextureImporter:
  spriteMode: 2
  spriteExtrude: 1
  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
+  alignment: 6
+  spritePivot: {x: 0, y: 0}
  spritePixelsToUnits: 32
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
@ -97,7 +97,7 @@ TextureImporter:
    serializedVersion: 2
    sprites:
    - serializedVersion: 2
-      name: snowenemy_0
+      name: snowenemyv2_0
      rect:
        serializedVersion: 2
        x: 0
@ -111,13 +111,13 @@ TextureImporter:
      physicsShape: []
      tessellationDetail: 0
      bones: []
-      spriteID: 71374260380794020bf4eda4762fc79d
+      spriteID: 7438c6060090f425c97b9b7ae3139618
      vertices: []
      indices: 
      edges: []
      weights: []
    - serializedVersion: 2
-      name: snowenemy_1
+      name: snowenemyv2_1
      rect:
        serializedVersion: 2
        x: 32
@ -131,7 +131,7 @@ TextureImporter:
      physicsShape: []
      tessellationDetail: 0
      bones: []
-      spriteID: 9bbeafb8682044fa5a9e69c3848e6cb0
+      spriteID: f7dbd78e1bae2436e83136f597e79ab2
      vertices: []
      indices: 
      edges: []
@ -139,7 +139,7 @@ TextureImporter:
    outline: []
    physicsShape: []
    bones: []
-    spriteID: 789bcfca2d35c4486b7507cacfabd2a2
+    spriteID: d99660caefb6342a987fce720d7946f5
    vertices: []
    indices: 
    edges: []
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@ -1 +1 @@
-m_EditorVersion: 2018.4.5f1
+m_EditorVersion: 2018.4.6f1