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 85% rename from Assets/DevMocks/Resources/DevMocks/FlameUpgrade.prefab rename to Assets/Resources/Ammo/FlameUpgrade.prefab index 8b3a227..cf52f2c 100644 --- a/Assets/DevMocks/Resources/DevMocks/FlameUpgrade.prefab +++ b/Assets/Resources/Ammo/FlameUpgrade.prefab @@ -12,7 +12,6 @@ GameObject: - component: {fileID: 7037551310800415105} - component: {fileID: 7958292204112110464} - component: {fileID: 5334633105760309190} - - component: {fileID: 6293070509487257227} m_Layer: 0 m_Name: FlameUpgrade m_TagString: Untagged @@ -71,8 +70,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 @@ -120,15 +119,3 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 94153367f2364ab38597c8f4a6521909, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &6293070509487257227 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7385886653159515755} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 94153367f2364ab38597c8f4a6521909, type: 3} - m_Name: - m_EditorClassIdentifier: 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/Resources/Ammo/GoldenBombUpgrade.prefab b/Assets/Resources/Ammo/GoldenBombUpgrade.prefab new file mode 100644 index 0000000..12957c4 --- /dev/null +++ b/Assets/Resources/Ammo/GoldenBombUpgrade.prefab @@ -0,0 +1,121 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4467162782262204990 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5103883358052461890} + - component: {fileID: 3057588250431493961} + - component: {fileID: 234472779121130071} + - component: {fileID: 5391029322786980951} + m_Layer: 0 + m_Name: GoldenBombUpgrade + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5103883358052461890 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4467162782262204990} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 226.39688, y: 753.2948, z: -16.29858} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &3057588250431493961 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4467162782262204990} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 5b4a5aab9761a49faa85fef071ef948c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &234472779121130071 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4467162782262204990} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 13e9051b005746efb7e4ab749d62ad03, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!61 &5391029322786980951 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4467162782262204990} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.5, y: 0.5} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 diff --git a/Assets/Resources/Ammo/GoldenBombUpgrade.prefab.meta b/Assets/Resources/Ammo/GoldenBombUpgrade.prefab.meta new file mode 100644 index 0000000..f6a2186 --- /dev/null +++ b/Assets/Resources/Ammo/GoldenBombUpgrade.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f981d1f62161f491eb8e3806305c32a7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: 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/Packages.txt b/Assets/Scripts/Packages.md similarity index 79% rename from Assets/Scripts/Packages.txt rename to Assets/Scripts/Packages.md index 8a6ffc4..c61f079 100644 --- a/Assets/Scripts/Packages.txt +++ b/Assets/Scripts/Packages.md @@ -6,3 +6,5 @@ Installed Packages: ==== Cinemachine 2.2.9 +TextMeshPro 1.4.1 +PixelPerfect 1.0.1 diff --git a/Assets/Scripts/Packages.txt.meta b/Assets/Scripts/Packages.md.meta similarity index 100% rename from Assets/Scripts/Packages.txt.meta rename to Assets/Scripts/Packages.md.meta diff --git a/Assets/Scripts/src/Helpers/PrefabAtlas.cs b/Assets/Scripts/src/Helpers/PrefabAtlas.cs index b2a7e39..3ca7ae2 100644 --- a/Assets/Scripts/src/Helpers/PrefabAtlas.cs +++ b/Assets/Scripts/src/Helpers/PrefabAtlas.cs @@ -14,11 +14,13 @@ 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"); + public static readonly GameObject GoldenBombUpgrade = + Resources.Load("GoldenBombUpgrade/FlameUpgrade"); /* Enemies */ public static readonly GameObject GreenEnemy = Resources.Load("Enemies/SnowEnemyRandom"); diff --git a/Assets/Scripts/src/Level/LevelData.cs b/Assets/Scripts/src/Level/LevelData.cs index d105df2..7b227bc 100644 --- a/Assets/Scripts/src/Level/LevelData.cs +++ b/Assets/Scripts/src/Level/LevelData.cs @@ -2,7 +2,6 @@ using src.Helpers; namespace src.Level { - using System; using UnityEngine; namespace src.Level @@ -22,11 +21,16 @@ namespace src.Level public static class LevelResource { private static readonly GameObject[] AllUpgrades = - {PrefabAtlas.FlamesIncreaseUpgrade, PrefabAtlas.BombsIncreaseUpgrade, PrefabAtlas.SpeedIncreaseUpgrade}; + { + PrefabAtlas.FlamesIncreaseUpgrade, PrefabAtlas.BombsIncreaseUpgrade, PrefabAtlas.SpeedIncreaseUpgrade, + PrefabAtlas.GoldenBombUpgrade + }; + private static readonly GameObject[] SnowWallsDestructible = {PrefabAtlas.DestructibleSnow, PrefabAtlas.DestructibleHighSnow}; + private static readonly GameObject[] SnowWallsIndestructible = {PrefabAtlas.IndestructibleWoodCrate}; - + /* Used to store information about the level. */ private static readonly LevelData[] LevelData = { diff --git a/Assets/Scripts/src/Upgrade/GoldenBombUpgrade.cs b/Assets/Scripts/src/Upgrade/GoldenBombUpgrade.cs new file mode 100644 index 0000000..afb993e --- /dev/null +++ b/Assets/Scripts/src/Upgrade/GoldenBombUpgrade.cs @@ -0,0 +1,15 @@ +using src.Base; + +namespace src.Upgrade +{ + /* Adds one firepower and one bomb. */ + public class GoldenBombUpgrade : UpgradeBase + { + public override void PerformUpgrade() + { + var bombManager = GameManager.GetBombsUtilManager(); + bombManager.IncreaseAllowedBombs(); + bombManager.IncreasePower(); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/src/Upgrade/GoldenBombUpgrade.cs.meta b/Assets/Scripts/src/Upgrade/GoldenBombUpgrade.cs.meta new file mode 100644 index 0000000..6a5b107 --- /dev/null +++ b/Assets/Scripts/src/Upgrade/GoldenBombUpgrade.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 13e9051b005746efb7e4ab749d62ad03 +timeCreated: 1566031123 \ No newline at end of file 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: