Conjure/OuijaMTLGJ2016
6
0
Fork 0
mirror of https://github.com/ConjureETS/OuijaMTLGJ2016.git synced 2026-03-24 02:01:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

dsggesgsrg

Browse Source
This commit is contained in:
Patrice Vignola 2016-01-31 16:40:34 -05:00
parent 2b39079cbe
commit 852b474c87
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/scripts/CharacterController.cs
View File

@ -11,7 +11,7 @@ public class CharacterController : MonoBehaviour
void Start () 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, HandlePlayerAxis);
InputManager.Instance.AddCallback((int)playerNumber, HandlePlayerButtons); InputManager.Instance.AddCallback((int)playerNumber, HandlePlayerButtons);

39
Assets/scripts/LevelManager.cs
View File

@ -39,12 +39,15 @@ public class LevelManager : MonoBehaviour {
yield return StartCoroutine(FadeOutNumber(Icon2)); yield return StartCoroutine(FadeOutNumber(Icon2));
yield return StartCoroutine(FadeOutNumber(Icon1)); yield return StartCoroutine(FadeOutNumber(Icon1));
yield return StartCoroutine(FadeOutNumber(IconGo));
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
InputManager.Instance.PushActiveContext("Normal", i); InputManager.Instance.PushActiveContext("Normal", i);
} }
EnableKinematics(false);
//play start sound
SoundManager.Instance.PlayShortHorn();
} }
private IEnumerator FadeOutNumber(Image number) private IEnumerator FadeOutNumber(Image number)
@ -86,20 +89,6 @@ public class LevelManager : MonoBehaviour {
// Use this for initialization // Use this for initialization
void Start() 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 = GameState.Instance;
state.currentLevel = this; state.currentLevel = this;
int numColumns = state.numColumns; int numColumns = state.numColumns;
@ -151,10 +140,22 @@ public class LevelManager : MonoBehaviour {
Selector = GameObject.FindObjectOfType<SelectorWithBolts>(); Selector = GameObject.FindObjectOfType<SelectorWithBolts>();
PhysicsContainer = GameObject.Find("PhysicsContainer"); PhysicsContainer = GameObject.Find("PhysicsContainer");
//play start sound
SoundManager.Instance.PlayShortHorn(); 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() void Update()
{ {
if (Input.GetKeyDown(KeyCode.Space)) if (Input.GetKeyDown(KeyCode.Space))
@ -162,7 +163,7 @@ public class LevelManager : MonoBehaviour {
StartCoroutine(SendWinnerToTheSky(state.players[1])); StartCoroutine(SendWinnerToTheSky(state.players[1]));
StartCoroutine(FadeToDark()); StartCoroutine(FadeToDark());
} }
} }*/
public void PressTile(int letterNum, RuneBehaviour tile) public void PressTile(int letterNum, RuneBehaviour tile)
{ {