diff --git a/JAPA/Assembly-CSharp.csproj b/JAPA/Assembly-CSharp.csproj
index 37838236d0446ae117c9007730732f750d503df6..f65c103da7eff571086bc96667410f820c697983 100644
--- a/JAPA/Assembly-CSharp.csproj
+++ b/JAPA/Assembly-CSharp.csproj
@@ -77,6 +77,9 @@
<Compile Include="Assets\Scripts\MoveBarco\spawncapanga.cs" />
<Compile Include="Assets\Scripts\MoveBarco\textHandler2.cs" />
<Compile Include="Assets\Scripts\MoveBarco\textInitHandler2.cs" />
+ <Compile Include="Assets\controle.cs" />
+ <Compile Include="Assets\instanciadorbomba.cs" />
+ <Compile Include="Assets\pontos.cs" />
<Reference Include="UnityEngine.Advertisements">
<HintPath>/opt/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/UnityEngine.Advertisements.dll</HintPath>
</Reference>
diff --git a/JAPA/Assets/Animations/Map.meta b/JAPA/Assets/Animations/Map.meta
deleted file mode 100644
index 1b69e916445f26d79c08cb7936ea57b13d69c92b..0000000000000000000000000000000000000000
--- a/JAPA/Assets/Animations/Map.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 919ade57c5fe2427c97528f00b18c9b3
-folderAsset: yes
-timeCreated: 1536771436
-licenseType: Free
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/JAPA/Assets/Animations/MaskLevel.meta b/JAPA/Assets/Animations/MaskLevel.meta
deleted file mode 100644
index 6065654e70aae2017adcd85dda8f8a21761fd603..0000000000000000000000000000000000000000
--- a/JAPA/Assets/Animations/MaskLevel.meta
+++ /dev/null
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 80d1379f0c2d147219b599f88aebe0fa
-folderAsset: yes
-timeCreated: 1536771436
-licenseType: Free
-DefaultImporter:
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/JAPA/Assets/Animations/MoveBarco/anim.cs b/JAPA/Assets/Animations/MoveBarco/anim.cs
index 550f846034093b78aa245ed9eb02a7e69ad3f392..524b9373254091f072c119386b17cceed8573ff9 100644
--- a/JAPA/Assets/Animations/MoveBarco/anim.cs
+++ b/JAPA/Assets/Animations/MoveBarco/anim.cs
@@ -1,6 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
+using UnityEngine.UI;
//script porco feito pelo Ovidio
public class anim : MonoBehaviour {
@@ -8,10 +9,14 @@ public class anim : MonoBehaviour {
public float timer = 8.0f; //tempo pra explodir
public float TE = 3.0f; //tempo pra sumir
+
+
void Start ()
{
+
bombex = GetComponent<Animator> ();
GetComponent<CapsuleCollider2D> ().enabled = false;
+
}
void Update ()
{
@@ -19,6 +24,7 @@ public class anim : MonoBehaviour {
if (timer <= 0.0f)
{
teste ();
+
}
}
diff --git a/JAPA/Assets/Prefabs/MoveBarco/Barril.prefab b/JAPA/Assets/Prefabs/MoveBarco/Barril.prefab
index fe25b3d232c6f018fab4d14b34804c4bcf8c7f9c..f97ae1473c49e350fac798453eec0ec6932bfa88 100644
Binary files a/JAPA/Assets/Prefabs/MoveBarco/Barril.prefab and b/JAPA/Assets/Prefabs/MoveBarco/Barril.prefab differ
diff --git a/JAPA/Assets/Scenes/MoveBarco.unity b/JAPA/Assets/Scenes/MoveBarco.unity
index 0fdc858526339dec07e488045ea03c2b1a575036..538a6bad10865d80862705f4af5658dfdef411bc 100644
Binary files a/JAPA/Assets/Scenes/MoveBarco.unity and b/JAPA/Assets/Scenes/MoveBarco.unity differ
diff --git a/JAPA/JAPA.userprefs b/JAPA/JAPA.userprefs
index d0a7ef9edf9455247cd234f3265631972c297071..088d0a27796304248b8c7dbdec9c404fe8cb76b9 100644
--- a/JAPA/JAPA.userprefs
+++ b/JAPA/JAPA.userprefs
@@ -1,8 +1,9 @@
-<Properties>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+<Properties StartupItem="Assembly-CSharp.csproj">
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" PreferredExecutionTarget="Unity.Instance.Unity Editor" />
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Animations/MoveBarco/anim.cs">
<Files>
- <File FileName="Assets/Animations/MoveBarco/anim.cs" Line="21" Column="9" />
+ <File FileName="Assets/pontos.cs" Line="4" Column="1" />
+ <File FileName="Assets/Animations/MoveBarco/anim.cs" Line="32" Column="4" />
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/JAPA/Library/CurrentLayout.dwlt b/JAPA/Library/CurrentLayout.dwlt
index 0039f5977f21c6c68e7cb321fed660311921af64..b54dad0ead864566827e071a8b4f392ba2e16faf 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 04ec3af5f3e691384953ede43ee7011ef0d4569e..b7c5ceadec0be8de60efab0f5c692f0d4f340da9 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 89a49d4b064445a85c6874340ec8f6b9290285c8..0c978a1bf390c7084cefe63ba14c6c3dcdffa281 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 666da967b53fe225433c5ac18397e817f6aa9c59..f6f7fca315dfb1eccd51ecf560828f49a4ee9d27 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/ScriptAssemblies/BuiltinAssemblies.stamp b/JAPA/Library/ScriptAssemblies/BuiltinAssemblies.stamp
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d16c4861066285eabcf57af8d5c6e17e14d91a9a 100644
--- a/JAPA/Library/ScriptAssemblies/BuiltinAssemblies.stamp
+++ b/JAPA/Library/ScriptAssemblies/BuiltinAssemblies.stamp
@@ -0,0 +1,2 @@
+0000.583870b1.0000
+0000.583870b1.0000
\ No newline at end of file
diff --git a/JAPA/Library/assetDatabase3 b/JAPA/Library/assetDatabase3
index 2a82dcdb0650a4b53abf2fedb9c5d382a841adf4..130b486ada5085b87f40a4c0babee05dfb818e56 100644
Binary files a/JAPA/Library/assetDatabase3 and b/JAPA/Library/assetDatabase3 differ
diff --git a/JAPA/Library/expandedItems b/JAPA/Library/expandedItems
index a5e39edf8c0161d2a77a0018b6f1d93d7b9ace56..cb310dc44d202e99f598f515e9a2e3807dd3702f 100644
Binary files a/JAPA/Library/expandedItems and b/JAPA/Library/expandedItems differ
diff --git a/JAPA/Library/metadata/00/00000000000000002000000000000000 b/JAPA/Library/metadata/00/00000000000000002000000000000000
index 871efa104d5e36d44b772b8e3c747a176dc1f62b..06d24eb5435ad422152b388341e32e039328893c 100644
Binary files a/JAPA/Library/metadata/00/00000000000000002000000000000000 and b/JAPA/Library/metadata/00/00000000000000002000000000000000 differ
diff --git a/JAPA/Library/metadata/00/00000000000000003000000000000000 b/JAPA/Library/metadata/00/00000000000000003000000000000000
index 937cb2e734077578a0f2a88b1ecb61f3d908a961..5c0e942f68eace367b3e797badf7396db57a6b4b 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 c468b7f53c35c0fb9f04e509cde484080ed4f18e..e50503598d5fcce4f294663c9bcc6d409359165d 100644
Binary files a/JAPA/Library/metadata/00/00000000000000004000000000000000 and b/JAPA/Library/metadata/00/00000000000000004000000000000000 differ
diff --git a/JAPA/Library/metadata/00/00000000000000004100000000000000 b/JAPA/Library/metadata/00/00000000000000004100000000000000
index 0c9f021d301f5a94d60f4868d7090725246e464b..20dc40e3dd07cfaef7d572c6d2610e3257654b20 100644
Binary files a/JAPA/Library/metadata/00/00000000000000004100000000000000 and b/JAPA/Library/metadata/00/00000000000000004100000000000000 differ
diff --git a/JAPA/Library/metadata/00/00000000000000005000000000000000 b/JAPA/Library/metadata/00/00000000000000005000000000000000
index 175665da83f395baed9f210f55184254a09c8a8a..5d806fd68a271590dd8bcef0f27313c7c82a91cc 100644
Binary files a/JAPA/Library/metadata/00/00000000000000005000000000000000 and b/JAPA/Library/metadata/00/00000000000000005000000000000000 differ
diff --git a/JAPA/Library/metadata/00/00000000000000005000000000000000.info b/JAPA/Library/metadata/00/00000000000000005000000000000000.info
index e2bdbdfa2bb002aa6c8c075ff9e099b2a5de12bf..fade0c91985afc95f5f1c8f3b97f23601dedb096 100644
Binary files a/JAPA/Library/metadata/00/00000000000000005000000000000000.info and b/JAPA/Library/metadata/00/00000000000000005000000000000000.info differ
diff --git a/JAPA/Library/metadata/00/00000000000000005100000000000000 b/JAPA/Library/metadata/00/00000000000000005100000000000000
index 127b956b02b70c4fc230f499f99d06083efdfc6c..c1331ce3e8d9a7c094d6d62ea4b2c37607c0b7c7 100644
Binary files a/JAPA/Library/metadata/00/00000000000000005100000000000000 and b/JAPA/Library/metadata/00/00000000000000005100000000000000 differ
diff --git a/JAPA/Library/metadata/00/00000000000000006000000000000000 b/JAPA/Library/metadata/00/00000000000000006000000000000000
index f24a2766f5e3db55827380e52629153d17cc77f6..8d629bc9c99aeb7e35d4c293b130d9c9c254e1aa 100644
Binary files a/JAPA/Library/metadata/00/00000000000000006000000000000000 and b/JAPA/Library/metadata/00/00000000000000006000000000000000 differ
diff --git a/JAPA/Library/metadata/00/00000000000000006100000000000000 b/JAPA/Library/metadata/00/00000000000000006100000000000000
index e592680a88bb8240736f6810b4154eba15ac8867..ab6f846fdfbe5b8712c475af2f5010830d613cb0 100644
Binary files a/JAPA/Library/metadata/00/00000000000000006100000000000000 and b/JAPA/Library/metadata/00/00000000000000006100000000000000 differ
diff --git a/JAPA/Library/metadata/00/00000000000000007000000000000000 b/JAPA/Library/metadata/00/00000000000000007000000000000000
index 0e906565cec19640fdf10043fe9f83aa7b745f82..a5a40d46e96336c226715e3b192832cf21667967 100644
Binary files a/JAPA/Library/metadata/00/00000000000000007000000000000000 and b/JAPA/Library/metadata/00/00000000000000007000000000000000 differ
diff --git a/JAPA/Library/metadata/00/00000000000000007100000000000000 b/JAPA/Library/metadata/00/00000000000000007100000000000000
index d8c73682885a835ad22654d2fb2b50b7a0c69ca5..7f8c9f1148274f094156c8877f2b834d22a2c746 100644
Binary files a/JAPA/Library/metadata/00/00000000000000007100000000000000 and b/JAPA/Library/metadata/00/00000000000000007100000000000000 differ
diff --git a/JAPA/Library/metadata/00/00000000000000008000000000000000 b/JAPA/Library/metadata/00/00000000000000008000000000000000
index 771510cd5b4e42f910b196eef892433ad7a6757e..969ab2f30b8a3e8ffb3207c3fadaf5446826db7f 100644
Binary files a/JAPA/Library/metadata/00/00000000000000008000000000000000 and b/JAPA/Library/metadata/00/00000000000000008000000000000000 differ
diff --git a/JAPA/Library/metadata/00/00000000000000009000000000000000 b/JAPA/Library/metadata/00/00000000000000009000000000000000
index 24130735dade0c50d92658b8f31447f05d9cd802..21d53e258702e81a215cf9ca6b4102cef01eb78b 100644
Binary files a/JAPA/Library/metadata/00/00000000000000009000000000000000 and b/JAPA/Library/metadata/00/00000000000000009000000000000000 differ
diff --git a/JAPA/Library/metadata/00/0000000000000000a000000000000000 b/JAPA/Library/metadata/00/0000000000000000a000000000000000
index 479095cc18ed3cc7350d14d2a4dae7dc3664b8f5..ddeecf3bc0cacbf8ebca15a8dba855d39247c1cc 100644
Binary files a/JAPA/Library/metadata/00/0000000000000000a000000000000000 and b/JAPA/Library/metadata/00/0000000000000000a000000000000000 differ
diff --git a/JAPA/Library/metadata/00/0000000000000000a100000000000000 b/JAPA/Library/metadata/00/0000000000000000a100000000000000
index e86bde42c5ac0dfeb3d08c32ced48f0497640b00..2cf82d5257ca363bb0ad2920fddf011e37ea317b 100644
Binary files a/JAPA/Library/metadata/00/0000000000000000a100000000000000 and b/JAPA/Library/metadata/00/0000000000000000a100000000000000 differ
diff --git a/JAPA/Library/metadata/00/0000000000000000b000000000000000 b/JAPA/Library/metadata/00/0000000000000000b000000000000000
index 62d97434a5624e5bd42a6acdf2b5fb7f8b50c4a4..940f7db850637ecc53fdf4f70cda02593306d0e7 100644
Binary files a/JAPA/Library/metadata/00/0000000000000000b000000000000000 and b/JAPA/Library/metadata/00/0000000000000000b000000000000000 differ
diff --git a/JAPA/Library/metadata/00/0000000000000000c000000000000000 b/JAPA/Library/metadata/00/0000000000000000c000000000000000
index 31d03c1bd70a386374dcf8f54ad049f6fe749fe3..658c427f83756e3c7a257fe1c524e6630e331851 100644
Binary files a/JAPA/Library/metadata/00/0000000000000000c000000000000000 and b/JAPA/Library/metadata/00/0000000000000000c000000000000000 differ
diff --git a/JAPA/Library/metadata/02/024e825da916b4034a4e0252cf95f03e.info b/JAPA/Library/metadata/02/024e825da916b4034a4e0252cf95f03e.info
index 16592da959ea7f3367e81e64ac3132ec625e66f4..a0adbdbad3aa45be56a22801d78eccc8397d8871 100644
Binary files a/JAPA/Library/metadata/02/024e825da916b4034a4e0252cf95f03e.info and b/JAPA/Library/metadata/02/024e825da916b4034a4e0252cf95f03e.info differ
diff --git a/JAPA/Library/metadata/7d/7d8a1f38e5d21429d831fdf8b14f9609 b/JAPA/Library/metadata/7d/7d8a1f38e5d21429d831fdf8b14f9609
index 6acabb569b3862513ead8ab9881c3235deed88db..5cf9f6c20820f4b29261004b22bf848cd0a82a91 100644
Binary files a/JAPA/Library/metadata/7d/7d8a1f38e5d21429d831fdf8b14f9609 and b/JAPA/Library/metadata/7d/7d8a1f38e5d21429d831fdf8b14f9609 differ
diff --git a/JAPA/Library/metadata/80/80d1379f0c2d147219b599f88aebe0fa b/JAPA/Library/metadata/80/80d1379f0c2d147219b599f88aebe0fa
deleted file mode 100644
index 793bc0ec3b6871aae05f7a690a10105b547f495b..0000000000000000000000000000000000000000
Binary files a/JAPA/Library/metadata/80/80d1379f0c2d147219b599f88aebe0fa and /dev/null differ
diff --git a/JAPA/Library/metadata/80/80d1379f0c2d147219b599f88aebe0fa.info b/JAPA/Library/metadata/80/80d1379f0c2d147219b599f88aebe0fa.info
deleted file mode 100644
index bf3c1bf96223b3c7a68b37c6f79106fd9bde8148..0000000000000000000000000000000000000000
Binary files a/JAPA/Library/metadata/80/80d1379f0c2d147219b599f88aebe0fa.info and /dev/null differ
diff --git a/JAPA/Library/metadata/91/919ade57c5fe2427c97528f00b18c9b3 b/JAPA/Library/metadata/91/919ade57c5fe2427c97528f00b18c9b3
deleted file mode 100644
index 7b67e31bbac95a67a3cd38f3f3c22d2f7959b1fc..0000000000000000000000000000000000000000
Binary files a/JAPA/Library/metadata/91/919ade57c5fe2427c97528f00b18c9b3 and /dev/null differ
diff --git a/JAPA/Library/metadata/91/919ade57c5fe2427c97528f00b18c9b3.info b/JAPA/Library/metadata/91/919ade57c5fe2427c97528f00b18c9b3.info
deleted file mode 100644
index 9d085e2b405dc1c0ba2a555357bc49fde84bf944..0000000000000000000000000000000000000000
Binary files a/JAPA/Library/metadata/91/919ade57c5fe2427c97528f00b18c9b3.info and /dev/null differ
diff --git a/JAPA/Library/shadercompiler-UnityShaderCompiler0.log b/JAPA/Library/shadercompiler-UnityShaderCompiler0.log
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..bd4b8b114286ef4331aed160989de6cf5e851d61 100644
--- a/JAPA/Library/shadercompiler-UnityShaderCompiler0.log
+++ b/JAPA/Library/shadercompiler-UnityShaderCompiler0.log
@@ -0,0 +1,2 @@
+Base path: /opt/Unity/Editor/Data
+Cmd: getPlatforms
diff --git a/JAPA/ProjectSettings/TagManager.asset b/JAPA/ProjectSettings/TagManager.asset
index 15fecd0043c9324c12ea905199c6759d6288ea2a..d13252cb768374616edbade4ca8660186b98ea54 100644
Binary files a/JAPA/ProjectSettings/TagManager.asset and b/JAPA/ProjectSettings/TagManager.asset differ