diff --git a/Assets/Resources/LevelSelect/Level13.png b/Assets/Resources/LevelSelect/Level13.png new file mode 100644 index 0000000000000000000000000000000000000000..c1e87cd2294036f66fa392a5d4e7e7c71c9ce1fe --- /dev/null +++ b/Assets/Resources/LevelSelect/Level13.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b614893a40454293d1d9eb00919a27b65d87fe13c9e161e3162e8ff71a17191 +size 59358 diff --git a/Assets/Resources/LevelSelect/Level13.png.meta b/Assets/Resources/LevelSelect/Level13.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..783fa7fca9109089e9ce7dacf1cf9b13b8794994 --- /dev/null +++ b/Assets/Resources/LevelSelect/Level13.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 7e6ab90328c64eb42912d0b1f951661b +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + 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 + - serializedVersion: 2 + buildTarget: Standalone + 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: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/LevelSelect/Level14.png b/Assets/Resources/LevelSelect/Level14.png new file mode 100644 index 0000000000000000000000000000000000000000..69f08a92b39e302257ee1ee332b710dcf4e7af0d --- /dev/null +++ b/Assets/Resources/LevelSelect/Level14.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b2d68adfb0f21bce2b216de6d074439c4001a84c8b4f42a1ebdaef1d959938a +size 53997 diff --git a/Assets/Resources/LevelSelect/Level14.png.meta b/Assets/Resources/LevelSelect/Level14.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..3876edc89fdfe682f96ad5cec77bd91e1cfb5fac --- /dev/null +++ b/Assets/Resources/LevelSelect/Level14.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 1b8fdd0702d61f64e9387ab1e910d911 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + 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 + - serializedVersion: 2 + buildTarget: Standalone + 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: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Game/Prefabs/Player.prefab b/Assets/_Game/Prefabs/Player.prefab index b38f5a2c89bfaf6ac8f77fe56b6e6ab53f29f5bf..e64e6fa168cc8f0feb6535be9ae5a7ecdd33b7e0 100644 --- a/Assets/_Game/Prefabs/Player.prefab +++ b/Assets/_Game/Prefabs/Player.prefab @@ -178,7 +178,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 0.95, y: 0.95} + m_Size: {x: 0.85, y: 0.95} m_EdgeRadius: 0 --- !u!95 &95392249558912674 Animator: diff --git a/Assets/_Game/Scripts/LevelSelectController.cs b/Assets/_Game/Scripts/LevelSelectController.cs index 93eb253bd04466646894cfaaf9a1c0702e5d941b..11d21bcd84a54975d501402e673d72e13ad4f612 100644 --- a/Assets/_Game/Scripts/LevelSelectController.cs +++ b/Assets/_Game/Scripts/LevelSelectController.cs @@ -4,23 +4,20 @@ using UnityEngine; using UnityEngine.UI; public class LevelSelectController : MonoBehaviour { - //[SerializeField] private GameObject levelButtonPrefab; [SerializeField] private GameObject pagePrefab; [SerializeField] private int nonPageObjects = 3; - private int highestLevel; - private int lastLevel; private void Start() { InitalizeLevelSelect(); } /// - /// Locks all currently not unlocked levels + /// Initializes LevelSelect /// public void InitalizeLevelSelect() { - highestLevel = GameManager.Instance.HighestLevel; - lastLevel = GameManager.Instance.LastLevel; + int highestLevel = GameManager.Instance.HighestLevel; + int lastLevel = GameManager.Instance.LastLevel; int pagesNeeded = lastLevel / 6 + 1; int buttonsOnLastPage = lastLevel % 6; GameObject currentPage; @@ -36,24 +33,21 @@ public class LevelSelectController : MonoBehaviour { String buttonName = "ButtonLevel" + j; int levelNr = j + (currentPage.GetComponent().PageNr-1) * 6; - if (GameObject.Find(buttonName) != null) + GameObject button = currentPage.transform.Find(buttonName).gameObject; + Image image = button.transform.Find("Image").GetComponent(); + // Level unlocked + if (levelNr <= highestLevel) { - GameObject button = currentPage.transform.Find(buttonName).gameObject; - Image image = button.transform.Find("Image").GetComponent(); - // Level unlocked - if (levelNr <= highestLevel) - { - string loadStr = levelNr < 10 ? "LevelSelect/Level0" + levelNr : "LevelSelect/Level" + levelNr; - image.sprite = Resources.Load(loadStr, typeof(Sprite)) as Sprite; - button.transform.Find("Text").gameObject.GetComponent().text = levelNr + ""; - button.GetComponent