diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity b/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity index b36fc04..3e78ea9 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Tower.unity @@ -3574,7 +3574,7 @@ GameObject: - component: {fileID: 1716577441} m_Layer: 0 m_Name: Oneway - m_TagString: Floor + m_TagString: OneWay m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/MuseumGame/Assets/Scripts/GameManager.cs b/MuseumGame/Assets/Scripts/GameManager.cs index 9d3abd6..d9563e4 100644 --- a/MuseumGame/Assets/Scripts/GameManager.cs +++ b/MuseumGame/Assets/Scripts/GameManager.cs @@ -39,7 +39,6 @@ public class GameManager : MonoBehaviour private AudioSource sound; -s public string sceneToLoad = ""; public AudioClip[] music; @@ -55,8 +54,6 @@ s DontDestroyOnLoad(canvas); DontDestroyOnLoad(events); DontDestroyOnLoad(player); - DontDestroyOnLoad(powerUps); - } else { @@ -81,7 +78,6 @@ s // Update is called once per frame void Update() { - doPowerupCheck(); if (SceneManager.GetActiveScene().name == "Spawn" || SceneManager.GetActiveScene().name == "EnemyTunnel" || SceneManager.GetActiveScene().name == "RouteToTower" || SceneManager.GetActiveScene().name == "Tower" || SceneManager.GetActiveScene().name == "PathToBoss" || SceneManager.GetActiveScene().name == "BossRoom") { sound.clip = music[0]; } else if (SceneManager.GetActiveScene().name == "Museum") { @@ -130,11 +126,6 @@ s spriteToFade.SetActive(false); } - private void doPowerupCheck() - { - - } - public GameObject GetPlayer() { return player; diff --git a/MuseumGame/Assets/Scripts/PowerUp Logic/GliderPowerupPickup.cs b/MuseumGame/Assets/Scripts/PowerUp Logic/GliderPowerupPickup.cs index 218772a..2f700c9 100644 --- a/MuseumGame/Assets/Scripts/PowerUp Logic/GliderPowerupPickup.cs +++ b/MuseumGame/Assets/Scripts/PowerUp Logic/GliderPowerupPickup.cs @@ -19,8 +19,6 @@ public class GliderPowerupPickup : MonoBehaviour private void OnTriggerEnter2D(Collider2D collision) { Debug.Log("Glider Powerup Obtained"); - //GameManager.Instance.obtainedPowerups.Add(Powerup.Glider); - //GameManager.Instance.powerupStatus.Add(false); GameManager.Instance.enablePowerup(0); Destroy(gameObject); } diff --git a/MuseumGame/Assets/Scripts/movement.cs b/MuseumGame/Assets/Scripts/movement.cs index 898ad9b..101e270 100644 --- a/MuseumGame/Assets/Scripts/movement.cs +++ b/MuseumGame/Assets/Scripts/movement.cs @@ -17,8 +17,8 @@ public class movement : MonoBehaviour public float _MinAcc = -1.0f; public float _Deceleration = 2f; public float jumpForce = 350; - public float maxJumps = 1; - private float numJumps; + public int maxJumps = 1; + public int numJumps; private bool isGrounded = true; public AudioClip[] clips; @@ -36,11 +36,6 @@ public class movement : MonoBehaviour // Update is called once per frame void Update() { - if (rb2d.velocity.y < 0.0001f && rb2d.velocity.y > -0.0001f) - { - isGrounded = true; - numJumps = maxJumps; - } if (Input.GetKeyDown("space") && numJumps > 0) { @@ -130,8 +125,18 @@ public class movement : MonoBehaviour } private void OnCollisionEnter2D(Collision2D collision) - { - + { + if (collision.contacts.Length > 0) + { + //http://answers.unity.com/answers/130167/view.html + //Check collisions from the bottom of the player, or from one way platforms to increase jumps. + ContactPoint2D contact = collision.contacts[0]; + if ((Vector3.Dot(contact.normal, Vector3.up) > 0.5) || collision.gameObject.CompareTag("OneWay")) + { + isGrounded = true; + numJumps = maxJumps; + } + } } private void JumpAnimation() diff --git a/MuseumGame/ProjectSettings/TagManager.asset b/MuseumGame/ProjectSettings/TagManager.asset index ca58d51..bfc4950 100644 --- a/MuseumGame/ProjectSettings/TagManager.asset +++ b/MuseumGame/ProjectSettings/TagManager.asset @@ -12,6 +12,7 @@ TagManager: - Dog - Projectile - EnemyPlatform + - OneWay layers: - Default - TransparentFX diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index 1c5f9ee..cd3fa0b 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -6,31 +6,31 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 + value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b + value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3136f4e5380bf2e621e7a92f31352d1b flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3136f4e5380bf2e621e7a92f31352d1b + value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3f3cf1f37a2decee22f0 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3f3cf1f37a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 flags: 0 RecentlyUsedScenePath-9: value: 22424703114646680e0b0227036c72111f19352f223d68252320092a