diff --git a/JAPA/Assembly-CSharp.csproj b/JAPA/Assembly-CSharp.csproj
index 1d17e468f866a8708ed5fb22762d8ba7463b1f54..37838236d0446ae117c9007730732f750d503df6 100644
--- a/JAPA/Assembly-CSharp.csproj
+++ b/JAPA/Assembly-CSharp.csproj
@@ -65,6 +65,7 @@
<Compile Include="Assets\Scripts\Menu\onda.cs" />
<Compile Include="Assets\Scripts\Menu\texture2D.cs" />
<Compile Include="Assets\Scripts\MoveBarco\Instanciador.cs" />
+ <Compile Include="Assets\Scripts\MoveBarco\PauseScript2.cs" />
<Compile Include="Assets\Scripts\MoveBarco\bombmove.cs" />
<Compile Include="Assets\Scripts\MoveBarco\capangamove.cs" />
<Compile Include="Assets\Scripts\MoveBarco\move.cs" />
@@ -74,6 +75,8 @@
<Compile Include="Assets\Scripts\MoveBarco\rotate.cs" />
<Compile Include="Assets\Scripts\MoveBarco\spawn.cs" />
<Compile Include="Assets\Scripts\MoveBarco\spawncapanga.cs" />
+ <Compile Include="Assets\Scripts\MoveBarco\textHandler2.cs" />
+ <Compile Include="Assets\Scripts\MoveBarco\textInitHandler2.cs" />
<Reference Include="UnityEngine.Advertisements">
<HintPath>/opt/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/UnityEngine.Advertisements.dll</HintPath>
</Reference>
diff --git a/JAPA/Assets/Animations/MoveBarco/Bombaanim.controller b/JAPA/Assets/Animations/MoveBarco/Bombaanim.controller
index 73be224ad43dbf4d9cbfc2630337643289d892e1..c6f33803526ff1c12944ab9743271a9bf16a5b22 100644
Binary files a/JAPA/Assets/Animations/MoveBarco/Bombaanim.controller and b/JAPA/Assets/Animations/MoveBarco/Bombaanim.controller differ
diff --git a/JAPA/Assets/Animations/MoveBarco/anim.cs b/JAPA/Assets/Animations/MoveBarco/anim.cs
index 76d7c55d4a44e88f4809cea3a49863764532e4ee..550f846034093b78aa245ed9eb02a7e69ad3f392 100644
--- a/JAPA/Assets/Animations/MoveBarco/anim.cs
+++ b/JAPA/Assets/Animations/MoveBarco/anim.cs
@@ -3,17 +3,34 @@ using System.Collections.Generic;
using UnityEngine;
//script porco feito pelo Ovidio
public class anim : MonoBehaviour {
+
private Animator bombex;
+ 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 OnCollisionEnter2D (Collision2D Collider) { //void para uso de colliders
- if (Collider.gameObject.tag == "capanga") { //acessa os colliders atraves das tags dadas
- bombex.SetBool ("tocar", true); //acessa a variavel da animação e muda o estado da condição
- Destroy(gameObject, 1); //destroi o objeto
- Handheld.Vibrate (); //testevibração
+ void Update ()
+ {
+ timer -= Time.deltaTime;
+ if (timer <= 0.0f)
+ {
+ teste ();
}
+
+ }
+
+
+ void teste()
+ {
+ bombex.SetBool ("tocar", true);
+ Destroy(gameObject, TE);
+ Handheld.Vibrate ();
+ GetComponent<CapsuleCollider2D> ().enabled = true;
+
}
-}
+
+}
\ No newline at end of file
diff --git a/JAPA/Assets/Animations/MoveBarco/boom.anim b/JAPA/Assets/Animations/MoveBarco/boom.anim
new file mode 100644
index 0000000000000000000000000000000000000000..2eb8fed342933f686cd21cf000c671880b2e99d6
Binary files /dev/null and b/JAPA/Assets/Animations/MoveBarco/boom.anim differ
diff --git a/JAPA/Assets/Animations/MoveBarco/boom.anim.meta b/JAPA/Assets/Animations/MoveBarco/boom.anim.meta
new file mode 100644
index 0000000000000000000000000000000000000000..dcea400c0c69a8ef8b45e121bfd5e34241adaae2
--- /dev/null
+++ b/JAPA/Assets/Animations/MoveBarco/boom.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 41f33d10942fe47f0882c465cd95d78b
+timeCreated: 1540987738
+licenseType: Free
+NativeFormatImporter:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/JAPA/Assets/Prefabs/MaskLevel/Alegria.prefab b/JAPA/Assets/Prefabs/MaskLevel/Alegria.prefab
index 3ccf81a21d281970835f12302fb1e059ebb17a30..823b07491ae1deb43ae0fb6ca639f865fbcf6bca 100644
Binary files a/JAPA/Assets/Prefabs/MaskLevel/Alegria.prefab and b/JAPA/Assets/Prefabs/MaskLevel/Alegria.prefab differ
diff --git a/JAPA/Assets/Prefabs/MoveBarco/Capanga.prefab b/JAPA/Assets/Prefabs/MoveBarco/Barril.prefab
similarity index 97%
rename from JAPA/Assets/Prefabs/MoveBarco/Capanga.prefab
rename to JAPA/Assets/Prefabs/MoveBarco/Barril.prefab
index 0e0b84f79853963f864fd7aba58841bc42b1821e..fe25b3d232c6f018fab4d14b34804c4bcf8c7f9c 100644
Binary files a/JAPA/Assets/Prefabs/MoveBarco/Capanga.prefab and b/JAPA/Assets/Prefabs/MoveBarco/Barril.prefab differ
diff --git a/JAPA/Assets/Prefabs/MoveBarco/Capanga.prefab.meta b/JAPA/Assets/Prefabs/MoveBarco/Barril.prefab.meta
similarity index 100%
rename from JAPA/Assets/Prefabs/MoveBarco/Capanga.prefab.meta
rename to JAPA/Assets/Prefabs/MoveBarco/Barril.prefab.meta
diff --git a/JAPA/Assets/Prefabs/MoveBarco/Bomba.prefab b/JAPA/Assets/Prefabs/MoveBarco/Bomba.prefab
index 105a8bb242638d8d839321c01c95650a17b4b75f..dccd072dc5c1c02f1eebf1da5a050b1720837591 100644
Binary files a/JAPA/Assets/Prefabs/MoveBarco/Bomba.prefab and b/JAPA/Assets/Prefabs/MoveBarco/Bomba.prefab differ
diff --git a/JAPA/Assets/Scenes/MaskLevel.unity b/JAPA/Assets/Scenes/MaskLevel.unity
index c98fa2da59ec489c04ba14f5989db8ae474c5458..13e0630520e136b4a25e33d83ce281933d7a608d 100644
Binary files a/JAPA/Assets/Scenes/MaskLevel.unity and b/JAPA/Assets/Scenes/MaskLevel.unity differ
diff --git a/JAPA/Assets/Scenes/MenuFases.unity b/JAPA/Assets/Scenes/MenuFases.unity
index cc824322f6d0fb2d7fd3afd068c134c1438b7208..a4b2e02adaef578cb242e0dfeb8f47fdd1a6ac16 100644
Binary files a/JAPA/Assets/Scenes/MenuFases.unity and b/JAPA/Assets/Scenes/MenuFases.unity differ
diff --git a/JAPA/Assets/Scenes/MoveBarco.unity b/JAPA/Assets/Scenes/MoveBarco.unity
index 68e0b8eca5c611b1a74f5d5476ff7e49953bbacd..0fdc858526339dec07e488045ea03c2b1a575036 100644
Binary files a/JAPA/Assets/Scenes/MoveBarco.unity and b/JAPA/Assets/Scenes/MoveBarco.unity differ
diff --git a/JAPA/Assets/Scenes/MoveBarcoBegin.unity b/JAPA/Assets/Scenes/MoveBarcoBegin.unity
new file mode 100644
index 0000000000000000000000000000000000000000..37ae7fe1d9d01ef002be9e1ec236260cbbcd2e0e
Binary files /dev/null and b/JAPA/Assets/Scenes/MoveBarcoBegin.unity differ
diff --git a/JAPA/Assets/Scenes/MoveBarcoBegin.unity.meta b/JAPA/Assets/Scenes/MoveBarcoBegin.unity.meta
new file mode 100644
index 0000000000000000000000000000000000000000..5c1eca5d873d984e0be8df822abc0e0e83c054d8
--- /dev/null
+++ b/JAPA/Assets/Scenes/MoveBarcoBegin.unity.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7703b5e0291d14e43839449ca274b1b6
+timeCreated: 1539614643
+licenseType: Free
+DefaultImporter:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/JAPA/Assets/Scripts/MoveBarco/PauseScript2.cs b/JAPA/Assets/Scripts/MoveBarco/PauseScript2.cs
new file mode 100644
index 0000000000000000000000000000000000000000..998c2e530c2e6685cf4f549775ebc496b65d58c2
--- /dev/null
+++ b/JAPA/Assets/Scripts/MoveBarco/PauseScript2.cs
@@ -0,0 +1,38 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class PauseScript2 : MonoBehaviour {
+
+ void Start()
+ {
+ // faz o menu de pause nao aparecer no inicio
+ gameObject.SetActive (false);
+ }
+
+ // pausa o jogo (!)
+ public void Pause ()
+ {
+ // faz o menu de pause aparecer
+ gameObject.SetActive (true);
+
+ // tira o time do jogo
+ Time.timeScale = 0f;
+
+ }
+ public void Despause()
+ {
+ // faz o menu de pause desaparecer
+ gameObject.SetActive (false);
+ //despausa o jogo (voltando com o time)
+ Time.timeScale = 1;
+ }
+
+ public void RestartScene()
+ {
+ SceneManager.LoadScene(SceneManager.GetActiveScene().name);
+ }
+
+
+}
\ No newline at end of file
diff --git a/JAPA/Assets/Scripts/MoveBarco/PauseScript2.cs.meta b/JAPA/Assets/Scripts/MoveBarco/PauseScript2.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..b1f90398363625464068f5ab625f05f7955bea66
--- /dev/null
+++ b/JAPA/Assets/Scripts/MoveBarco/PauseScript2.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: f6ff0d4bc1fe146599a68f996589fbf2
+timeCreated: 1539006771
+licenseType: Free
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/JAPA/Assets/Scripts/MoveBarco/move.cs b/JAPA/Assets/Scripts/MoveBarco/move.cs
index 24c989e406dc926142655a3890f3aa2b1c6513f2..a184b3ba22d1b04eb84f6b9a8336346021ff0c7e 100644
--- a/JAPA/Assets/Scripts/MoveBarco/move.cs
+++ b/JAPA/Assets/Scripts/MoveBarco/move.cs
@@ -13,10 +13,10 @@ public class move: MonoBehaviour
void Update ()
{
Vector3 dir = Vector3.zero;
- dir.z = Input.acceleration.x;
+ dir.z =(Input.acceleration.x);
if (dir.z > 0 || dir.z < 0) {
- float angulo = vel * Time.deltaTime * dir.z;
+ float angulo = -1* vel * Time.deltaTime * dir.z;
if ((acumulado + angulo) >= limite_angular || (acumulado + angulo) <= -limite_angular)
angulo = 0;
acumulado += angulo;
diff --git a/JAPA/Assets/Scripts/MoveBarco/textHandler2.cs b/JAPA/Assets/Scripts/MoveBarco/textHandler2.cs
new file mode 100644
index 0000000000000000000000000000000000000000..92f99d6f640c8b00e30b4352d18cd28d49dd1ef9
--- /dev/null
+++ b/JAPA/Assets/Scripts/MoveBarco/textHandler2.cs
@@ -0,0 +1,26 @@
+/**************************************************/
+/* Script porco desenvolvido pela porca da Letícia
+/* Feito para uso do PET Computação
+/* para o projeto JAPA
+/* Esse script tem como função principal cuidar
+/* da renderização do textp (vitória/perda)
+/**************************************************/
+
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class textHandler2 : MonoBehaviour {
+private UnityEngine.UI.Text textT;
+
+ // Use this for initialization
+ void Start () {
+ textT = this.GetComponent<UnityEngine.UI.Text>();
+ if (PlayerPrefs.GetInt("ScoreMasks") < 100)
+ {
+ textT.text = ("Que pena!! Tente novamente!!");
+ }
+
+ }
+
+}
diff --git a/JAPA/Assets/Scripts/MoveBarco/textHandler2.cs.meta b/JAPA/Assets/Scripts/MoveBarco/textHandler2.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..dd1e624d937fb4e1fa4ee7d68ac30decfed6b146
--- /dev/null
+++ b/JAPA/Assets/Scripts/MoveBarco/textHandler2.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 39b6e4893ce5942f2a41eb9f127b760c
+timeCreated: 1539779562
+licenseType: Free
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/JAPA/Assets/Scripts/MoveBarco/textInitHandler2.cs b/JAPA/Assets/Scripts/MoveBarco/textInitHandler2.cs
new file mode 100644
index 0000000000000000000000000000000000000000..5576ca4384ef9995487a7d46700bcb151f911124
--- /dev/null
+++ b/JAPA/Assets/Scripts/MoveBarco/textInitHandler2.cs
@@ -0,0 +1,35 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class textInitHandler2 : MonoBehaviour {
+
+ private bool clicado;
+ private UnityEngine.UI.Text textT;
+ private GameObject texto;
+
+
+ // Use this for initialization
+ void Start () {
+ clicado = false;
+ }
+
+ // Update is called once per frame
+ public void Click (string sceneName) {
+ if (!clicado)
+ {
+ clicado = true;
+ texto = GameObject.Find("Canvas/Habacuque/Discurso");
+ textT = texto.GetComponent<UnityEngine.UI.Text>();
+ textT.text = ("Use seus movimentos para equilibrar o barco e jogar todas as bombas para fora antes que elas explodão, e sem deixar nossos barris de laranja irem juntos!! Pronto pra essa aventura Pirata?");
+ texto = GameObject.Find("Canvas/Jogar/Text");
+ textT = texto.GetComponent<UnityEngine.UI.Text>();
+ textT.text = ("Jogar");
+ }
+ else
+ {
+ SceneManager.LoadScene(sceneName);
+ }
+ }
+}
diff --git a/JAPA/Assets/Scripts/MoveBarco/textInitHandler2.cs.meta b/JAPA/Assets/Scripts/MoveBarco/textInitHandler2.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..93f27d6e0c1ddaa1615c7f21bbf811a5a570b48a
--- /dev/null
+++ b/JAPA/Assets/Scripts/MoveBarco/textInitHandler2.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 8e1e2f2ba3c3c47b2aca6d732fb4ea73
+timeCreated: 1539779562
+licenseType: Free
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/JAPA/Assets/Sprites/MoveBarco/Habacuque.png b/JAPA/Assets/Sprites/MoveBarco/Habacuque.png
new file mode 100644
index 0000000000000000000000000000000000000000..e66f84f53c420cdafe99be399ebf6f27e6a065e9
Binary files /dev/null and b/JAPA/Assets/Sprites/MoveBarco/Habacuque.png differ
diff --git a/JAPA/Assets/Sprites/MoveBarco/Habacuque.png.meta b/JAPA/Assets/Sprites/MoveBarco/Habacuque.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..910f50022858e625540e80e0c52c15e2460eeb20
--- /dev/null
+++ b/JAPA/Assets/Sprites/MoveBarco/Habacuque.png.meta
@@ -0,0 +1,116 @@
+fileFormatVersion: 2
+guid: 369e428cef59944029c716f8d5d26bf8
+timeCreated: 1539615620
+licenseType: Free
+TextureImporter:
+ fileIDToRecycleName: {}
+ serializedVersion: 4
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ filterMode: -1
+ aniso: -1
+ mipBias: -1
+ wrapMode: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spritePixelsToUnits: 100
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ 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: []
+ outline: []
+ spritePackingTag:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/JAPA/Assets/Sprites/MoveBarco/avoerr.png b/JAPA/Assets/Sprites/MoveBarco/avoerr.png
new file mode 100644
index 0000000000000000000000000000000000000000..99f628df7094aa4f9ee0e94b90e9767ae2d87da0
Binary files /dev/null and b/JAPA/Assets/Sprites/MoveBarco/avoerr.png differ
diff --git a/JAPA/Assets/Sprites/MoveBarco/avoerr.png.meta b/JAPA/Assets/Sprites/MoveBarco/avoerr.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..fac99b72f57010bedba3b6c444a3805f990ca932
--- /dev/null
+++ b/JAPA/Assets/Sprites/MoveBarco/avoerr.png.meta
@@ -0,0 +1,116 @@
+fileFormatVersion: 2
+guid: 12936484096f44aacb01edd5b51754e3
+timeCreated: 1539615216
+licenseType: Free
+TextureImporter:
+ fileIDToRecycleName: {}
+ serializedVersion: 4
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ filterMode: -1
+ aniso: -1
+ mipBias: -1
+ wrapMode: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spritePixelsToUnits: 100
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ 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: []
+ outline: []
+ spritePackingTag:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/JAPA/Assets/Sprites/MoveBarco/background.png b/JAPA/Assets/Sprites/MoveBarco/background.png
new file mode 100644
index 0000000000000000000000000000000000000000..220a6ce31484c4be1c60cc42de656ae8d42be7dc
Binary files /dev/null and b/JAPA/Assets/Sprites/MoveBarco/background.png differ
diff --git a/JAPA/Assets/Sprites/MoveBarco/background.png.meta b/JAPA/Assets/Sprites/MoveBarco/background.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..23a7dc79d1b2cd1f702557f99de0e0e44bff85c0
--- /dev/null
+++ b/JAPA/Assets/Sprites/MoveBarco/background.png.meta
@@ -0,0 +1,116 @@
+fileFormatVersion: 2
+guid: c43087ed177a34979ac3c3591606d5cf
+timeCreated: 1539615265
+licenseType: Free
+TextureImporter:
+ fileIDToRecycleName: {}
+ serializedVersion: 4
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ filterMode: -1
+ aniso: -1
+ mipBias: -1
+ wrapMode: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spritePixelsToUnits: 100
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ platformSettings:
+ - buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ 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: []
+ outline: []
+ spritePackingTag:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/JAPA/JAPA.userprefs b/JAPA/JAPA.userprefs
index 8a063dbf7a9a2b13faae65382ad42e4db8590038..d0a7ef9edf9455247cd234f3265631972c297071 100644
--- a/JAPA/JAPA.userprefs
+++ b/JAPA/JAPA.userprefs
@@ -1,6 +1,10 @@
<Properties>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
- <MonoDevelop.Ide.Workbench />
+ <MonoDevelop.Ide.Workbench ActiveDocument="Assets/Animations/MoveBarco/anim.cs">
+ <Files>
+ <File FileName="Assets/Animations/MoveBarco/anim.cs" Line="21" Column="9" />
+ </Files>
+ </MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/JAPA/Library/CurrentLayout.dwlt b/JAPA/Library/CurrentLayout.dwlt
index 1f0534a5cbb81a77c6cb2761d3aece85da547e13..0039f5977f21c6c68e7cb321fed660311921af64 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 c1068c0617ea3549aa466cdff9d9de07ce4a1b5c..04ec3af5f3e691384953ede43ee7011ef0d4569e 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 a5ed24736f93937699ccd5fe0cd86de013d38624..be35eb11138230c066fe66a2f7d17e3f2cbf8b2b 100644
Binary files a/JAPA/Library/LastBuild.buildreport and b/JAPA/Library/LastBuild.buildreport differ
diff --git a/JAPA/Library/ScriptAssemblies/Assembly-CSharp.dll b/JAPA/Library/ScriptAssemblies/Assembly-CSharp.dll
index e7d2c0446666fa4e3dc79bb55da42a5d2db500d0..89a49d4b064445a85c6874340ec8f6b9290285c8 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 0ebf483598876daf1b1202ee108a50cd9bc2c0b2..666da967b53fe225433c5ac18397e817f6aa9c59 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 d16c4861066285eabcf57af8d5c6e17e14d91a9a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/JAPA/Library/ScriptAssemblies/BuiltinAssemblies.stamp
+++ b/JAPA/Library/ScriptAssemblies/BuiltinAssemblies.stamp
@@ -1,2 +0,0 @@
-0000.583870b1.0000
-0000.583870b1.0000
\ No newline at end of file
diff --git a/JAPA/Library/assetDatabase3 b/JAPA/Library/assetDatabase3
index d6c9b86b5b44c16828d3366185b74c71d76806af..2a82dcdb0650a4b53abf2fedb9c5d382a841adf4 100644
Binary files a/JAPA/Library/assetDatabase3 and b/JAPA/Library/assetDatabase3 differ
diff --git a/JAPA/Library/expandedItems b/JAPA/Library/expandedItems
index 7ecf4e993d652a43dac3b77fa725797e77b7d474..a5e39edf8c0161d2a77a0018b6f1d93d7b9ace56 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 0b4af8fb95ea311f6ce00d39814d5e0c7fe824f8..c468b7f53c35c0fb9f04e509cde484080ed4f18e 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 b941dfc390f9faf8a45f784e47a46104e70ec43b..175665da83f395baed9f210f55184254a09c8a8a 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 fade0c91985afc95f5f1c8f3b97f23601dedb096..e2bdbdfa2bb002aa6c8c075ff9e099b2a5de12bf 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/0000000000000000b000000000000000 b/JAPA/Library/metadata/00/0000000000000000b000000000000000
index ead945a184eb635fbea3158f5a4ba1a3379fe490..62d97434a5624e5bd42a6acdf2b5fb7f8b50c4a4 100644
Binary files a/JAPA/Library/metadata/00/0000000000000000b000000000000000 and b/JAPA/Library/metadata/00/0000000000000000b000000000000000 differ
diff --git a/JAPA/Library/metadata/02/024e825da916b4034a4e0252cf95f03e b/JAPA/Library/metadata/02/024e825da916b4034a4e0252cf95f03e
index 3090abb624c40b74a685c24bbcb99b157ecf1fe0..3bb4d9a87141ce241387d99aebefc7888698c8ea 100644
Binary files a/JAPA/Library/metadata/02/024e825da916b4034a4e0252cf95f03e and b/JAPA/Library/metadata/02/024e825da916b4034a4e0252cf95f03e differ
diff --git a/JAPA/Library/metadata/02/024e825da916b4034a4e0252cf95f03e.info b/JAPA/Library/metadata/02/024e825da916b4034a4e0252cf95f03e.info
index 984f685c0e8462909fdbc04c3bb7117a75cc8499..16592da959ea7f3367e81e64ac3132ec625e66f4 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/12/12936484096f44aacb01edd5b51754e3 b/JAPA/Library/metadata/12/12936484096f44aacb01edd5b51754e3
new file mode 100644
index 0000000000000000000000000000000000000000..68c5c6534267ed68fed658e2523db7880ca5add5
Binary files /dev/null and b/JAPA/Library/metadata/12/12936484096f44aacb01edd5b51754e3 differ
diff --git a/JAPA/Library/metadata/12/12936484096f44aacb01edd5b51754e3.info b/JAPA/Library/metadata/12/12936484096f44aacb01edd5b51754e3.info
new file mode 100644
index 0000000000000000000000000000000000000000..c64d276fbc5123e6cc30aa286178f11b3d230514
Binary files /dev/null and b/JAPA/Library/metadata/12/12936484096f44aacb01edd5b51754e3.info differ
diff --git a/JAPA/Library/metadata/36/369e428cef59944029c716f8d5d26bf8 b/JAPA/Library/metadata/36/369e428cef59944029c716f8d5d26bf8
new file mode 100644
index 0000000000000000000000000000000000000000..e84bb9c9ac22a0b3dcfcbc3485b0c3297e8821ce
Binary files /dev/null and b/JAPA/Library/metadata/36/369e428cef59944029c716f8d5d26bf8 differ
diff --git a/JAPA/Library/metadata/36/369e428cef59944029c716f8d5d26bf8.info b/JAPA/Library/metadata/36/369e428cef59944029c716f8d5d26bf8.info
new file mode 100644
index 0000000000000000000000000000000000000000..f8afe25228bb45e90c4de2cc5d25f70101a2de6f
Binary files /dev/null and b/JAPA/Library/metadata/36/369e428cef59944029c716f8d5d26bf8.info differ
diff --git a/JAPA/Library/metadata/39/39b6e4893ce5942f2a41eb9f127b760c b/JAPA/Library/metadata/39/39b6e4893ce5942f2a41eb9f127b760c
new file mode 100644
index 0000000000000000000000000000000000000000..352d7ba014b8806195d338416d0b7d773bc2b58e
Binary files /dev/null and b/JAPA/Library/metadata/39/39b6e4893ce5942f2a41eb9f127b760c differ
diff --git a/JAPA/Library/metadata/39/39b6e4893ce5942f2a41eb9f127b760c.info b/JAPA/Library/metadata/39/39b6e4893ce5942f2a41eb9f127b760c.info
new file mode 100644
index 0000000000000000000000000000000000000000..921193857990e6972408bd93fa6c863cd5953562
Binary files /dev/null and b/JAPA/Library/metadata/39/39b6e4893ce5942f2a41eb9f127b760c.info differ
diff --git a/JAPA/Library/metadata/41/41f33d10942fe47f0882c465cd95d78b b/JAPA/Library/metadata/41/41f33d10942fe47f0882c465cd95d78b
new file mode 100644
index 0000000000000000000000000000000000000000..bf687bb71ccfec2e4fdeae2d64cd3194d4eb71a1
Binary files /dev/null and b/JAPA/Library/metadata/41/41f33d10942fe47f0882c465cd95d78b differ
diff --git a/JAPA/Library/metadata/41/41f33d10942fe47f0882c465cd95d78b.info b/JAPA/Library/metadata/41/41f33d10942fe47f0882c465cd95d78b.info
new file mode 100644
index 0000000000000000000000000000000000000000..e69e272e3a78ca5c266bbac34f17637fa660f317
Binary files /dev/null and b/JAPA/Library/metadata/41/41f33d10942fe47f0882c465cd95d78b.info differ
diff --git a/JAPA/Library/metadata/77/7703b5e0291d14e43839449ca274b1b6 b/JAPA/Library/metadata/77/7703b5e0291d14e43839449ca274b1b6
new file mode 100644
index 0000000000000000000000000000000000000000..8a1ae1b4466393e3daf90471271794982a20191f
Binary files /dev/null and b/JAPA/Library/metadata/77/7703b5e0291d14e43839449ca274b1b6 differ
diff --git a/JAPA/Library/metadata/77/7703b5e0291d14e43839449ca274b1b6.info b/JAPA/Library/metadata/77/7703b5e0291d14e43839449ca274b1b6.info
new file mode 100644
index 0000000000000000000000000000000000000000..dddc722d244d22080afa66af0efb96267ca787ae
Binary files /dev/null and b/JAPA/Library/metadata/77/7703b5e0291d14e43839449ca274b1b6.info differ
diff --git a/JAPA/Library/metadata/7d/7d8a1f38e5d21429d831fdf8b14f9609 b/JAPA/Library/metadata/7d/7d8a1f38e5d21429d831fdf8b14f9609
index 0ae68597c21fcde4a9f137e978b6463e40094b79..6acabb569b3862513ead8ab9881c3235deed88db 100644
Binary files a/JAPA/Library/metadata/7d/7d8a1f38e5d21429d831fdf8b14f9609 and b/JAPA/Library/metadata/7d/7d8a1f38e5d21429d831fdf8b14f9609 differ
diff --git a/JAPA/Library/metadata/8e/8e1e2f2ba3c3c47b2aca6d732fb4ea73 b/JAPA/Library/metadata/8e/8e1e2f2ba3c3c47b2aca6d732fb4ea73
new file mode 100644
index 0000000000000000000000000000000000000000..78ae3458380a3654d5efc56f67583b47d543a028
Binary files /dev/null and b/JAPA/Library/metadata/8e/8e1e2f2ba3c3c47b2aca6d732fb4ea73 differ
diff --git a/JAPA/Library/metadata/8e/8e1e2f2ba3c3c47b2aca6d732fb4ea73.info b/JAPA/Library/metadata/8e/8e1e2f2ba3c3c47b2aca6d732fb4ea73.info
new file mode 100644
index 0000000000000000000000000000000000000000..0e1877f668b4a63bb8793d1649e0fe9cbed8582b
Binary files /dev/null and b/JAPA/Library/metadata/8e/8e1e2f2ba3c3c47b2aca6d732fb4ea73.info differ
diff --git a/JAPA/Library/metadata/c4/c43087ed177a34979ac3c3591606d5cf b/JAPA/Library/metadata/c4/c43087ed177a34979ac3c3591606d5cf
new file mode 100644
index 0000000000000000000000000000000000000000..8cae8e383fc5d7bcd636d98176c0edcd2e7b4d2c
Binary files /dev/null and b/JAPA/Library/metadata/c4/c43087ed177a34979ac3c3591606d5cf differ
diff --git a/JAPA/Library/metadata/c4/c43087ed177a34979ac3c3591606d5cf.info b/JAPA/Library/metadata/c4/c43087ed177a34979ac3c3591606d5cf.info
new file mode 100644
index 0000000000000000000000000000000000000000..bfa03a996800af79fdfbc56171436c5c756d8681
Binary files /dev/null and b/JAPA/Library/metadata/c4/c43087ed177a34979ac3c3591606d5cf.info differ
diff --git a/JAPA/Library/metadata/cd/cd06412bcfa7d46619071a14ab668c56 b/JAPA/Library/metadata/cd/cd06412bcfa7d46619071a14ab668c56
index 7b073410587b3f6f8bc0f899bf9dbf07985ac6fc..e2033ae1fab40a1b7c3a7062f2bb152379a25a52 100644
Binary files a/JAPA/Library/metadata/cd/cd06412bcfa7d46619071a14ab668c56 and b/JAPA/Library/metadata/cd/cd06412bcfa7d46619071a14ab668c56 differ
diff --git a/JAPA/Library/metadata/f6/f6ff0d4bc1fe146599a68f996589fbf2 b/JAPA/Library/metadata/f6/f6ff0d4bc1fe146599a68f996589fbf2
new file mode 100644
index 0000000000000000000000000000000000000000..4baaf40f7d915acb3b9ff5a719fec764d459539a
Binary files /dev/null and b/JAPA/Library/metadata/f6/f6ff0d4bc1fe146599a68f996589fbf2 differ
diff --git a/JAPA/Library/metadata/f6/f6ff0d4bc1fe146599a68f996589fbf2.info b/JAPA/Library/metadata/f6/f6ff0d4bc1fe146599a68f996589fbf2.info
new file mode 100644
index 0000000000000000000000000000000000000000..865f3d6a0c77f98318e6b99fae27ea070a12e6e2
Binary files /dev/null and b/JAPA/Library/metadata/f6/f6ff0d4bc1fe146599a68f996589fbf2.info differ
diff --git a/JAPA/Library/shadercompiler-UnityShaderCompiler0.log b/JAPA/Library/shadercompiler-UnityShaderCompiler0.log
index bd4b8b114286ef4331aed160989de6cf5e851d61..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/JAPA/Library/shadercompiler-UnityShaderCompiler0.log
+++ b/JAPA/Library/shadercompiler-UnityShaderCompiler0.log
@@ -1,2 +0,0 @@
-Base path: /opt/Unity/Editor/Data
-Cmd: getPlatforms
diff --git a/JAPA/ProjectSettings/EditorBuildSettings.asset b/JAPA/ProjectSettings/EditorBuildSettings.asset
index 9661c4c8f821b68ac961f727fb9960117eeadd29..ec66ea25b76fb69ba1f45ae240a82fd42710026b 100644
Binary files a/JAPA/ProjectSettings/EditorBuildSettings.asset and b/JAPA/ProjectSettings/EditorBuildSettings.asset differ
diff --git a/JAPA/Temp/ProcessJobs/e9a6970f79cd12d8b075e7d72f1b07cb.bakert b/JAPA/Temp/ProcessJobs/e9a6970f79cd12d8b075e7d72f1b07cb.bakert
new file mode 100644
index 0000000000000000000000000000000000000000..55741c434a1593b4ca6885e047d3b4f2c48927a7
Binary files /dev/null and b/JAPA/Temp/ProcessJobs/e9a6970f79cd12d8b075e7d72f1b07cb.bakert differ
diff --git a/JAPA/Temp/UnityLockfile b/JAPA/Temp/UnityLockfile
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391