diff --git a/Assets/Animations/Enemies/SnowEnemy.anim b/Assets/Animations/Enemies/SnowEnemy.anim index bca60f3..4c936ca 100644 --- a/Assets/Animations/Enemies/SnowEnemy.anim +++ b/Assets/Animations/Enemies/SnowEnemy.anim @@ -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} diff --git a/Assets/DevMocks/Resources/DevMocks/DummyEnemy.prefab b/Assets/DevMocks/Resources/DevMocks/DummyEnemy.prefab index 7f9fa6d..0698252 100644 --- 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 diff --git a/Assets/DevMocks/enemy1.png b/Assets/DevMocks/enemy1.png deleted file mode 100644 index dd302f3..0000000 Binary files a/Assets/DevMocks/enemy1.png and /dev/null differ diff --git a/Assets/DevMocks/enemy1.png.meta b/Assets/DevMocks/enemy1.png.meta deleted file mode 100644 index c22195a..0000000 --- a/Assets/DevMocks/enemy1.png.meta +++ /dev/null @@ -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: diff --git a/Assets/Resources/Enemies/Dumber.prefab b/Assets/Resources/Enemies/SnowEnemyCollision.prefab similarity index 98% rename from Assets/Resources/Enemies/Dumber.prefab rename to Assets/Resources/Enemies/SnowEnemyCollision.prefab index 9205bff..5801df6 100644 --- a/Assets/Resources/Enemies/Dumber.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 diff --git a/Assets/Resources/Enemies/Dumber.prefab.meta b/Assets/Resources/Enemies/SnowEnemyCollision.prefab.meta similarity index 100% rename from Assets/Resources/Enemies/Dumber.prefab.meta rename to Assets/Resources/Enemies/SnowEnemyCollision.prefab.meta diff --git a/Assets/DevMocks/Resources/DevMocks/Dumb.prefab b/Assets/Resources/Enemies/SnowEnemyRandom.prefab similarity index 98% rename from Assets/DevMocks/Resources/DevMocks/Dumb.prefab rename to Assets/Resources/Enemies/SnowEnemyRandom.prefab index 2ee8615..752a79e 100644 --- a/Assets/DevMocks/Resources/DevMocks/Dumb.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 diff --git a/Assets/DevMocks/Resources/DevMocks/Dumb.prefab.meta b/Assets/Resources/Enemies/SnowEnemyRandom.prefab.meta similarity index 100% rename from Assets/DevMocks/Resources/DevMocks/Dumb.prefab.meta rename to Assets/Resources/Enemies/SnowEnemyRandom.prefab.meta diff --git a/Assets/Scripts/src/Helpers/PrefabAtlas.cs b/Assets/Scripts/src/Helpers/PrefabAtlas.cs index b161db5..b2a7e39 100644 --- a/Assets/Scripts/src/Helpers/PrefabAtlas.cs +++ b/Assets/Scripts/src/Helpers/PrefabAtlas.cs @@ -21,7 +21,7 @@ namespace src.Helpers Resources.Load("DevMocks/FlameUpgrade"); /* Enemies */ - public static readonly GameObject GreenEnemy = Resources.Load("Enemies/Dumber"); - public static readonly GameObject RedEnemy = Resources.Load("DevMocks/Dumb"); + public static readonly GameObject GreenEnemy = Resources.Load("Enemies/SnowEnemyRandom"); + public static readonly GameObject RedEnemy = Resources.Load("Enemies/SnowEnemyCollision"); } } \ No newline at end of file diff --git a/Assets/Sprites/Enemies/snowenemy.png b/Assets/Sprites/Enemies/snowenemy.png deleted file mode 100644 index b212f4e..0000000 Binary files a/Assets/Sprites/Enemies/snowenemy.png and /dev/null differ diff --git a/Assets/Sprites/Enemies/snowenemyv2.png b/Assets/Sprites/Enemies/snowenemyv2.png new file mode 100644 index 0000000..0686d4b Binary files /dev/null and b/Assets/Sprites/Enemies/snowenemyv2.png differ diff --git a/Assets/Sprites/Enemies/snowenemy.png.meta b/Assets/Sprites/Enemies/snowenemyv2.png.meta similarity index 90% rename from Assets/Sprites/Enemies/snowenemy.png.meta rename to Assets/Sprites/Enemies/snowenemyv2.png.meta index 50b0729..feb31ea 100644 --- a/Assets/Sprites/Enemies/snowenemy.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: []