diff --git a/Assets/Animations/LozengeStart.anim b/Assets/Animations/LozengeStart.anim index 626bb2b..8aaf80d 100644 Binary files a/Assets/Animations/LozengeStart.anim and b/Assets/Animations/LozengeStart.anim differ diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 342f912..b57feaf 100644 Binary files a/Assets/Scenes/Game.unity and b/Assets/Scenes/Game.unity differ diff --git a/Assets/Scripts/AnimationEventsManager.cs b/Assets/Scripts/AnimationEventsManager.cs new file mode 100644 index 0000000..8532324 --- /dev/null +++ b/Assets/Scripts/AnimationEventsManager.cs @@ -0,0 +1,10 @@ +using UnityEngine; +using System.Collections; + +public class AnimationEventsManager : MonoBehaviour { + + public void AllAnswersAreDisplayed() + { + UIManager.instance.allAnswersAreDisplayed = true; + } +} diff --git a/Assets/Scripts/AnimationEventsManager.cs.meta b/Assets/Scripts/AnimationEventsManager.cs.meta new file mode 100644 index 0000000..5c4ec0b --- /dev/null +++ b/Assets/Scripts/AnimationEventsManager.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: e5d636fcf8dbf0c438a0672dbbefa493 +timeCreated: 1481468521 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UIManager.cs b/Assets/Scripts/UIManager.cs index 63ce009..e56765a 100644 --- a/Assets/Scripts/UIManager.cs +++ b/Assets/Scripts/UIManager.cs @@ -43,6 +43,8 @@ public class UIManager : MonoBehaviour private bool canCloseAudiencePanel = false; private bool[] panelsStates = new bool[11]; + [HideInInspector] + public bool allAnswersAreDisplayed = false; void Awake() { @@ -294,6 +296,7 @@ public IEnumerator LozengeShowAnswers() public void SetFinalAnswer(int answerNumber) { lozengePanel.GetComponent().enabled = false; // animator doesn't allow to set buttons not interactable + allAnswersAreDisplayed = false; if (answerNumber == 1 || answerNumber == 3) { @@ -464,6 +467,7 @@ public IEnumerator WrondAnswer(int numberOfCorrectAnswer, string totalWining) public void CloseLozengePanel() { lozengePanel.GetComponent().enabled = true; + allAnswersAreDisplayed = false; // making logenze panel invisible lozengePanel.SetActive(false); @@ -789,46 +793,49 @@ public IEnumerator CloseMoneyTreePanel() public void Lifeline5050() { - Lifeline50x50 lifeline5050 = new Lifeline50x50(); - int[] wrongAnswers = lifeline5050.Use(); - lozengePanel.GetComponent().enabled = false; - - //hiding wrong answer 1 - lozengePanel.transform.GetChild(wrongAnswers[0] + 2).GetChild(0).GetComponent().color = new Color32(255, 255, 255, 0); - lozengePanel.transform.GetChild(wrongAnswers[0] + 2).GetChild(1).GetComponent().color = new Color32(255, 255, 255, 0); - lozengePanel.transform.GetChild(wrongAnswers[0] + 2).GetChild(2).gameObject.SetActive(false); - Debug.Log(lozengePanel.transform.GetChild(wrongAnswers[0] + 2).GetChild(2).gameObject.activeSelf); - Debug.Log(lozengePanel.transform.GetChild(wrongAnswers[0] + 2).GetChild(2).gameObject.transform.parent.name); + if (allAnswersAreDisplayed) + { + Lifeline50x50 lifeline5050 = new Lifeline50x50(); + int[] wrongAnswers = lifeline5050.Use(); + lozengePanel.GetComponent().enabled = false; - //hiding wrong answer 2 - lozengePanel.transform.GetChild(wrongAnswers[1] + 2).GetChild(0).GetComponent().color = new Color32(255, 255, 255, 0); - lozengePanel.transform.GetChild(wrongAnswers[1] + 2).GetChild(1).GetComponent().color = new Color32(255, 255, 255, 0); - lozengePanel.transform.GetChild(wrongAnswers[1] + 2).GetChild(2).gameObject.SetActive(false); + //hiding wrong answer 1 + lozengePanel.transform.GetChild(wrongAnswers[0] + 2).GetChild(0).GetComponent().color = new Color32(255, 255, 255, 0); + lozengePanel.transform.GetChild(wrongAnswers[0] + 2).GetChild(1).GetComponent().color = new Color32(255, 255, 255, 0); + lozengePanel.transform.GetChild(wrongAnswers[0] + 2).GetChild(2).gameObject.SetActive(false); - GameProcess.instance.PlayLifeline5050Sound(); + //hiding wrong answer 2 + lozengePanel.transform.GetChild(wrongAnswers[1] + 2).GetChild(0).GetComponent().color = new Color32(255, 255, 255, 0); + lozengePanel.transform.GetChild(wrongAnswers[1] + 2).GetChild(1).GetComponent().color = new Color32(255, 255, 255, 0); + lozengePanel.transform.GetChild(wrongAnswers[1] + 2).GetChild(2).gameObject.SetActive(false); - //making lifeline5050 button not interactable - moneyTreePanel.transform.GetChild(0).GetComponent().sprite = moneyTreeSprites[2]; - moneyTreePanel.transform.GetChild(0).GetComponent