diff --git a/JAPA/Assembly-CSharp.csproj b/JAPA/Assembly-CSharp.csproj
index 98bb73d151c1d298a1502402d1591646e35e55a4..0bb1a41f9b59dd0d2456aeb8d59009e2321f60c9 100644
--- a/JAPA/Assembly-CSharp.csproj
+++ b/JAPA/Assembly-CSharp.csproj
@@ -92,6 +92,9 @@
<Compile Include="Assets\controlecollision.cs" />
<Compile Include="Assets\controlelimite.cs" />
<Compile Include="Assets\limitesbarril.cs" />
+ <Reference Include="UnityEngine.Advertisements">
+ <HintPath>/opt/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/UnityEngine.Advertisements.dll</HintPath>
+ </Reference>
<Reference Include="UnityEngine.UI">
<HintPath>/opt/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
@@ -107,6 +110,9 @@
<Reference Include="UnityEngine.HoloLens">
<HintPath>/opt/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
</Reference>
+ <Reference Include="UnityEngine.Purchasing">
+ <HintPath>/opt/Unity/Editor/Data/UnityExtensions/Unity/UnityPurchasing/UnityEngine.Purchasing.dll</HintPath>
+ </Reference>
<Reference Include="UnityEngine.VR">
<HintPath>/opt/Unity/Editor/Data/UnityExtensions/Unity/UnityVR/RuntimeEditor/UnityEngine.VR.dll</HintPath>
</Reference>
diff --git a/JAPA/Assets/Prefabs/Tesouro/Mapas/Caverna.prefab b/JAPA/Assets/Prefabs/Tesouro/Mapas/Caverna.prefab
index ec523e083f59ba2032a725ea7155a0f8fe665bd1..049b9c9e4c02969b17513f798b18bbe848ee82fc 100644
Binary files a/JAPA/Assets/Prefabs/Tesouro/Mapas/Caverna.prefab and b/JAPA/Assets/Prefabs/Tesouro/Mapas/Caverna.prefab differ
diff --git a/JAPA/Assets/Scenes/MainMenu.unity b/JAPA/Assets/Scenes/MainMenu.unity
index 0ee278eca52e8ad5a4d526ecc18253e89fceb180..70d980686c6b05073b9c847c62a16630e41f8d66 100644
Binary files a/JAPA/Assets/Scenes/MainMenu.unity and b/JAPA/Assets/Scenes/MainMenu.unity differ
diff --git a/JAPA/Assets/Scenes/MaskLevelBegin.unity b/JAPA/Assets/Scenes/MaskLevelBegin.unity
index 675236d56e1dcb1c6a914d52509c0c4c89ecaf5f..84218c9041ff7c42c62d8794bd56f018d82cd598 100644
Binary files a/JAPA/Assets/Scenes/MaskLevelBegin.unity and b/JAPA/Assets/Scenes/MaskLevelBegin.unity differ
diff --git a/JAPA/Assets/Scenes/MaskLevelEnd.unity b/JAPA/Assets/Scenes/MaskLevelEnd.unity
index 9d2f52cd1d0edf69f7be2d2fc4bf7ff8c7b296f7..1ce53589ee433734e95601c1078d8f5f0749dd1b 100644
Binary files a/JAPA/Assets/Scenes/MaskLevelEnd.unity and b/JAPA/Assets/Scenes/MaskLevelEnd.unity differ
diff --git a/JAPA/Assets/Scenes/MenuFases.unity b/JAPA/Assets/Scenes/MenuFases.unity
index 7b46637906bc22548a288ca8795db3739d1cd757..adc4200fd99daa93f0650ef2852765f7f930ad27 100644
Binary files a/JAPA/Assets/Scenes/MenuFases.unity and b/JAPA/Assets/Scenes/MenuFases.unity differ
diff --git a/JAPA/Assets/Scenes/MoveBarcoBegin.unity b/JAPA/Assets/Scenes/MoveBarcoBegin.unity
index 4dbbeddc0b210c76053d9874c15cdc472ef64c8d..4383a9a48688fffacf445df43ae83f7352445f82 100644
Binary files a/JAPA/Assets/Scenes/MoveBarcoBegin.unity and b/JAPA/Assets/Scenes/MoveBarcoBegin.unity differ
diff --git a/JAPA/Assets/Scenes/Tesouro/Tesouro.unity b/JAPA/Assets/Scenes/Tesouro/Tesouro.unity
index 08c6e3b96357b6c52d392ed96e4682186a9bc8bc..85aec1eac7a7921a01d30b41ac03b8b9b2191656 100644
Binary files a/JAPA/Assets/Scenes/Tesouro/Tesouro.unity and b/JAPA/Assets/Scenes/Tesouro/Tesouro.unity differ
diff --git a/JAPA/Assets/Scenes/Tesouro/TutorialTesouro.unity b/JAPA/Assets/Scenes/Tesouro/TutorialTesouro.unity
index e1f311df1e5416d85f412cfa8ecad14f9803d71e..92ff902b3bd36708625454f0e48974c4f235d236 100644
Binary files a/JAPA/Assets/Scenes/Tesouro/TutorialTesouro.unity and b/JAPA/Assets/Scenes/Tesouro/TutorialTesouro.unity differ
diff --git a/JAPA/Assets/Scripts/Tesouro/LevelManager.cs b/JAPA/Assets/Scripts/Tesouro/LevelManager.cs
index e4f936d288097aa96570ea0867fa98f1cc5ee2ca..5c00e6483d3ee324c96f7832b70ab658d4e0c3b8 100644
--- a/JAPA/Assets/Scripts/Tesouro/LevelManager.cs
+++ b/JAPA/Assets/Scripts/Tesouro/LevelManager.cs
@@ -24,15 +24,6 @@ public class LevelManager : MonoBehaviour {
private PinchZoom pinchZoom;//Referência ao script 'PinchZoom'
- void Awake(){
- //GameManager.GetInstance().ShortOrientation("portrait","only"); --> Usaremos isso quando o GameManager estiver implementado
- //Enquanto não está, usaremos isso para restringir a rotação da tela:
- Screen.autorotateToPortrait = false;
- Screen.autorotateToPortraitUpsideDown = false;
- Screen.autorotateToLandscapeLeft = true;
- Screen.autorotateToLandscapeRight = true;
- Screen.orientation = ScreenOrientation.AutoRotation;
- }
void Start () {
//Recebe o script 'PinchZoom' para usarmos suas funções sem precisar usar 'GetComponent' toda vez
@@ -138,7 +129,7 @@ public class LevelManager : MonoBehaviour {
public void End(bool win){//usamos o parâmetro 'win' para especificar se o jogador ganhou ou perdeu
//Desativamos o 'Timer' porque não queremos que o tempo continue contando
- GetComponent<Timer>().enabled = false;
+ GetComponent<TesouroTimer>().enabled = false;
//Desativa todos os GameObjects em 'disableOnEnd'
foreach (GameObject obj in disableOnEnd)
diff --git a/JAPA/Assets/Scripts/Tesouro/PinchZoom.cs b/JAPA/Assets/Scripts/Tesouro/PinchZoom.cs
index 2f7d5d674574dfcb6650dd2985502fae2c24adf4..61787a7ef408e05753c9aa3d6d3c682f6cf4c308 100644
--- a/JAPA/Assets/Scripts/Tesouro/PinchZoom.cs
+++ b/JAPA/Assets/Scripts/Tesouro/PinchZoom.cs
@@ -163,6 +163,7 @@ public class PinchZoom : MonoBehaviour {
map = Instantiate(miniatureScript.GetMap(), Vector3.zero, Quaternion.identity, canvas.transform);
map.transform.localPosition = Vector3.zero;
map.GetComponent<Map>().SetMap(miniatureScript.GetTreasure());
+ map.transform.SetSiblingIndex(3);
//Armazenamos o tempo da ultima modificação em 'lastChange' para sabermos por quanto a Imagem ficou ativa
lastChange = Time.time;
diff --git a/JAPA/Assets/Sprites/Tesouro/Mapas/caverna.png b/JAPA/Assets/Sprites/Tesouro/Mapas/caverna.png
index c1483b1457c73a9db041591a9d2fc3cf081e5030..63b56894344ab2513c0fefa16d59d4f9076869b4 100644
Binary files a/JAPA/Assets/Sprites/Tesouro/Mapas/caverna.png and b/JAPA/Assets/Sprites/Tesouro/Mapas/caverna.png differ
diff --git a/JAPA/Assets/Sprites/Tesouro/Mapas/caverna.png.meta b/JAPA/Assets/Sprites/Tesouro/Mapas/caverna.png.meta
index cfd2210a03057047fcfe150548d1942c7e4d670e..27eb5d1950a781114f350799fc708286ee0bcb77 100644
--- a/JAPA/Assets/Sprites/Tesouro/Mapas/caverna.png.meta
+++ b/JAPA/Assets/Sprites/Tesouro/Mapas/caverna.png.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
-guid: 12913e47f39a9431f9924842079ca6b7
-timeCreated: 1510927356
+guid: 6049331a375ae46a6ab11823c3947262
+timeCreated: 1583761330
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
@@ -58,6 +58,54 @@ TextureImporter:
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
+ - buildTarget: Standalone
+ maxTextureSize: 2048
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ - buildTarget: iPhone
+ maxTextureSize: 2048
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ - buildTarget: Android
+ maxTextureSize: 2048
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ - buildTarget: Tizen
+ maxTextureSize: 2048
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ - buildTarget: WebGL
+ maxTextureSize: 2048
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ - buildTarget: Samsung TV
+ maxTextureSize: 2048
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
diff --git a/JAPA/Library/CurrentLayout.dwlt b/JAPA/Library/CurrentLayout.dwlt
index 276f5c3975f6844515786568833edf94e04314a3..e664fcf5d58b8ea99bc238d4341ecb15441cf49d 100644
Binary files a/JAPA/Library/CurrentLayout.dwlt and b/JAPA/Library/CurrentLayout.dwlt differ
diff --git a/JAPA/Library/EditorUserBuildSettings.asset b/JAPA/Library/EditorUserBuildSettings.asset
index c689af00e88d3137e025eef63d9be31716129c6f..931479a99fe5b0dc2c20f756cb9f02392fe6b342 100644
Binary files a/JAPA/Library/EditorUserBuildSettings.asset and b/JAPA/Library/EditorUserBuildSettings.asset differ
diff --git a/JAPA/Library/InspectorExpandedItems.asset b/JAPA/Library/InspectorExpandedItems.asset
index 42b0237fa722a544f691db65655457a5882f941d..2343b5627beef1fd5116d067e8c306aaff580100 100644
Binary files a/JAPA/Library/InspectorExpandedItems.asset and b/JAPA/Library/InspectorExpandedItems.asset differ
diff --git a/JAPA/Library/LastBuild.buildreport b/JAPA/Library/LastBuild.buildreport
index 8032c37e5b6be6e4108371f718438a246a460382..5ff822ccb897a152955bfab8b9c8020111a6b45b 100644
Binary files a/JAPA/Library/LastBuild.buildreport and b/JAPA/Library/LastBuild.buildreport differ
diff --git a/JAPA/Library/LastSceneManagerSetup.txt b/JAPA/Library/LastSceneManagerSetup.txt
index 723122a53dc13b1a096c37ae8439b56e39925ccb..34526be6f4857b85ee9116f035cb75a8d27a27b9 100644
--- a/JAPA/Library/LastSceneManagerSetup.txt
+++ b/JAPA/Library/LastSceneManagerSetup.txt
@@ -1,4 +1,4 @@
sceneSetups:
-- path: Assets/Scenes/MainMenu.unity
+- path: Assets/Scenes/Tesouro/TutorialTesouro.unity
isLoaded: 1
isActive: 1
diff --git a/JAPA/Library/ProjectSettings.asset b/JAPA/Library/ProjectSettings.asset
index 4c1d24b94a137408317a1d948691d4c54fc2ab7c..18dd55948a6791f066be381adb1f4e880950d0a5 100644
Binary files a/JAPA/Library/ProjectSettings.asset and b/JAPA/Library/ProjectSettings.asset differ
diff --git a/JAPA/Library/ScriptAssemblies/Assembly-CSharp.dll b/JAPA/Library/ScriptAssemblies/Assembly-CSharp.dll
index af4dcc7996ba3c31be046040d193f4c4ca7b24d6..a879cfec8a9fb4603bd60652440831a7a875da6e 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 3bc43f35d17b1ccbba89ce594637117925c7dfe4..f90c155598e61e4f6f43f3b1a7a1beec71a82379 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 61cc1b19ca1fb6c74a254b9eef643678d7abcdd1..cf0508133872e4a415bb5d881817c038d2d97856 100644
Binary files a/JAPA/Library/assetDatabase3 and b/JAPA/Library/assetDatabase3 differ
diff --git a/JAPA/Library/expandedItems b/JAPA/Library/expandedItems
index bc522d3a16fce55b0123581dd44804ffb1d2ea0e..43ac2b24d6ed1a1d453bc2d24c770b2e01969ce9 100644
Binary files a/JAPA/Library/expandedItems and b/JAPA/Library/expandedItems differ
diff --git a/JAPA/Library/metadata/00/00000000000000004000000000000000 b/JAPA/Library/metadata/00/00000000000000004000000000000000
index 09f02c82c30504571de0a4b4cf1f0eaeee60d6c3..cca1314001f494ce0fb96f7c8259b63f68fce4ee 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 d7336a54f4e906b2610c5721180bdd3f04deba79..9e4d3faa6b27b53b8a55f44f16fe06d63fb05753 100644
Binary files a/JAPA/Library/metadata/00/00000000000000005000000000000000 and b/JAPA/Library/metadata/00/00000000000000005000000000000000 differ
diff --git a/JAPA/Library/metadata/12/12913e47f39a9431f9924842079ca6b7 b/JAPA/Library/metadata/12/12913e47f39a9431f9924842079ca6b7
deleted file mode 100644
index 73a37caac3b7e4e8aca4863fd81cc54829c7c1fd..0000000000000000000000000000000000000000
Binary files a/JAPA/Library/metadata/12/12913e47f39a9431f9924842079ca6b7 and /dev/null differ
diff --git a/JAPA/Library/metadata/12/12913e47f39a9431f9924842079ca6b7.info b/JAPA/Library/metadata/12/12913e47f39a9431f9924842079ca6b7.info
deleted file mode 100644
index f23ed1267209b638ed57d310d5d7ea37215ae43b..0000000000000000000000000000000000000000
Binary files a/JAPA/Library/metadata/12/12913e47f39a9431f9924842079ca6b7.info and /dev/null differ
diff --git a/JAPA/Library/metadata/57/57c701c6bd35f49ca84ad9c8dd48ac29 b/JAPA/Library/metadata/57/57c701c6bd35f49ca84ad9c8dd48ac29
index 1f2309a663cd1ba591b73e99622bd435556e1048..254684c6bc47d29f062f1456e21283c3d2aea212 100644
Binary files a/JAPA/Library/metadata/57/57c701c6bd35f49ca84ad9c8dd48ac29 and b/JAPA/Library/metadata/57/57c701c6bd35f49ca84ad9c8dd48ac29 differ
diff --git a/JAPA/Library/metadata/60/6049331a375ae46a6ab11823c3947262 b/JAPA/Library/metadata/60/6049331a375ae46a6ab11823c3947262
new file mode 100644
index 0000000000000000000000000000000000000000..4cd5cf62f79aae88e0f6d03253e1430452c37ce2
Binary files /dev/null and b/JAPA/Library/metadata/60/6049331a375ae46a6ab11823c3947262 differ
diff --git a/JAPA/Library/metadata/60/6049331a375ae46a6ab11823c3947262.info b/JAPA/Library/metadata/60/6049331a375ae46a6ab11823c3947262.info
new file mode 100644
index 0000000000000000000000000000000000000000..a2514e627d4a4b627af5ec4892992037a98c385d
Binary files /dev/null and b/JAPA/Library/metadata/60/6049331a375ae46a6ab11823c3947262.info differ
diff --git a/JAPA/Library/metadata/77/7703b5e0291d14e43839449ca274b1b6 b/JAPA/Library/metadata/77/7703b5e0291d14e43839449ca274b1b6
index d054ed7651b2b66558fdb290a5178087eaf491c8..8a1ae1b4466393e3daf90471271794982a20191f 100644
Binary files a/JAPA/Library/metadata/77/7703b5e0291d14e43839449ca274b1b6 and b/JAPA/Library/metadata/77/7703b5e0291d14e43839449ca274b1b6 differ
diff --git a/JAPA/Library/metadata/77/771223f5d1ca747fea817c8fb3780c13 b/JAPA/Library/metadata/77/771223f5d1ca747fea817c8fb3780c13
index 0b1edb357ad2bd0cb8a346ea4d19698693cddb54..e80641e5980b998f28e345df6dfc4c44e4385c4b 100644
Binary files a/JAPA/Library/metadata/77/771223f5d1ca747fea817c8fb3780c13 and b/JAPA/Library/metadata/77/771223f5d1ca747fea817c8fb3780c13 differ
diff --git a/JAPA/ProjectSettings/ProjectSettings.asset b/JAPA/ProjectSettings/ProjectSettings.asset
index 4c1d24b94a137408317a1d948691d4c54fc2ab7c..18dd55948a6791f066be381adb1f4e880950d0a5 100644
Binary files a/JAPA/ProjectSettings/ProjectSettings.asset and b/JAPA/ProjectSettings/ProjectSettings.asset differ