diff --git a/JAPA/Assets/Scenes/MainMenu.unity b/JAPA/Assets/Scenes/MainMenu.unity
index 0ee278eca52e8ad5a4d526ecc18253e89fceb180..0e8765bd0728e668c64a1f6e7e3f586054710675 100644
Binary files a/JAPA/Assets/Scenes/MainMenu.unity and b/JAPA/Assets/Scenes/MainMenu.unity differ
diff --git a/JAPA/Assets/Scripts/Menu/config.cs b/JAPA/Assets/Scripts/Menu/config.cs
index 03b5bddbe188013d6c3fe4421d3689e39c969028..f106eb1e90f26e5f845e62ad0fa8095ee583aefc 100644
--- a/JAPA/Assets/Scripts/Menu/config.cs
+++ b/JAPA/Assets/Scripts/Menu/config.cs
@@ -7,6 +7,8 @@ public class config : MonoBehaviour {
private GameObject canv;
[SerializeField] private Text[] texts;
+ [SerializeField] private Text[] textsSom;
+
// Use this for initialization
void Start () {
// pegando a referência das placas iniciais para fazer o controle de sumir/aparecer
@@ -21,6 +23,7 @@ public class config : MonoBehaviour {
texts[PlayerPrefs.GetInt("dificuldade")-1].color = new Color(0.9F, 0.79F, 0.31F, 1.0F); // amarelo
// sumimos com a placa de config
gameObject.SetActive(false);
+ bool isMute = false;
}
// no click de voltar, fazemos com que o canvas apareça e com que essa placa suma
@@ -34,7 +37,7 @@ public class config : MonoBehaviour {
{
gameObject.SetActive(true);
canv.SetActive(false);
-}
+ }
// quando clicamos para mudar a dificuldade, fazemos com que a cor do botão anterior fique branca, com que a clicada fique amarela e mudamos a playerpref de dificuldade
public void ChangeDiff (int dif)
@@ -43,4 +46,21 @@ public class config : MonoBehaviour {
texts[dif-1].color = new Color (0.9F, 0.79F, 0.31F, 1.0F);
PlayerPrefs.SetInt("dificuldade", dif);
}
+
+ public void TurnAudioOn ()
+ {
+ AudioListener.volume = 1;
+ PlayerPrefs.SetInt("audio", 1);
+ }
+
+ public void TurnAudioOff ()
+ {
+ AudioListener.volume = 0;
+ PlayerPrefs.SetInt("audio", 0);
+
+ // trocar cor botoes
+
+ textsSom[1].color = new Color (1, 1, 1, 1);
+ textsSom[1].color = new Color (0.9F, 0.79F, 0.31F, 1.0F);
+ }
}
diff --git a/JAPA/Assets/Scripts/New Animator Controller.controller b/JAPA/Assets/Scripts/New Animator Controller.controller
new file mode 100644
index 0000000000000000000000000000000000000000..bfe0c0bc03852ba3b4e260120dc947638dbbb805
Binary files /dev/null and b/JAPA/Assets/Scripts/New Animator Controller.controller differ
diff --git a/JAPA/Assets/Scripts/New Animator Controller.controller.meta b/JAPA/Assets/Scripts/New Animator Controller.controller.meta
new file mode 100644
index 0000000000000000000000000000000000000000..072ced3a115a05c9a93e5a99c20b88e0b6098826
--- /dev/null
+++ b/JAPA/Assets/Scripts/New Animator Controller.controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a61b8fc648c44421d88e04868c9f8ad1
+timeCreated: 1538399797
+licenseType: Free
+NativeFormatImporter:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/JAPA/Library/ScriptAssemblies/Assembly-CSharp.dll b/JAPA/Library/ScriptAssemblies/Assembly-CSharp.dll
index 626ea99774a1a20e42c493419bffe8b996ef1686..1eac3fc7cd663b5a5ecbaf3c438b6cabdccc0528 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 386bd779f19d5c424062eba67a54034f203b51ac..55213d6c639c6eb41e6b16b9aad03526c74ccaa6 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 5a464649ec27ce84685ed95a0d4e94e63e4be0d6..e204d6ef93feaa6d172f95aff7db3c95e9dab5cf 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 ad8190e186ac65c4cf857744590f0cd9b51791f9..63ad005f3043118e185c2f734fed5ba934173374 100644
Binary files a/JAPA/Library/metadata/00/00000000000000005000000000000000 and b/JAPA/Library/metadata/00/00000000000000005000000000000000 differ
diff --git a/JAPA/Library/metadata/15/1588552c1362d44c88517a9df7c8a026 b/JAPA/Library/metadata/15/1588552c1362d44c88517a9df7c8a026
index e1b75f06a88d9e1cc9afb3f1534dc8c16a3a87ee..9b84b2a5446c607681db8a14beb0a62dc729af73 100644
Binary files a/JAPA/Library/metadata/15/1588552c1362d44c88517a9df7c8a026 and b/JAPA/Library/metadata/15/1588552c1362d44c88517a9df7c8a026 differ
diff --git a/JAPA/Library/metadata/a6/a61b8fc648c44421d88e04868c9f8ad1 b/JAPA/Library/metadata/a6/a61b8fc648c44421d88e04868c9f8ad1
new file mode 100644
index 0000000000000000000000000000000000000000..6a4a1e54eee730ba1f3097007ebaa7c72a044b4e
Binary files /dev/null and b/JAPA/Library/metadata/a6/a61b8fc648c44421d88e04868c9f8ad1 differ
diff --git a/JAPA/Library/metadata/a6/a61b8fc648c44421d88e04868c9f8ad1.info b/JAPA/Library/metadata/a6/a61b8fc648c44421d88e04868c9f8ad1.info
new file mode 100644
index 0000000000000000000000000000000000000000..22ffc58df9c8bc172e06ae5cd66832f89d5ce710
Binary files /dev/null and b/JAPA/Library/metadata/a6/a61b8fc648c44421d88e04868c9f8ad1.info differ
diff --git a/JAPA/Temp/UnityTempFile-097b1a61068244151919bb5063170aae b/JAPA/Temp/UnityTempFile-0c8b4ca8e6dc3401688efca9ab3abe0d
similarity index 100%
rename from JAPA/Temp/UnityTempFile-097b1a61068244151919bb5063170aae
rename to JAPA/Temp/UnityTempFile-0c8b4ca8e6dc3401688efca9ab3abe0d
diff --git a/JAPA/Temp/UnityTempFile-730fd55e2242246ea8adcb0e4b1bc1e9 b/JAPA/Temp/UnityTempFile-19695c30217014b5b8dbcb7d8d740370
similarity index 100%
rename from JAPA/Temp/UnityTempFile-730fd55e2242246ea8adcb0e4b1bc1e9
rename to JAPA/Temp/UnityTempFile-19695c30217014b5b8dbcb7d8d740370
diff --git a/JAPA/Temp/UnityTempFile-8c013e656193f43f7a36477e2bd3b804 b/JAPA/Temp/UnityTempFile-3f40e66a006384daaafc1f5bf294b74e
similarity index 100%
rename from JAPA/Temp/UnityTempFile-8c013e656193f43f7a36477e2bd3b804
rename to JAPA/Temp/UnityTempFile-3f40e66a006384daaafc1f5bf294b74e
diff --git a/JAPA/Temp/UnityTempFile-a5afd62d3a48448faa70ff05d2eacfff b/JAPA/Temp/UnityTempFile-9deb6c8d91ccd449f8c7379c2f7f38de
similarity index 100%
rename from JAPA/Temp/UnityTempFile-a5afd62d3a48448faa70ff05d2eacfff
rename to JAPA/Temp/UnityTempFile-9deb6c8d91ccd449f8c7379c2f7f38de
diff --git a/JAPA/Temp/UnityTempFile-b15895869794341cea156a51e9a22284 b/JAPA/Temp/UnityTempFile-aac19e9a062b94142ae41b1f5a89ee8f
similarity index 100%
rename from JAPA/Temp/UnityTempFile-b15895869794341cea156a51e9a22284
rename to JAPA/Temp/UnityTempFile-aac19e9a062b94142ae41b1f5a89ee8f
diff --git a/JAPA/Temp/UnityTempFile-eb4c3687acf7c490eaa8d8c0f83007c1 b/JAPA/Temp/UnityTempFile-d1136ba381b72466dbe085aae84f3fcc
similarity index 100%
rename from JAPA/Temp/UnityTempFile-eb4c3687acf7c490eaa8d8c0f83007c1
rename to JAPA/Temp/UnityTempFile-d1136ba381b72466dbe085aae84f3fcc
diff --git a/JAPA/Temp/UnityTempFile-dc77153bed6aa47f8a88547e876641d0 b/JAPA/Temp/UnityTempFile-dc77153bed6aa47f8a88547e876641d0
new file mode 100644
index 0000000000000000000000000000000000000000..4501acbac886d52f9ad6e691c6e883e757b0301d
--- /dev/null
+++ b/JAPA/Temp/UnityTempFile-dc77153bed6aa47f8a88547e876641d0
@@ -0,0 +1,102 @@
+-debug
+-target:library
+-nowarn:0169
+-langversion:4
+-out:Temp/Assembly-CSharp.dll
+-r:/opt/Unity/Editor/Data/Managed/UnityEngine.dll
+-r:/opt/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll
+-r:/opt/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll
+-r:/opt/Unity/Editor/Data/UnityExtensions/Unity/PlaymodeTestsRunner/UnityEngine.PlaymodeTestsRunner.dll
+-r:/opt/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll
+-r:/opt/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll
+-r:/opt/Unity/Editor/Data/UnityExtensions/Unity/UnityVR/RuntimeEditor/UnityEngine.VR.dll
+-r:/opt/Unity/Editor/Data/Managed/UnityEditor.dll
+-r:/opt/Unity/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll
+-r:/opt/Unity/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Common.dll
+-define:UNITY_5_3_OR_NEWER
+-define:UNITY_5_4_OR_NEWER
+-define:UNITY_5_5_OR_NEWER
+-define:UNITY_5_5_0
+-define:UNITY_5_5
+-define:UNITY_5
+-define:ENABLE_AUDIO
+-define:ENABLE_CACHING
+-define:ENABLE_CLOTH
+-define:ENABLE_GENERICS
+-define:ENABLE_MICROPHONE
+-define:ENABLE_MULTIPLE_DISPLAYS
+-define:ENABLE_PHYSICS
+-define:ENABLE_SPRITERENDERER_FLIPPING
+-define:ENABLE_SPRITES
+-define:ENABLE_TERRAIN
+-define:ENABLE_RAKNET
+-define:ENABLE_UNET
+-define:ENABLE_LZMA
+-define:ENABLE_UNITYEVENTS
+-define:ENABLE_WEBCAM
+-define:ENABLE_WWW
+-define:ENABLE_CLOUD_SERVICES_COLLAB
+-define:ENABLE_CLOUD_SERVICES_ADS
+-define:ENABLE_CLOUD_HUB
+-define:ENABLE_CLOUD_PROJECT_ID
+-define:ENABLE_CLOUD_SERVICES_UNET
+-define:ENABLE_CLOUD_SERVICES_BUILD
+-define:ENABLE_CLOUD_LICENSE
+-define:ENABLE_EDITOR_METRICS
+-define:ENABLE_EDITOR_METRICS_CACHING
+-define:INCLUDE_DYNAMIC_GI
+-define:INCLUDE_GI
+-define:PLATFORM_SUPPORTS_MONO
+-define:INCLUDE_PUBNUB
+-define:ENABLE_PLAYMODE_TESTS_RUNNER
+-define:ENABLE_SCRIPTING_NEW_CSHARP_COMPILER
+-define:UNITY_ANDROID
+-define:ENABLE_SUBSTANCE
+-define:UNITY_ANDROID_API
+-define:ENABLE_EGL
+-define:ENABLE_NETWORK
+-define:ENABLE_RUNTIME_GI
+-define:ENABLE_CRUNCH_TEXTURE_COMPRESSION
+-define:ENABLE_UNITYWEBREQUEST
+-define:ENABLE_CLOUD_SERVICES
+-define:ENABLE_CLOUD_SERVICES_ANALYTICS
+-define:ENABLE_CLOUD_SERVICES_PURCHASING
+-define:ENABLE_CLOUD_SERVICES_CRASH_REPORTING
+-define:PLATFORM_SUPPORTS_ADS_ID
+-define:UNITY_CAN_SHOW_SPLASH_SCREEN
+-define:ENABLE_VIDEO
+-define:ENABLE_VR
+-define:ENABLE_UNITYADS_RUNTIME
+-define:UNITY_UNITYADS_API
+-define:ENABLE_MONO
+-define:ENABLE_PROFILER
+-define:DEBUG
+-define:TRACE
+-define:UNITY_ASSERTIONS
+-define:UNITY_EDITOR
+-define:UNITY_EDITOR_64
+-define:UNITY_EDITOR_LINUX
+-define:UNITY_TEAM_LICENSE
+Assets/Scripts/Globals/levelManager.cs
+Assets/Scripts/MaskLevel/ButtonHandler.cs
+Assets/Scripts/MaskLevel/MaskHandler.cs
+Assets/Scripts/MaskLevel/MasterButtonHandler.cs
+Assets/Scripts/MaskLevel/MonsterHandler.cs
+Assets/Scripts/MaskLevel/PauseScript.cs
+Assets/Scripts/MaskLevel/TextScoreHandler.cs
+Assets/Scripts/MaskLevel/Timer.cs
+Assets/Scripts/MaskLevel/textHandler.cs
+Assets/Scripts/MaskLevel/textInitHandler.cs
+Assets/Scripts/Menu/SairJogo.cs
+Assets/Scripts/Menu/config.cs
+Assets/Scripts/Menu/helpScript.cs
+Assets/Scripts/Menu/ilha.cs
+Assets/Scripts/Menu/moveBarco.cs
+Assets/Scripts/Menu/onda.cs
+Assets/Scripts/Menu/texture2D.cs
+-r:/opt/Unity/Editor/Data/MonoBleedingEdge/lib/mono/unity/System.Runtime.Serialization.dll
+-r:/opt/Unity/Editor/Data/MonoBleedingEdge/lib/mono/unity/System.Xml.Linq.dll
+-r:/opt/Unity/Editor/Data/MonoBleedingEdge/lib/mono/unity/UnityScript.dll
+-r:/opt/Unity/Editor/Data/MonoBleedingEdge/lib/mono/unity/UnityScript.Lang.dll
+-r:/opt/Unity/Editor/Data/MonoBleedingEdge/lib/mono/unity/Boo.Lang.dll
+-sdk:unity
diff --git a/JAPA/Temp/__Backupscenes/0.backup b/JAPA/Temp/__Backupscenes/0.backup
index 1635e7afd71bafd30bae3bfecb1c426fb0670860..e7e393204e05b7b0a98bbda293e8217d0932864c 100644
Binary files a/JAPA/Temp/__Backupscenes/0.backup and b/JAPA/Temp/__Backupscenes/0.backup differ