diff --git a/Assets/DevMocks/Resources/DevMocks/BombsUpgrade.prefab b/Assets/Resources/Ammo/BombUpgrade.prefab similarity index 95% rename from Assets/DevMocks/Resources/DevMocks/BombsUpgrade.prefab rename to Assets/Resources/Ammo/BombUpgrade.prefab index d9f443c..73276c5 100644 --- a/Assets/DevMocks/Resources/DevMocks/BombsUpgrade.prefab +++ b/Assets/Resources/Ammo/BombUpgrade.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 7875732231624854186} - component: {fileID: 5909025813549437813} m_Layer: 0 - m_Name: BombsUpgrade + m_Name: BombUpgrade m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -70,8 +70,8 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 753e29d30d8044605aede9853c9308c7, type: 3} - m_Color: {r: 0.9485793, g: 0, b: 1, a: 1} + m_Sprite: {fileID: 21300002, guid: 5b4a5aab9761a49faa85fef071ef948c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 diff --git a/Assets/DevMocks/Resources/DevMocks/BombsUpgrade.prefab.meta b/Assets/Resources/Ammo/BombUpgrade.prefab.meta similarity index 100% rename from Assets/DevMocks/Resources/DevMocks/BombsUpgrade.prefab.meta rename to Assets/Resources/Ammo/BombUpgrade.prefab.meta diff --git a/Assets/DevMocks/Resources/DevMocks/FlameUpgrade.prefab b/Assets/Resources/Ammo/FlameUpgrade.prefab similarity index 96% rename from Assets/DevMocks/Resources/DevMocks/FlameUpgrade.prefab rename to Assets/Resources/Ammo/FlameUpgrade.prefab index 8b3a227..76b0346 100644 --- a/Assets/DevMocks/Resources/DevMocks/FlameUpgrade.prefab +++ b/Assets/Resources/Ammo/FlameUpgrade.prefab @@ -71,8 +71,8 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 753e29d30d8044605aede9853c9308c7, type: 3} - m_Color: {r: 1, g: 0.1812256, b: 0, a: 1} + m_Sprite: {fileID: 21300004, guid: 5b4a5aab9761a49faa85fef071ef948c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 diff --git a/Assets/DevMocks/Resources/DevMocks/FlameUpgrade.prefab.meta b/Assets/Resources/Ammo/FlameUpgrade.prefab.meta similarity index 100% rename from Assets/DevMocks/Resources/DevMocks/FlameUpgrade.prefab.meta rename to Assets/Resources/Ammo/FlameUpgrade.prefab.meta diff --git a/Assets/DevMocks/Resources/DevMocks/SpeedUpgrade.prefab b/Assets/Resources/Ammo/SpeedUpgrade.prefab similarity index 96% rename from Assets/DevMocks/Resources/DevMocks/SpeedUpgrade.prefab rename to Assets/Resources/Ammo/SpeedUpgrade.prefab index 97f31ac..e8a7372 100644 --- a/Assets/DevMocks/Resources/DevMocks/SpeedUpgrade.prefab +++ b/Assets/Resources/Ammo/SpeedUpgrade.prefab @@ -70,8 +70,8 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 753e29d30d8044605aede9853c9308c7, type: 3} - m_Color: {r: 0.97521883, g: 0.9811321, b: 0, a: 1} + m_Sprite: {fileID: 21300006, guid: 5b4a5aab9761a49faa85fef071ef948c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 diff --git a/Assets/DevMocks/Resources/DevMocks/SpeedUpgrade.prefab.meta b/Assets/Resources/Ammo/SpeedUpgrade.prefab.meta similarity index 100% rename from Assets/DevMocks/Resources/DevMocks/SpeedUpgrade.prefab.meta rename to Assets/Resources/Ammo/SpeedUpgrade.prefab.meta diff --git a/Assets/Scripts/src/Helpers/PrefabAtlas.cs b/Assets/Scripts/src/Helpers/PrefabAtlas.cs index b2a7e39..cd48e83 100644 --- a/Assets/Scripts/src/Helpers/PrefabAtlas.cs +++ b/Assets/Scripts/src/Helpers/PrefabAtlas.cs @@ -14,11 +14,11 @@ namespace src.Helpers /* Upgrades */ public static readonly GameObject SpeedIncreaseUpgrade = - Resources.Load("DevMocks/SpeedUpgrade"); + Resources.Load("Ammo/SpeedUpgrade"); public static readonly GameObject BombsIncreaseUpgrade = - Resources.Load("DevMocks/BombsUpgrade"); + Resources.Load("Ammo/BombUpgrade"); public static readonly GameObject FlamesIncreaseUpgrade = - Resources.Load("DevMocks/FlameUpgrade"); + Resources.Load("Ammo/FlameUpgrade"); /* Enemies */ public static readonly GameObject GreenEnemy = Resources.Load("Enemies/SnowEnemyRandom"); diff --git a/Assets/Sprites/Ammo/upgrades.png b/Assets/Sprites/Ammo/upgrades.png new file mode 100644 index 0000000..188bda0 Binary files /dev/null and b/Assets/Sprites/Ammo/upgrades.png differ diff --git a/Assets/Sprites/Ammo/upgrades.png.meta b/Assets/Sprites/Ammo/upgrades.png.meta new file mode 100644 index 0000000..b40cb13 --- /dev/null +++ b/Assets/Sprites/Ammo/upgrades.png.meta @@ -0,0 +1,194 @@ +fileFormatVersion: 2 +guid: 5b4a5aab9761a49faa85fef071ef948c +TextureImporter: + fileIDToRecycleName: + 21300000: upgrades_0 + 21300002: upgrades_1 + 21300004: upgrades_2 + 21300006: upgrades_3 + 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: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 6 + spritePivot: {x: 0, y: 0} + 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 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: upgrades_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 32 + height: 32 + alignment: 6 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 25b2f4026159f4642ba9a7e973ac63b4 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: upgrades_1 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 32 + height: 32 + alignment: 6 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 54da74c4272e64e858f5be79168dd101 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: upgrades_2 + rect: + serializedVersion: 2 + x: 64 + y: 0 + width: 32 + height: 32 + alignment: 6 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f3ec2b9ddf3e64c068a07d3120bad65f + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: upgrades_3 + rect: + serializedVersion: 2 + x: 96 + y: 0 + width: 32 + height: 32 + alignment: 6 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: dacf66ed1d17e437291ab74d1b8329dd + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: ba1fc6bb779234f728847af2ddd7fdb4 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: