diff --git a/JAPA/Assets/Scripts/MaskLevel/ButtonHandler.cs b/JAPA/Assets/Scripts/MaskLevel/ButtonHandler.cs index 37a34fff223e093953e3597cce3f0012dadc22b1..b686bd18def47308cac35c42f302f15832d543b6 100644 --- a/JAPA/Assets/Scripts/MaskLevel/ButtonHandler.cs +++ b/JAPA/Assets/Scripts/MaskLevel/ButtonHandler.cs @@ -17,21 +17,29 @@ public class ButtonHandler : MonoBehaviour { private GameObject mons; private GameObject mask; private GameObject masterBH; + private GameObject time; private MonsterHandler scrMons; private MaskHandler scrMask; private MasterButtonHandler scrMBH; + private Timer scrTimer; private GameObject button; [SerializeField] private int idButton; + void Start() + { + } + public void Click () { // basicamente temos que pegar o GameObject para conseguir o Script correspondente, para então conseguir pegar a função que queremos mons = GameObject.Find("MonsterHandler/Monster"); mask = GameObject.Find("MaskHandler/Mask"); masterBH = GameObject.Find("MasterButtonHandler"); + time = GameObject.Find("Canvas/CountDownTimer"); scrMons = mons.GetComponent<MonsterHandler>(); scrMask = mask.GetComponent<MaskHandler>(); scrMBH = masterBH.GetComponent<MasterButtonHandler>(); + scrTimer = time.GetComponent<Timer>(); // só vai trocar a máscara e o monstro se acertou o botão com a máscara if (idButton == scrMask.idMask) @@ -39,6 +47,11 @@ public class ButtonHandler : MonoBehaviour { scrMons.Change(); scrMask.Change(); } + // penalidade de 5 segundos por errar as máscaras + else + { + scrTimer.timeLeft = scrTimer.timeLeft - 5; + } // os botões vão trocar de lugar independentemente se acertou ou não scrMBH.Shuffle(); } diff --git a/JAPA/Assets/Scripts/MaskLevel/Timer.cs b/JAPA/Assets/Scripts/MaskLevel/Timer.cs index b7fcaf0944f05ad93e69f6064cc42998d11e2b63..3671f4825d07c0fbff41eb377b89d0ccfa4e0b26 100644 --- a/JAPA/Assets/Scripts/MaskLevel/Timer.cs +++ b/JAPA/Assets/Scripts/MaskLevel/Timer.cs @@ -14,7 +14,7 @@ using UnityEngine.SceneManagement; public class Timer : MonoBehaviour { - private float timeLeft; // TEMPO EM SEGUNDOS!!! + public float timeLeft; // TEMPO EM SEGUNDOS!!! private UnityEngine.UI.Text textTimer; [SerializeField] private string sceneName; private GameObject mask; diff --git a/JAPA/Library/CurrentLayout.dwlt b/JAPA/Library/CurrentLayout.dwlt index a33e1021877c435c513718f50b9f0f1ad859918d..0511d306f77e478c55c44376b0abf73e9001709e 100644 Binary files a/JAPA/Library/CurrentLayout.dwlt and b/JAPA/Library/CurrentLayout.dwlt differ diff --git a/JAPA/Library/LastSceneManagerSetup.txt b/JAPA/Library/LastSceneManagerSetup.txt index 723122a53dc13b1a096c37ae8439b56e39925ccb..869f65a75b63975fa1106ec2b24dc665dd14aaa9 100644 --- a/JAPA/Library/LastSceneManagerSetup.txt +++ b/JAPA/Library/LastSceneManagerSetup.txt @@ -1,4 +1,4 @@ sceneSetups: -- path: Assets/Scenes/MainMenu.unity +- path: Assets/Scenes/MaskLevel.unity isLoaded: 1 isActive: 1 diff --git a/JAPA/Library/ScriptAssemblies/Assembly-CSharp.dll b/JAPA/Library/ScriptAssemblies/Assembly-CSharp.dll index 8fa146a0a37b177997d6a7fb3ae2941c3b7622d9..27f464e254e7a7822b58c3b01c433b6d950d30b4 100755 Binary files a/JAPA/Library/ScriptAssemblies/Assembly-CSharp.dll and b/JAPA/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/JAPA/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/JAPA/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb index 21aa9794f44e141f512f8d30aa8c5415ebcfbe52..f8e3e67545633029e2f0525de6e725a3ee093c3e 100644 Binary files a/JAPA/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb and b/JAPA/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb differ diff --git a/JAPA/Library/assetDatabase3 b/JAPA/Library/assetDatabase3 index 593b38f4ff3ff9c2b62a7f8dfb49942c22904f32..d3df7efa4c6b3a91190696f0f3bf77c69d625ad7 100644 Binary files a/JAPA/Library/assetDatabase3 and b/JAPA/Library/assetDatabase3 differ diff --git a/JAPA/Library/metadata/00/00000000000000005000000000000000 b/JAPA/Library/metadata/00/00000000000000005000000000000000 index 4ab67cbe71369a08ac89ff311ddee20ad190d9e9..2a53d8f20bffc0dfae03a0850549793b96be4f28 100644 Binary files a/JAPA/Library/metadata/00/00000000000000005000000000000000 and b/JAPA/Library/metadata/00/00000000000000005000000000000000 differ diff --git a/JAPA/Library/metadata/23/23fad73b34d5d407abab57015e3cb549 b/JAPA/Library/metadata/23/23fad73b34d5d407abab57015e3cb549 index a4aee49ac016bc0f62d11b52ee0783e5f8f512ec..0924aba024035408636fde6efc7930d96eab5ebb 100644 Binary files a/JAPA/Library/metadata/23/23fad73b34d5d407abab57015e3cb549 and b/JAPA/Library/metadata/23/23fad73b34d5d407abab57015e3cb549 differ diff --git a/JAPA/Library/metadata/73/7321985de66cf4fa8b3fceb1288a113d b/JAPA/Library/metadata/73/7321985de66cf4fa8b3fceb1288a113d index d21f1250cabeabf3913e14cf24128f6d21f52fec..64d0ffe1ec597555f5fc378b4e00c7df8f52b9e8 100644 Binary files a/JAPA/Library/metadata/73/7321985de66cf4fa8b3fceb1288a113d and b/JAPA/Library/metadata/73/7321985de66cf4fa8b3fceb1288a113d differ