diff --git a/Assets/scripts/CharacterController.cs b/Assets/scripts/CharacterController.cs index 912f0d1..c916f6f 100644 --- a/Assets/scripts/CharacterController.cs +++ b/Assets/scripts/CharacterController.cs @@ -11,7 +11,7 @@ public class CharacterController : MonoBehaviour void Start () { - InputManager.Instance.PushActiveContext("Normal", (int)playerNumber); + //InputManager.Instance.PushActiveContext("Normal", (int)playerNumber); InputManager.Instance.AddCallback((int)playerNumber, HandlePlayerAxis); InputManager.Instance.AddCallback((int)playerNumber, HandlePlayerButtons); diff --git a/Assets/scripts/LevelManager.cs b/Assets/scripts/LevelManager.cs index 21e763d..000d75b 100644 --- a/Assets/scripts/LevelManager.cs +++ b/Assets/scripts/LevelManager.cs @@ -39,12 +39,15 @@ public class LevelManager : MonoBehaviour { yield return StartCoroutine(FadeOutNumber(Icon2)); yield return StartCoroutine(FadeOutNumber(Icon1)); - yield return StartCoroutine(FadeOutNumber(IconGo)); - for (int i = 0; i < 3; i++) { InputManager.Instance.PushActiveContext("Normal", i); } + + EnableKinematics(false); + + //play start sound + SoundManager.Instance.PlayShortHorn(); } private IEnumerator FadeOutNumber(Image number) @@ -86,20 +89,6 @@ public class LevelManager : MonoBehaviour { // Use this for initialization void Start() { - for (int i = 0; i < 3; i++) - { - InputManager.Instance.PushActiveContext("CinematicEvent", i); - } - - Icon1.gameObject.SetActive(false); - Icon2.gameObject.SetActive(false); - Icon3.gameObject.SetActive(false); - IconGo.gameObject.SetActive(false); - - StartCoroutine(CountDown()); - - - state = GameState.Instance; state.currentLevel = this; int numColumns = state.numColumns; @@ -149,12 +138,24 @@ public class LevelManager : MonoBehaviour { } Selector = GameObject.FindObjectOfType(); - PhysicsContainer = GameObject.Find("PhysicsContainer"); - - //play start sound - SoundManager.Instance.PlayShortHorn(); + PhysicsContainer = GameObject.Find("PhysicsContainer"); + + + EnableKinematics(true); + for (int i = 0; i < 3; i++) + { + InputManager.Instance.PushActiveContext("CinematicEvent", i); + } + + Icon1.gameObject.SetActive(false); + Icon2.gameObject.SetActive(false); + Icon3.gameObject.SetActive(false); + IconGo.gameObject.SetActive(false); + + StartCoroutine(CountDown()); } + /* void Update() { if (Input.GetKeyDown(KeyCode.Space)) @@ -162,7 +163,7 @@ public class LevelManager : MonoBehaviour { StartCoroutine(SendWinnerToTheSky(state.players[1])); StartCoroutine(FadeToDark()); } - } + }*/ public void PressTile(int letterNum, RuneBehaviour tile) {