diff --git a/JAPA/Assets/Scenes/MaskLevel.unity b/JAPA/Assets/Scenes/MaskLevel.unity index 113b350dff3b75008e902698ba2b667a6170aed4..37bbd35c11818510aa4691faca234d19593d0ef7 100644 Binary files a/JAPA/Assets/Scenes/MaskLevel.unity and b/JAPA/Assets/Scenes/MaskLevel.unity differ diff --git a/JAPA/Assets/Scripts/MaskLevel/TextScoreHandler.cs b/JAPA/Assets/Scripts/MaskLevel/TextScoreHandler.cs index 42c121d2c40bc7921bde1565b7d46ae6e22ccda2..a7d3cd931dfb182f637ded7ca613eee59e192dc6 100644 --- a/JAPA/Assets/Scripts/MaskLevel/TextScoreHandler.cs +++ b/JAPA/Assets/Scripts/MaskLevel/TextScoreHandler.cs @@ -12,12 +12,22 @@ using UnityEngine; using UnityEngine.UI; public class TextScoreHandler : MonoBehaviour { - private UnityEngine.UI.Text textScore; + + public string scoreText = "Score: "; + + private Text textScore; + private MaskHandler maskHandler; //referencia ao script MaskHandler void Start () { + // Pegamos das preferências (??) do usuário o score e tals textScore = this.GetComponent<UnityEngine.UI.Text>(); - // Pegamos das preferências (??) do usuário o score e tals - textScore.text = "PONTUAÇÃO: " + PlayerPrefs.GetInt("ScoreMasks"); + maskHandler = FindObjectOfType<MaskHandler>() as MaskHandler; + + textScore.text = scoreText + maskHandler.score; + } + + public void UpdateScore(){ + textScore.text = scoreText + maskHandler.score; } } diff --git a/JAPA/Library/CurrentLayout.dwlt b/JAPA/Library/CurrentLayout.dwlt index 6fccd7e1e2febb36831c9810b57e6b9fc58a9870..3dd517e54b021d23df42a94cac1cff14b4beab2d 100644 Binary files a/JAPA/Library/CurrentLayout.dwlt and b/JAPA/Library/CurrentLayout.dwlt differ diff --git a/JAPA/Library/InspectorExpandedItems.asset b/JAPA/Library/InspectorExpandedItems.asset index 8139973f6053b076e19eec47bf30d718857ad532..ff0ce8cbd6986df9f5d7f529a34e70074401df87 100644 Binary files a/JAPA/Library/InspectorExpandedItems.asset and b/JAPA/Library/InspectorExpandedItems.asset differ diff --git a/JAPA/Library/ScriptAssemblies/Assembly-CSharp.dll b/JAPA/Library/ScriptAssemblies/Assembly-CSharp.dll index 88896cc849dd611ecbfef7f3f6e4018ba851fa69..be8f7c73600f1effa0533d34d850cd3d5d299c75 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 bdc9950d68b7fb27889da8724cc61c069f31c412..74cddb5e2b22bbb60d4814479cd808b61002d25c 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 5d1b57fad60b0decc1ab7972733eeb0f658e59f3..274870c021131f8445bbb33e82612adffb8f689a 100644 Binary files a/JAPA/Library/assetDatabase3 and b/JAPA/Library/assetDatabase3 differ diff --git a/JAPA/Library/metadata/00/00000000000000003000000000000000 b/JAPA/Library/metadata/00/00000000000000003000000000000000 index 90c4a2c1bf1439a8e95bc5cbe4e5252dafd0e320..f9d37a2c0eb7c226dc90d135d0faece7e13639e4 100644 Binary files a/JAPA/Library/metadata/00/00000000000000003000000000000000 and b/JAPA/Library/metadata/00/00000000000000003000000000000000 differ diff --git a/JAPA/Library/metadata/00/00000000000000004000000000000000 b/JAPA/Library/metadata/00/00000000000000004000000000000000 index c72a8ec6cd92a221b289eacc4762072fc30cb37d..462d2220e31313b21ffc325e0cd2b6f61a2e308b 100644 Binary files a/JAPA/Library/metadata/00/00000000000000004000000000000000 and b/JAPA/Library/metadata/00/00000000000000004000000000000000 differ diff --git a/JAPA/Library/metadata/00/00000000000000005000000000000000 b/JAPA/Library/metadata/00/00000000000000005000000000000000 index 6f5999315197f6ebfc978f68de71914cab5e5e9f..b1b25bd5643f4c48e4cb63f416bf105b298579af 100644 Binary files a/JAPA/Library/metadata/00/00000000000000005000000000000000 and b/JAPA/Library/metadata/00/00000000000000005000000000000000 differ diff --git a/JAPA/Library/metadata/00/00000000000000005100000000000000 b/JAPA/Library/metadata/00/00000000000000005100000000000000 index aca94ecf6ae0f4a0dfec8117533d7e3633ab6314..79e52be33f8b4da42144964a9ac4cb959d1084d8 100644 Binary files a/JAPA/Library/metadata/00/00000000000000005100000000000000 and b/JAPA/Library/metadata/00/00000000000000005100000000000000 differ diff --git a/JAPA/Library/metadata/00/00000000000000006100000000000000 b/JAPA/Library/metadata/00/00000000000000006100000000000000 index 77e280ec940d0fa1e862c6f84cb6ee12e24509e0..2f5aa0c55f2c6da29bb5f73bd9e9db8cf65c39c1 100644 Binary files a/JAPA/Library/metadata/00/00000000000000006100000000000000 and b/JAPA/Library/metadata/00/00000000000000006100000000000000 differ diff --git a/JAPA/Library/metadata/00/00000000000000008000000000000000 b/JAPA/Library/metadata/00/00000000000000008000000000000000 index c286bbc29bd684cbfc43d07600a256525d257b9b..792cb2f44f000b81e626f671499a16b77878ab9d 100644 Binary files a/JAPA/Library/metadata/00/00000000000000008000000000000000 and b/JAPA/Library/metadata/00/00000000000000008000000000000000 differ diff --git a/JAPA/Library/metadata/00/0000000000000000b000000000000000 b/JAPA/Library/metadata/00/0000000000000000b000000000000000 index d113bde20b13fba746a027e92a2d88a3cf1268e1..fb01422a1a84c058767fdc1f569075f4a162d2e0 100644 Binary files a/JAPA/Library/metadata/00/0000000000000000b000000000000000 and b/JAPA/Library/metadata/00/0000000000000000b000000000000000 differ diff --git a/JAPA/Library/metadata/64/64b807aeeefb94d6e9fea3ff7a3adcc8 b/JAPA/Library/metadata/64/64b807aeeefb94d6e9fea3ff7a3adcc8 index f0e21fd388a5aea6ea38eb37976f566adf355bdd..fdfaecb4b4a0b404c2016c61ff94b6f3a3cb8f3a 100644 Binary files a/JAPA/Library/metadata/64/64b807aeeefb94d6e9fea3ff7a3adcc8 and b/JAPA/Library/metadata/64/64b807aeeefb94d6e9fea3ff7a3adcc8 differ diff --git a/JAPA/Temp/UnityLockfile b/JAPA/Temp/UnityLockfile new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391