diff --git a/MuseumGame/Assets/Prefabs/Player.prefab b/MuseumGame/Assets/Prefabs/Player.prefab index ca7179f..8cc71d4 100644 --- a/MuseumGame/Assets/Prefabs/Player.prefab +++ b/MuseumGame/Assets/Prefabs/Player.prefab @@ -18,6 +18,7 @@ GameObject: - component: {fileID: 971613887410275354} - component: {fileID: 7510283663755342960} - component: {fileID: 9001604349646828647} + - component: {fileID: 4469907059167699923} m_Layer: 0 m_Name: Player m_TagString: Player @@ -34,7 +35,7 @@ Transform: m_GameObject: {fileID: 374150667840124763} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.9691858, y: -0.41703698, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.5, y: 1.5, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -142,8 +143,8 @@ CapsuleCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0.00000011920929, y: 0} - m_Size: {x: 0.5297587, y: 1.28} + m_Offset: {x: -0.0069465637, y: 0.008335909} + m_Size: {x: 0.47140664, y: 1.1799681} m_Direction: 0 --- !u!50 &4572441351392969366 Rigidbody2D: @@ -307,7 +308,7 @@ BoxCollider2D: m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0.0020840168, y: 0} + m_Offset: {x: -0.0062519684, y: 0.31051648} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} @@ -318,5 +319,18 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 0.53392696, y: 1.28} + m_Size: {x: 0.4839111, y: 0.6089511} m_EdgeRadius: 0 +--- !u!114 &4469907059167699923 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 374150667840124763} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 37e947767f230cb45b7cca13e4b4dbb3, type: 3} + m_Name: + m_EditorClassIdentifier: + isShrunk: 0 diff --git a/MuseumGame/Assets/Scripts/GameManager.cs b/MuseumGame/Assets/Scripts/GameManager.cs index 5ad8f26..43b596f 100644 --- a/MuseumGame/Assets/Scripts/GameManager.cs +++ b/MuseumGame/Assets/Scripts/GameManager.cs @@ -55,6 +55,8 @@ public class GameManager : MonoBehaviour // Start is called before the first frame update void Start() { + obtainedPowerups.Add(Powerup.Shrink); + powerupStatus.Add(false); if (sceneToLoad != "") { LoadLevel(sceneToLoad, new Vector3(0, 0, 0)); @@ -136,13 +138,11 @@ public class GameManager : MonoBehaviour if (obtainedPowerups.Contains(Powerup.Shrink)) { - if (Input.GetKeyDown("2") && !player.GetComponent().isShrunk) + + if (Input.GetKeyDown("2")) { player.GetComponent().startShrinking(); - } - if (Input.GetKeyDown("2") && player.GetComponent().isShrunk) - { - player.GetComponent().startUnShrinking(); + Debug.Log("Start Shrink Logic"); } } } diff --git a/MuseumGame/Assets/Scripts/Shrink.cs b/MuseumGame/Assets/Scripts/Shrink.cs index b9aeeda..21edfd7 100644 --- a/MuseumGame/Assets/Scripts/Shrink.cs +++ b/MuseumGame/Assets/Scripts/Shrink.cs @@ -4,13 +4,17 @@ using UnityEngine; public class Shrink : MonoBehaviour { - private GameObject player; + private Rigidbody2D rb2d; + private CapsuleCollider2D col; private bool canUnShrink = true; - public bool isShrunk = true; + public bool isShrunk = false; + private float scaleShrink = (6f/7f); + private float scaleUnShrink = (7f/6f); // Start is called before the first frame update void Start() { - player = GetComponent(); + rb2d = GetComponent(); + col = GetComponent(); } // Update is called once per frame @@ -21,37 +25,43 @@ public class Shrink : MonoBehaviour public void startShrinking() { - if (canUnShrink) - { - for(int i = 0; i < 3; i++) - { - player.transform.localScale = new Vector3(player.transform.localScale.x * (3 / 4), player.transform.localScale.y * (3 / 4), player.transform.localScale.z); - player.GetComponent().size = new Vector2(player.GetComponent().size.x * (3 / 4), player.GetComponent().size.y * (3 / 4)); - new WaitForSeconds(0.25f); - } - } + StartCoroutine(shrinkLogic()); } - public void startUnShrinking() + IEnumerator shrinkLogic() { - if (canUnShrink) + if (isShrunk) + { + for (int i = 0; i < 4; i++) + { + rb2d.transform.localScale = new Vector3(rb2d.transform.localScale.x * scaleUnShrink, rb2d.transform.localScale.y * scaleUnShrink, rb2d.transform.localScale.z); + col.size = new Vector2(col.size.x * scaleUnShrink, col.size.y * scaleUnShrink); + yield return new WaitForSeconds(0.1f); + } + isShrunk = false; + } + else { - for(int i = 0; i<3; i++) + for (int i = 0; i < 4; i++) { - player.transform.localScale = new Vector3(player.transform.localScale.x * (4 / 3), player.transform.localScale.y * (4 / 3), player.transform.localScale.z); - player.GetComponent().size = new Vector2(player.GetComponent().size.x * (4 / 3), player.GetComponent().size.y * (4 / 3)); - new WaitForSeconds(0.25f); + rb2d.transform.localScale = new Vector3(rb2d.transform.localScale.x * scaleShrink, rb2d.transform.localScale.y * scaleShrink, rb2d.transform.localScale.z); + col.size = new Vector2(col.size.x * scaleShrink, col.size.y * scaleShrink); + yield return new WaitForSeconds(0.1f); } + isShrunk = true; } + StopCoroutine(shrinkLogic()); } private void OnTriggerEnter2D(Collider2D collision) { + Debug.Log("Can't Shrink"); canUnShrink = false; } private void OnTriggerExit2D(Collider2D collision) { + Debug.Log("Can Shrink"); canUnShrink = true; } } diff --git a/MuseumGame/Assets/Sprites/Jungle Background.png.meta b/MuseumGame/Assets/Sprites/Jungle Background.png.meta new file mode 100644 index 0000000..c207c7c --- /dev/null +++ b/MuseumGame/Assets/Sprites/Jungle Background.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: bed1ecc68ed121e4e84e03a61dfb4670 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + vTOnly: 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Sprites/Museum Background.png.meta b/MuseumGame/Assets/Sprites/Museum Background.png.meta new file mode 100644 index 0000000..77d96fe --- /dev/null +++ b/MuseumGame/Assets/Sprites/Museum Background.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 2662424372af2234aa79057d5c1fe55c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + vTOnly: 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index 30828db..eba3aac 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -6,34 +6,34 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c72110203102f3b1c2323391a1e36ece57a2decee22f0 + value: 22424703114646680e0b0227036c6b1505032b292926237e38271427fb flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b + value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c72110203102f3b1c2323391a1e36ece57a2decee22f0 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 vcSharedLogLevel: value: 0d5e400f0650