From 9d63b8f5c71b94689752aaab5df007bd8cbe6c9f Mon Sep 17 00:00:00 2001 From: Mateus Pires Date: Wed, 24 Feb 2016 17:59:08 -0300 Subject: [PATCH] Demo e org --- Assets/Resources/GUI/Icon6.png | Bin 0 -> 22445 bytes Assets/Resources/GUI/Icon6.png.meta | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/Icon7.png | Bin 0 -> 925826 bytes Assets/Resources/GUI/Icon7.png.meta | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/realizadores.meta | 9 +++++++++ Assets/Resources/GUI/realizadores/Gov1B.png | Bin 0 -> 6791 bytes Assets/Resources/GUI/realizadores/Gov1B.png.meta | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/realizadores/Gov2.png | Bin 0 -> 5344 bytes Assets/Resources/GUI/realizadores/Gov2.png.meta | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/realizadores/Gov3.png | Bin 0 -> 4527 bytes Assets/Resources/GUI/realizadores/Gov3.png.meta | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/realizadores/Gov4.png | Bin 0 -> 35218 bytes Assets/Resources/GUI/realizadores/Gov4.png.meta | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/realizadores/Lavid.png | Bin 0 -> 24564 bytes Assets/Resources/GUI/realizadores/Lavid.png.meta | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/realizadores/Layer 1.png | Bin 0 -> 20924 bytes Assets/Resources/GUI/realizadores/Layer 1.png.meta | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/realizadores/Lsd.png | Bin 0 -> 27853 bytes Assets/Resources/GUI/realizadores/Lsd.png.meta | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/realizadores/Rnp.png | Bin 0 -> 19057 bytes Assets/Resources/GUI/realizadores/Rnp.png.meta | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/realizadores/UFcg.png | Bin 0 -> 29730 bytes Assets/Resources/GUI/realizadores/UFcg.png.meta | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/realizadores/Ufpb.png | Bin 0 -> 34695 bytes Assets/Resources/GUI/realizadores/Ufpb.png.meta | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Scenes/Main.unity | 1298 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------- Assets/Scripts/Player Manager/DefaultSignSpeed.cs | 6 ++---- Assets/Scripts/Player Manager/GenericPlayerManager.cs | 397 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- Assets/Scripts/Player Manager/RandomAnimations.cs | 25 +++++++++++++++++++------ Assets/Scripts/Player Manager/Subtitle.cs | 29 ++++++++++++++++++++++------- Assets/Scripts/PlayerManager.cs | 33 ++++++++++++++++++++------------- Assets/Scripts/UI/MakersScreenTextResizer.cs | 29 +++++++++++++++++++++++++++++ Assets/Scripts/UI/MakersScreenTextResizer.cs.meta | 12 ++++++++++++ Assets/Scripts/UI/ScreenManager.cs | 10 ++++++++++ Assets/Scripts/UI/SliderHandleResizer.cs | 29 +++++++++++++++++++++++++++++ Assets/Scripts/UI/SliderHandleResizer.cs.meta | 12 ++++++++++++ Assets/Scripts/UI/TutorialManager.cs | 6 ++++-- ProjectSettings/ProjectSettings.asset | 8 ++++---- 38 files changed, 2266 insertions(+), 309 deletions(-) create mode 100644 Assets/Resources/GUI/Icon6.png create mode 100644 Assets/Resources/GUI/Icon6.png.meta create mode 100644 Assets/Resources/GUI/Icon7.png create mode 100644 Assets/Resources/GUI/Icon7.png.meta create mode 100644 Assets/Resources/GUI/realizadores.meta create mode 100644 Assets/Resources/GUI/realizadores/Gov1B.png create mode 100644 Assets/Resources/GUI/realizadores/Gov1B.png.meta create mode 100644 Assets/Resources/GUI/realizadores/Gov2.png create mode 100644 Assets/Resources/GUI/realizadores/Gov2.png.meta create mode 100644 Assets/Resources/GUI/realizadores/Gov3.png create mode 100644 Assets/Resources/GUI/realizadores/Gov3.png.meta create mode 100644 Assets/Resources/GUI/realizadores/Gov4.png create mode 100644 Assets/Resources/GUI/realizadores/Gov4.png.meta create mode 100644 Assets/Resources/GUI/realizadores/Lavid.png create mode 100644 Assets/Resources/GUI/realizadores/Lavid.png.meta create mode 100644 Assets/Resources/GUI/realizadores/Layer 1.png create mode 100644 Assets/Resources/GUI/realizadores/Layer 1.png.meta create mode 100644 Assets/Resources/GUI/realizadores/Lsd.png create mode 100644 Assets/Resources/GUI/realizadores/Lsd.png.meta create mode 100644 Assets/Resources/GUI/realizadores/Rnp.png create mode 100644 Assets/Resources/GUI/realizadores/Rnp.png.meta create mode 100644 Assets/Resources/GUI/realizadores/UFcg.png create mode 100644 Assets/Resources/GUI/realizadores/UFcg.png.meta create mode 100644 Assets/Resources/GUI/realizadores/Ufpb.png create mode 100644 Assets/Resources/GUI/realizadores/Ufpb.png.meta create mode 100644 Assets/Scripts/UI/MakersScreenTextResizer.cs create mode 100644 Assets/Scripts/UI/MakersScreenTextResizer.cs.meta create mode 100644 Assets/Scripts/UI/SliderHandleResizer.cs create mode 100644 Assets/Scripts/UI/SliderHandleResizer.cs.meta diff --git a/Assets/Resources/GUI/Icon6.png b/Assets/Resources/GUI/Icon6.png new file mode 100644 index 0000000..70955c2 Binary files /dev/null and b/Assets/Resources/GUI/Icon6.png differ diff --git a/Assets/Resources/GUI/Icon6.png.meta b/Assets/Resources/GUI/Icon6.png.meta new file mode 100644 index 0000000..e0c5c3e --- /dev/null +++ b/Assets/Resources/GUI/Icon6.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: ea7ce2ab1d26fe142a763356a03419f5 +timeCreated: 1456249216 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/Icon7.png b/Assets/Resources/GUI/Icon7.png new file mode 100644 index 0000000..3c7a4ba Binary files /dev/null and b/Assets/Resources/GUI/Icon7.png differ diff --git a/Assets/Resources/GUI/Icon7.png.meta b/Assets/Resources/GUI/Icon7.png.meta new file mode 100644 index 0000000..e115fbd --- /dev/null +++ b/Assets/Resources/GUI/Icon7.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: 093a2b7f60adfe24ab00dd4e3eef9ac3 +timeCreated: 1456249216 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/realizadores.meta b/Assets/Resources/GUI/realizadores.meta new file mode 100644 index 0000000..aa49789 --- /dev/null +++ b/Assets/Resources/GUI/realizadores.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 61b1da46741817b458d740769d030120 +folderAsset: yes +timeCreated: 1456247283 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/realizadores/Gov1B.png b/Assets/Resources/GUI/realizadores/Gov1B.png new file mode 100644 index 0000000..6fcf1ab Binary files /dev/null and b/Assets/Resources/GUI/realizadores/Gov1B.png differ diff --git a/Assets/Resources/GUI/realizadores/Gov1B.png.meta b/Assets/Resources/GUI/realizadores/Gov1B.png.meta new file mode 100644 index 0000000..5fe0aed --- /dev/null +++ b/Assets/Resources/GUI/realizadores/Gov1B.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: 359a81b8c2c4de045a51c9ea52aa9fa7 +timeCreated: 1456247283 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/realizadores/Gov2.png b/Assets/Resources/GUI/realizadores/Gov2.png new file mode 100644 index 0000000..ce33ad5 Binary files /dev/null and b/Assets/Resources/GUI/realizadores/Gov2.png differ diff --git a/Assets/Resources/GUI/realizadores/Gov2.png.meta b/Assets/Resources/GUI/realizadores/Gov2.png.meta new file mode 100644 index 0000000..29bdc82 --- /dev/null +++ b/Assets/Resources/GUI/realizadores/Gov2.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: 146c86da3c7a27944895b4bd8df77ecb +timeCreated: 1456247283 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/realizadores/Gov3.png b/Assets/Resources/GUI/realizadores/Gov3.png new file mode 100644 index 0000000..38bc5a4 Binary files /dev/null and b/Assets/Resources/GUI/realizadores/Gov3.png differ diff --git a/Assets/Resources/GUI/realizadores/Gov3.png.meta b/Assets/Resources/GUI/realizadores/Gov3.png.meta new file mode 100644 index 0000000..43ad559 --- /dev/null +++ b/Assets/Resources/GUI/realizadores/Gov3.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: f88d012f31e17a346ad5315d5e895d13 +timeCreated: 1456247284 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/realizadores/Gov4.png b/Assets/Resources/GUI/realizadores/Gov4.png new file mode 100644 index 0000000..7403ab8 Binary files /dev/null and b/Assets/Resources/GUI/realizadores/Gov4.png differ diff --git a/Assets/Resources/GUI/realizadores/Gov4.png.meta b/Assets/Resources/GUI/realizadores/Gov4.png.meta new file mode 100644 index 0000000..a4cb3ca --- /dev/null +++ b/Assets/Resources/GUI/realizadores/Gov4.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: 2fe7271373ab84e42a7712fc31ff017d +timeCreated: 1456247283 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/realizadores/Lavid.png b/Assets/Resources/GUI/realizadores/Lavid.png new file mode 100644 index 0000000..78c7e48 Binary files /dev/null and b/Assets/Resources/GUI/realizadores/Lavid.png differ diff --git a/Assets/Resources/GUI/realizadores/Lavid.png.meta b/Assets/Resources/GUI/realizadores/Lavid.png.meta new file mode 100644 index 0000000..e63bd1f --- /dev/null +++ b/Assets/Resources/GUI/realizadores/Lavid.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: feeae326a499bfc4eb18998b933a7148 +timeCreated: 1456247284 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/realizadores/Layer 1.png b/Assets/Resources/GUI/realizadores/Layer 1.png new file mode 100644 index 0000000..c5f42a8 Binary files /dev/null and b/Assets/Resources/GUI/realizadores/Layer 1.png differ diff --git a/Assets/Resources/GUI/realizadores/Layer 1.png.meta b/Assets/Resources/GUI/realizadores/Layer 1.png.meta new file mode 100644 index 0000000..a420a93 --- /dev/null +++ b/Assets/Resources/GUI/realizadores/Layer 1.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: 0d877e85117f65d4586d74db7d9ef266 +timeCreated: 1456247283 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/realizadores/Lsd.png b/Assets/Resources/GUI/realizadores/Lsd.png new file mode 100644 index 0000000..793d041 Binary files /dev/null and b/Assets/Resources/GUI/realizadores/Lsd.png differ diff --git a/Assets/Resources/GUI/realizadores/Lsd.png.meta b/Assets/Resources/GUI/realizadores/Lsd.png.meta new file mode 100644 index 0000000..c1675b8 --- /dev/null +++ b/Assets/Resources/GUI/realizadores/Lsd.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: 78f9e308bccfa854ea0358b3df63d77f +timeCreated: 1456247284 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/realizadores/Rnp.png b/Assets/Resources/GUI/realizadores/Rnp.png new file mode 100644 index 0000000..cedd25a Binary files /dev/null and b/Assets/Resources/GUI/realizadores/Rnp.png differ diff --git a/Assets/Resources/GUI/realizadores/Rnp.png.meta b/Assets/Resources/GUI/realizadores/Rnp.png.meta new file mode 100644 index 0000000..8035998 --- /dev/null +++ b/Assets/Resources/GUI/realizadores/Rnp.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: 6660d37921c0cb046af9d4717fc72237 +timeCreated: 1456247284 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/realizadores/UFcg.png b/Assets/Resources/GUI/realizadores/UFcg.png new file mode 100644 index 0000000..97d2616 Binary files /dev/null and b/Assets/Resources/GUI/realizadores/UFcg.png differ diff --git a/Assets/Resources/GUI/realizadores/UFcg.png.meta b/Assets/Resources/GUI/realizadores/UFcg.png.meta new file mode 100644 index 0000000..583b98d --- /dev/null +++ b/Assets/Resources/GUI/realizadores/UFcg.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: c8d7dd1fea55820428d8a9afdfff7bea +timeCreated: 1456247284 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/realizadores/Ufpb.png b/Assets/Resources/GUI/realizadores/Ufpb.png new file mode 100644 index 0000000..7db3654 Binary files /dev/null and b/Assets/Resources/GUI/realizadores/Ufpb.png differ diff --git a/Assets/Resources/GUI/realizadores/Ufpb.png.meta b/Assets/Resources/GUI/realizadores/Ufpb.png.meta new file mode 100644 index 0000000..02d5c84 --- /dev/null +++ b/Assets/Resources/GUI/realizadores/Ufpb.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: 638d58b65a3bfcf45955f6c3a1fbb4f9 +timeCreated: 1456247284 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index ebd1479..198271c 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -704,6 +704,73 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 191800645} +--- !u!1 &197321765 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 197321766} + - 222: {fileID: 197321768} + - 114: {fileID: 197321767} + m_Layer: 5 + m_Name: secret_tec + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &197321766 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 197321765} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1010778543} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: .610000014} + m_AnchorMax: {x: 1, y: .790000021} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &197321767 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 197321765} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 359a81b8c2c4de045a51c9ea52aa9fa7, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &197321768 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 197321765} --- !u!1 &212041959 GameObject: m_ObjectHideFlags: 0 @@ -825,6 +892,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 76b77d949fd9e294bb95149436284217, type: 3} m_Name: m_EditorClassIdentifier: + screenManager: {fileID: 2131993092} description: {fileID: 2010584311} translateImage: {fileID: 45157148} micImage: {fileID: 510126320} @@ -2299,6 +2367,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eeb6a455eb0dfd94aa6bc3484e5fecff, type: 3} m_Name: m_EditorClassIdentifier: + glosa: SUBTITLES: {fileID: 1795476622} randomAnimations: {fileID: 2111966982} translateScreenText: {fileID: 1202010950} @@ -2915,6 +2984,146 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 814612176} +--- !u!1 &815279417 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 100084, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 815279418} + - 222: {fileID: 815279422} + - 114: {fileID: 815279421} + - 114: {fileID: 815279420} + - 114: {fileID: 815279419} + m_Layer: 5 + m_Name: b_close + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &815279418 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22409254, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 815279417} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2044204295} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: .910000026} + m_AnchorMax: {x: .970000029, y: .980000019} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!114 &815279419 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11446186, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 815279417} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 1573420865, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: .5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!114 &815279420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11464464, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 815279417} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0, g: 0, b: 0, a: .233999997} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 815279421} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2131993092} + m_MethodName: hideScreen + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &815279421 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11468796, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 815279417} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: d210b63ba2d5c22499f56e30b3ff5402, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &815279422 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22249114, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 815279417} --- !u!1 &832064354 GameObject: m_ObjectHideFlags: 0 @@ -2978,7 +3187,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1414104007} - m_RootOrder: 9 + m_RootOrder: 10 --- !u!114 &842733391 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3846,6 +4055,43 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 995712443} +--- !u!1 &1010778542 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1010778543} + m_Layer: 5 + m_Name: left + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1010778543 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1010778542} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1416567425} + - {fileID: 197321766} + - {fileID: 1439673894} + - {fileID: 1623694773} + - {fileID: 1494144144} + m_Father: {fileID: 1221700622} + m_RootOrder: 0 + m_AnchorMin: {x: .0599999987, y: 0} + m_AnchorMax: {x: .469999999, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} --- !u!1 &1021427527 GameObject: m_ObjectHideFlags: 0 @@ -4488,7 +4734,7 @@ RectTransform: - {fileID: 163763090} - {fileID: 1266698452} m_Father: {fileID: 1414104007} - m_RootOrder: 10 + m_RootOrder: 11 m_AnchorMin: {x: .0299999993, y: .300000012} m_AnchorMax: {x: .970000029, y: .699999988} m_AnchoredPosition: {x: 0, y: 0} @@ -4891,6 +5137,40 @@ MonoBehaviour: m_SelectionColor: {r: .65882355, g: .807843149, b: 1, a: .752941191} m_Text: m_CaretBlinkRate: .850000024 +--- !u!1 &1221700621 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1221700622} + m_Layer: 5 + m_Name: grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1221700622 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1221700621} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1010778543} + - {fileID: 1623802273} + m_Father: {fileID: 2044204295} + m_RootOrder: 2 + m_AnchorMin: {x: 0, y: .100000001} + m_AnchorMax: {x: 1, y: .839999974} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} --- !u!1 &1265043069 GameObject: m_ObjectHideFlags: 0 @@ -5413,53 +5693,120 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1329557728} ---- !u!1 &1382683268 +--- !u!1 &1330400154 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 142296, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 224: {fileID: 1382683269} - - 222: {fileID: 1382683273} - - 114: {fileID: 1382683272} - - 114: {fileID: 1382683271} - - 114: {fileID: 1382683270} + - 224: {fileID: 1330400155} + - 222: {fileID: 1330400157} + - 114: {fileID: 1330400156} m_Layer: 5 - m_Name: b_back + m_Name: minis_plan m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1382683269 +--- !u!224 &1330400155 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22417840, guid: 5ccb0ba277304a14b9bb8d4e34161675, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1382683268} + m_GameObject: {fileID: 1330400154} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1935189154} - m_RootOrder: 0 - m_AnchorMin: {x: .0299999993, y: .924000025} - m_AnchorMax: {x: .300000012, y: .980000019} + m_Father: {fileID: 1623802273} + m_RootOrder: 1 + m_AnchorMin: {x: .219999999, y: .610000014} + m_AnchorMax: {x: .779999971, y: .790000021} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: .5} ---- !u!114 &1382683270 + m_Pivot: {x: .5, y: .5} +--- !u!114 &1330400156 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11463586, guid: 5ccb0ba277304a14b9bb8d4e34161675, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1382683268} - m_Enabled: 0 + m_GameObject: {fileID: 1330400154} + m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1573420865, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 146c86da3c7a27944895b4bd8df77ecb, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1330400157 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1330400154} +--- !u!1 &1382683268 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 142296, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1382683269} + - 222: {fileID: 1382683273} + - 114: {fileID: 1382683272} + - 114: {fileID: 1382683271} + - 114: {fileID: 1382683270} + m_Layer: 5 + m_Name: b_back + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1382683269 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22417840, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1382683268} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1935189154} + m_RootOrder: 0 + m_AnchorMin: {x: .0299999993, y: .924000025} + m_AnchorMax: {x: .300000012, y: .980000019} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: .5} +--- !u!114 &1382683270 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11463586, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1382683268} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 1573420865, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: m_EffectColor: {r: 0, g: 0, b: 0, a: .5} @@ -5553,6 +5900,90 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1382683268} +--- !u!1 &1412335969 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1412335970} + - 222: {fileID: 1412335972} + - 114: {fileID: 1412335971} + - 114: {fileID: 1412335973} + m_Layer: 5 + m_Name: text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1412335970 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1412335969} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2044204295} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .860000014} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1412335971 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1412335969} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 1d71629ab414fbe4a9015401607e12a6, type: 3} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Realizadores +--- !u!222 &1412335972 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1412335969} +--- !u!114 &1412335973 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1412335969} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a7be422a80edfef4f8e4e8a6aca4378e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1414104006 GameObject: m_ObjectHideFlags: 0 @@ -5591,6 +6022,7 @@ RectTransform: - {fileID: 951727302} - {fileID: 954173493} - {fileID: 228512394} + - {fileID: 2044204295} - {fileID: 842733390} - {fileID: 1164416486} m_Father: {fileID: 0} @@ -5657,6 +6089,73 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingLayerID: 0 m_SortingOrder: 0 +--- !u!1 &1416567424 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1416567425} + - 222: {fileID: 1416567427} + - 114: {fileID: 1416567426} + m_Layer: 5 + m_Name: lavid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1416567425 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1416567424} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1010778543} + m_RootOrder: 0 + m_AnchorMin: {x: .100000001, y: .810000002} + m_AnchorMax: {x: .899999976, y: 1} + m_AnchoredPosition: {x: 0, y: 3.81469727e-06} + m_SizeDelta: {x: 0, y: -7.62939453e-06} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1416567426 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1416567424} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: feeae326a499bfc4eb18998b933a7148, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1416567427 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1416567424} --- !u!1 &1431596488 GameObject: m_ObjectHideFlags: 0 @@ -5848,6 +6347,73 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1438965114} +--- !u!1 &1439673893 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1439673894} + - 222: {fileID: 1439673896} + - 114: {fileID: 1439673895} + m_Layer: 5 + m_Name: minis_dir + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1439673894 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1439673893} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1010778543} + m_RootOrder: 2 + m_AnchorMin: {x: 0, y: .409999996} + m_AnchorMax: {x: 1, y: .589999974} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1439673895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1439673893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: f88d012f31e17a346ad5315d5e895d13, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1439673896 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1439673893} --- !u!1 &1445490039 GameObject: m_ObjectHideFlags: 0 @@ -6141,48 +6707,80 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1476138799} ---- !u!1 &1482831675 +--- !u!1 &1486957249 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 183530, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} + m_PrefabParentObject: {fileID: 134996, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 224: {fileID: 1482831676} - - 222: {fileID: 1482831678} - - 114: {fileID: 1482831677} + - 224: {fileID: 1486957250} m_Layer: 5 - m_Name: i_title + m_Name: Fill Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1482831676 +--- !u!224 &1486957250 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22410032, guid: 5ccb0ba277304a14b9bb8d4e34161675, + m_PrefabParentObject: {fileID: 22424074, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1482831675} + m_GameObject: {fileID: 1486957249} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1935189154} + m_Children: + - {fileID: 1438965115} + m_Father: {fileID: 268582951} m_RootOrder: 2 - m_AnchorMin: {x: .25999999, y: .930000007} - m_AnchorMax: {x: .74000001, y: .970000029} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: .439999998} + m_AnchorMax: {x: 1, y: .560000002} + m_AnchoredPosition: {x: 3, y: 0} + m_SizeDelta: {x: -26, y: 0} m_Pivot: {x: .5, y: .5} ---- !u!114 &1482831677 -MonoBehaviour: +--- !u!1 &1494144143 +GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11403604, guid: 5ccb0ba277304a14b9bb8d4e34161675, - type: 2} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1494144144} + - 222: {fileID: 1494144146} + - 114: {fileID: 1494144145} + m_Layer: 5 + m_Name: lab_sis + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1494144144 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1494144143} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1010778543} + m_RootOrder: 4 + m_AnchorMin: {x: .25999999, y: .00999999978} + m_AnchorMax: {x: .74000001, y: .189999998} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1494144145 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1482831675} + m_GameObject: {fileID: 1494144143} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} @@ -6196,7 +6794,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b022b6e070c6d4f4cb20908c3325e638, type: 3} + m_Sprite: {fileID: 21300000, guid: 78f9e308bccfa854ea0358b3df63d77f, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -6204,47 +6802,12 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!222 &1482831678 +--- !u!222 &1494144146 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22290882, guid: 5ccb0ba277304a14b9bb8d4e34161675, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1482831675} ---- !u!1 &1486957249 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 134996, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1486957250} - m_Layer: 5 - m_Name: Fill Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1486957250 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22424074, guid: 5ccb0ba277304a14b9bb8d4e34161675, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1486957249} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1438965115} - m_Father: {fileID: 268582951} - m_RootOrder: 2 - m_AnchorMin: {x: 0, y: .439999998} - m_AnchorMax: {x: 1, y: .560000002} - m_AnchoredPosition: {x: 3, y: 0} - m_SizeDelta: {x: -26, y: 0} - m_Pivot: {x: .5, y: .5} + m_GameObject: {fileID: 1494144143} --- !u!1 &1496206516 GameObject: m_ObjectHideFlags: 0 @@ -6673,6 +7236,110 @@ MonoBehaviour: ctrlBochecha_L: {fileID: 0} ctrlBochecha_R: {fileID: 0} BnMandibula: {fileID: 0} +--- !u!1 &1623694772 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1623694773} + - 222: {fileID: 1623694775} + - 114: {fileID: 1623694774} + m_Layer: 5 + m_Name: camara + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1623694773 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1623694772} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1010778543} + m_RootOrder: 3 + m_AnchorMin: {x: .300000012, y: .209999993} + m_AnchorMax: {x: .699999988, y: .389999986} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1623694774 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1623694772} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 0d877e85117f65d4586d74db7d9ef266, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1623694775 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1623694772} +--- !u!1 &1623802272 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1623802273} + m_Layer: 5 + m_Name: right + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1623802273 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1623802272} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1922820117} + - {fileID: 1330400155} + - {fileID: 1878890615} + - {fileID: 2034973519} + - {fileID: 2048170209} + m_Father: {fileID: 1221700622} + m_RootOrder: 1 + m_AnchorMin: {x: .529999971, y: 0} + m_AnchorMax: {x: .939999998, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} --- !u!1 &1632068376 GameObject: m_ObjectHideFlags: 0 @@ -7330,6 +7997,73 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} +--- !u!1 &1878890614 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1878890615} + - 222: {fileID: 1878890617} + - 114: {fileID: 1878890616} + m_Layer: 5 + m_Name: gov + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1878890615 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1878890614} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1623802273} + m_RootOrder: 2 + m_AnchorMin: {x: 0, y: .409999996} + m_AnchorMax: {x: 1, y: .589999974} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1878890616 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1878890614} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 2fe7271373ab84e42a7712fc31ff017d, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1878890617 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1878890614} --- !u!1 &1920630438 GameObject: m_ObjectHideFlags: 0 @@ -7444,6 +8178,73 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 +--- !u!1 &1922820116 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1922820117} + - 222: {fileID: 1922820119} + - 114: {fileID: 1922820118} + m_Layer: 5 + m_Name: ufpb + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1922820117 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1922820116} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1623802273} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .810000002} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1922820118 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1922820116} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 638d58b65a3bfcf45955f6c3a1fbb4f9, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1922820119 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1922820116} --- !u!1 &1923959836 GameObject: m_ObjectHideFlags: 0 @@ -7613,7 +8414,7 @@ RectTransform: m_Children: - {fileID: 1382683269} - {fileID: 1053934345} - - {fileID: 1482831676} + - {fileID: 2054908656} - {fileID: 1999953885} - {fileID: 2002966284} - {fileID: 1175405161} @@ -8127,6 +8928,195 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2023188708} +--- !u!1 &2034973518 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 2034973519} + - 222: {fileID: 2034973521} + - 114: {fileID: 2034973520} + m_Layer: 5 + m_Name: rnp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2034973519 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2034973518} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1623802273} + m_RootOrder: 3 + m_AnchorMin: {x: .150000006, y: .209999993} + m_AnchorMax: {x: .850000024, y: .389999986} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &2034973520 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2034973518} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 6660d37921c0cb046af9d4717fc72237, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &2034973521 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2034973518} +--- !u!1 &2044204294 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 2044204295} + - 222: {fileID: 2044204297} + - 114: {fileID: 2044204296} + - 114: {fileID: 2044204298} + m_Layer: 5 + m_Name: screen_makers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2044204295 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2044204294} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1412335970} + - {fileID: 815279418} + - {fileID: 1221700622} + m_Father: {fileID: 1414104007} + m_RootOrder: 9 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &2044204296 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2044204294} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &2044204297 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2044204294} +--- !u!114 &2044204298 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2044204294} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2044204296} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2131993092} + m_MethodName: hideScreen + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &2047431285 GameObject: m_ObjectHideFlags: 0 @@ -8213,6 +9203,143 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2047431285} +--- !u!1 &2048170208 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 2048170209} + - 222: {fileID: 2048170211} + - 114: {fileID: 2048170210} + m_Layer: 5 + m_Name: ufcg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2048170209 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2048170208} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1623802273} + m_RootOrder: 4 + m_AnchorMin: {x: .25999999, y: .00999999978} + m_AnchorMax: {x: .74000001, y: .189999998} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &2048170210 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2048170208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: c8d7dd1fea55820428d8a9afdfff7bea, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &2048170211 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2048170208} +--- !u!1 &2054908655 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 110030, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 2054908656} + - 222: {fileID: 2054908658} + - 114: {fileID: 2054908657} + m_Layer: 5 + m_Name: i_title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2054908656 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22412448, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2054908655} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1935189154} + m_RootOrder: 2 + m_AnchorMin: {x: .200000003, y: .93599999} + m_AnchorMax: {x: .800000012, y: .967999995} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &2054908657 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11404830, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2054908655} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: b022b6e070c6d4f4cb20908c3325e638, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &2054908658 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22296126, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2054908655} --- !u!1 &2063109691 GameObject: m_ObjectHideFlags: 0 @@ -8861,6 +9988,7 @@ MonoBehaviour: translateScreen: {fileID: 1935189153} dictScreen: {fileID: 951727301} tutorialScreen: {fileID: 228512393} + makersScreen: {fileID: 2044204294} textButtonImage: {fileID: 930426944} dictButtonImage: {fileID: 1649730299} infoButtonImage: {fileID: 2079280005} diff --git a/Assets/Scripts/Player Manager/DefaultSignSpeed.cs b/Assets/Scripts/Player Manager/DefaultSignSpeed.cs index a53b310..cb97caf 100644 --- a/Assets/Scripts/Player Manager/DefaultSignSpeed.cs +++ b/Assets/Scripts/Player Manager/DefaultSignSpeed.cs @@ -47,8 +47,7 @@ public class DefaultSignSpeed } - private float calculateUnit() - { + private float calculateUnit() { return (this.max - this.speed) / (DEFAULT_MAX - DEFAULT); } @@ -56,8 +55,7 @@ public class DefaultSignSpeed * Retorna velocidade em relação ao estado do slider. * @param slider - estado do slider (valor entre "speed - max" e "max") */ - public float getProportional(float slider) - { + public float getProportional(float slider) { return this.speed + (slider - DEFAULT) * this.unit; } } \ No newline at end of file diff --git a/Assets/Scripts/Player Manager/GenericPlayerManager.cs b/Assets/Scripts/Player Manager/GenericPlayerManager.cs index 5818b1c..257cda2 100644 --- a/Assets/Scripts/Player Manager/GenericPlayerManager.cs +++ b/Assets/Scripts/Player Manager/GenericPlayerManager.cs @@ -11,69 +11,80 @@ using UnityEngine.UI; public abstract class GenericPlayerManager : MonoBehaviour { private const string DEFAULT_ANIMATION = "_default"; - // private const string NONE_ANIMATION = "_defaultWORD"; protected float fadeLength = 0.6F; + public string glosa = ""; - protected string glosa = ""; - private static String[] stringPos = { DEFAULT_ANIMATION };//vetor que sera usado para quebrar a glosa + // Vetor usado para quebrar a glosa + private static String[] stringPos = { DEFAULT_ANIMATION }; + // Referencia para o avatar private GameObject AVATAR; + // Referencia para o componente animador do avatar private Animation COMPONENT_ANIMATION; private BoxCollider AVATAR_COLLIDER; public Text SUBTITLES; - // Guarda os nomes das palavras ja carregadas. + // Guarda os nomes das palavras já carregadas private HashSet loadedAssetBundles = new HashSet(); - // Guarda os nomes das palavras que nao tem assetbundle. + // Guarda os nomes das palavras que não tem assetbundle private HashSet nonexistentAssetBundles = new HashSet(); - // Lista de animações sendo reproduzidas. - // Utilizada para alterar velocidade e apresentar a legenda. - private volatile Queue animQueue = new Queue(); + // Fila de animações para reprodução + // Utilizada para alterar velocidade e apresentar a legenda + private Queue animQueue = new Queue(); + // Sinais de intervalo de animações: não sinaliza reprodução na UI private HashSet intervalAnimations = new HashSet(); + // Sinais ignorados na apresentação de legenda private HashSet flags = new HashSet(); - private volatile bool loadingSingleAnimation = false; + // True quando está reproduzindo alguma animação de intervalo private volatile bool playingIntervalAnimation = false; + // True quando está na função LoadAndPlay private volatile bool loading = false; + // True quando está reproduzindo qualquer animação private volatile bool playing = false; + // True quando é chamada a função de pausa private volatile bool paused = false; + // Gerenciador de animações de intervalo public RandomAnimations randomAnimations; - private Subtitle subtitle = null; + // Gerenciados de legendas + private Subtitle subtitles = null; public virtual void Start() { - subtitle = new Subtitle(SUBTITLES); - subtitle.DefaultWordSpeed = new DefaultSignSpeed(); - subtitle.DefaultFirstLetterSpeed = new DefaultSignSpeed(2.1F, 2.8F); - subtitle.DefaultLetterSpeed = new DefaultSignSpeed(3F, 4.3F); - subtitle.DefaultNumberSpeed = new DefaultSignSpeed(1.5F, 2.9F); - - AVATAR = GameObject.FindGameObjectWithTag("avatar");//referencia para o avatar - COMPONENT_ANIMATION = AVATAR.GetComponent();//referencia para o componente animador do avatar + // Configuração de velocidade das animações + subtitles = new Subtitle(SUBTITLES); + subtitles.DefaultWordSpeed = new DefaultSignSpeed(); + subtitles.DefaultFirstLetterSpeed = new DefaultSignSpeed(2.1F, 2.8F); + subtitles.DefaultLetterSpeed = new DefaultSignSpeed(3F, 4.3F); + subtitles.DefaultNumberSpeed = new DefaultSignSpeed(1.5F, 2.9F); + + AVATAR = GameObject.FindGameObjectWithTag("avatar"); + COMPONENT_ANIMATION = AVATAR.GetComponent(); AVATAR_COLLIDER = GameObject.FindGameObjectWithTag("avatar").GetComponent(); + // Sinais ignorados na legenda string[] flags = new string[] { "[PONTO]", "[INTERROGACAO]", "[EXCLAMACAO]" }; - foreach (string flag in flags) this.flags.Add(flag); + // Sinal default é tratado como animação de intervalo: não sinaliza reprodução na UI this.intervalAnimations.Add(DEFAULT_ANIMATION); } - public bool isLoadingSingleAnimation() { return loadingSingleAnimation; } public bool isPlayingIntervalAnimation() { return playingIntervalAnimation; } public bool isLoading() { return loading; } public bool isPlaying() { return playing; } public bool isPaused() { return paused; } + /* Configura as animações de intervalo */ public void setRandomAnimations(string[] intervalAnimations) { foreach (string name in intervalAnimations) @@ -89,31 +100,29 @@ public abstract class GenericPlayerManager : MonoBehaviour { AVATAR_COLLIDER.enabled = isActive; } - protected virtual void setSubtitle(string text) { - SUBTITLES.text = text; - } - // Define a velocidade das animacões com base no slider da GUI public void setSlider(float sliderPosition) { - subtitle.SliderPosition = sliderPosition; - subtitle.updateWordSpeed(); - subtitle.updateLetterSpeed(); - subtitle.updateNumberSpeed(); + subtitles.SliderPosition = sliderPosition; + subtitles.updateWordSpeed(); + subtitles.updateLetterSpeed(); + subtitles.updateNumberSpeed(); - if ( ! paused) + if ( ! paused) lock (animQueue) + { foreach (AnimationReference reference in animQueue) if (reference.type != Subtitle.TYPE_NONE && reference.state != null) reference.state.speed = getSpeedByType(reference.type); + } } private float getSpeedByType(short type) { switch (type) { - case Subtitle.TYPE_WORD: return subtitle.WordSpeed; - case Subtitle.TYPE_LETTER: return subtitle.LetterSpeed; - case Subtitle.TYPE_NUMBER: return subtitle.NumberSpeed; + case Subtitle.TYPE_WORD: return subtitles.WordSpeed; + case Subtitle.TYPE_LETTER: return subtitles.LetterSpeed; + case Subtitle.TYPE_NUMBER: return subtitles.NumberSpeed; } return 2F; @@ -134,9 +143,9 @@ public abstract class GenericPlayerManager : MonoBehaviour { StopCoroutine("handleStates"); this.randomAnimations.unlockFor("handleStates"); - setSubtitle(""); + this.subtitles.setText(""); - animQueue.Clear(); + lock (animQueue) { animQueue.Clear(); } COMPONENT_ANIMATION.Stop(); COMPONENT_ANIMATION.CrossFade(DEFAULT_ANIMATION, fadeLength, PlayMode.StopAll); @@ -163,7 +172,10 @@ public abstract class GenericPlayerManager : MonoBehaviour { { AnimationState state = COMPONENT_ANIMATION.CrossFadeQueued(name, fadeLength, QueueMode.CompleteOthers); state.speed = speed; - animQueue.Enqueue(new AnimationReference(name, subtitle, state, type)); + + lock (this.animQueue) { + animQueue.Enqueue(new AnimationReference(name, subtitle, state, type)); + } return state; } @@ -196,32 +208,25 @@ public abstract class GenericPlayerManager : MonoBehaviour { */ protected abstract void onPlayingStateChange(); - public void switchPauseState(bool paused) + public void setPauseState(bool paused) { if (this.paused != paused) { this.paused = paused; - foreach (AnimationReference reference in animQueue) - if (reference.state != null) - reference.state.speed = paused ? 0F : getSpeedByType(reference.type); + lock (animQueue) + { + foreach (AnimationReference reference in animQueue) + if (reference.state != null) + reference.state.speed = paused ? 0F : getSpeedByType(reference.type); + } onPlayingStateChange(); } } - public void setPauseState(bool paused) - { - if (this.paused != paused) - { - this.paused = paused; - - foreach (AnimationReference reference in animQueue) - if (reference.state != null) - reference.state.speed = paused ? 0F : getSpeedByType(reference.type); - - onPlayingStateChange(); - } + public void switchPauseState() { + setPauseState( ! this.paused); } public bool play() @@ -245,17 +250,20 @@ public abstract class GenericPlayerManager : MonoBehaviour { return play(true, false, true); } + private System.Object playLocker = new System.Object(); + public bool play(bool stopLoading, bool stopPlaying, bool forceLoading) { - try { - if (loading) + lock (this.playLocker) + { + if (this.loading) { if (stopLoading) stopAll(); else return false; } - else if (playing) + else if (this.playing) { if (stopPlaying) stopAnimations(); @@ -263,7 +271,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { else if ( ! forceLoading) return false; } - } catch (NullReferenceException nre) { nre.ToString(); } + } StartCoroutine("loadAndPlay"); return true; @@ -280,7 +288,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { bool defaultPlayed = false; // A reprodução da primeira letra deve ser longa para não ser cortada no fade - subtitle.updateLetterSpeed(); + this.subtitles.updateLetterSpeed(); for (int i = 0; i < word.Length; i++) { @@ -289,11 +297,11 @@ public abstract class GenericPlayerManager : MonoBehaviour { // Se for uma letra if (second >= 65 && second <= 90) - playAnimation(Subtitle.TYPE_LETTER, second.ToString(), lastAnimationSubtitle, subtitle.LetterSpeed); + playAnimation(Subtitle.TYPE_LETTER, second.ToString(), lastAnimationSubtitle, subtitles.LetterSpeed); // Se for um número else if (second >= 48 && second <= 57) - playAnimation(Subtitle.TYPE_NUMBER, second.ToString(), lastAnimationSubtitle, subtitle.NumberSpeed); + playAnimation(Subtitle.TYPE_NUMBER, second.ToString(), lastAnimationSubtitle, subtitles.NumberSpeed); // Se for uma vírgula else if (second == 44) @@ -309,7 +317,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle); // A reprodução da próxima letra deve ser longa para não ser cortada no fade - subtitle.updateLetterSpeed(); + subtitles.updateLetterSpeed(); } UnityEngine.Debug.Log("Animação \"" + second + "\" inexistente."); @@ -317,196 +325,209 @@ public abstract class GenericPlayerManager : MonoBehaviour { } defaultPlayed = false; - subtitle.updateLetterSpeed(); + subtitles.updateLetterSpeed(); } return lastAnimationSubtitle; } + private System.Object loadingLocker = new System.Object(); + private IEnumerator loadAndPlay() { - this.randomAnimations.lockFor("loadAndPlay"); - - this.loading = true; - // onPlayingStateChange(); - - string lastAnimationSubtitle = ""; - bool spelled = false; + lock (this.loadingLocker) + { + this.randomAnimations.lockFor("loadAndPlay"); - // Default - playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", 2F); + this.loading = true; + // onPlayingStateChange(); - if ( ! this.playing) - StartCoroutine("handleStates"); + string lastAnimationSubtitle = ""; + bool spelled = false; - stringPos = glosa.Split(' '); + // Default + playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", 2F); - foreach (string aniName in stringPos) - { - try { - if (String.IsNullOrEmpty(aniName)) continue; - } catch (Exception e) { - UnityEngine.Debug.Log(e + " :: NotNullNotEmpty"); - } + if ( ! this.playing) + StartCoroutine("handleStates"); - bool nonexistent = nonexistentAssetBundles.Contains(aniName); - bool loaded = loadedAssetBundles.Contains(aniName); + stringPos = glosa.Split(' '); - if ( ! nonexistent && ! loaded) + foreach (string aniName in stringPos) { - // Função loadAssetBundle é definida pela classe filha - WWW www = loadAssetBundle(aniName); + try { + if (String.IsNullOrEmpty(aniName)) continue; + } catch (Exception e) { + UnityEngine.Debug.Log(e + " :: NotNullNotEmpty"); + } + + bool nonexistent = nonexistentAssetBundles.Contains(aniName); + bool loaded = loadedAssetBundles.Contains(aniName); - if (www != null) + if ( ! nonexistent && ! loaded) { - yield return www; + // Função loadAssetBundle é definida pela classe filha + WWW www = loadAssetBundle(aniName); - AssetBundle bundle = null; + if (www != null) + { + yield return www; - if (www.error == null) - bundle = www.assetBundle; + AssetBundle bundle = null; - if (bundle != null && ! String.IsNullOrEmpty(bundle.mainAsset.name)) - { - AnimationClip aniClip = bundle.mainAsset as AnimationClip; - bundle.Unload(false); + if (www.error == null) + bundle = www.assetBundle; - if (aniClip) + if (bundle != null && ! String.IsNullOrEmpty(bundle.mainAsset.name)) { - COMPONENT_ANIMATION.AddClip(aniClip, aniName); + AnimationClip aniClip = bundle.mainAsset as AnimationClip; + bundle.Unload(false); + + if (aniClip) + { + COMPONENT_ANIMATION.AddClip(aniClip, aniName); - loadedAssetBundles.Add(aniName); - loaded = true; + loadedAssetBundles.Add(aniName); + loaded = true; + } + else UnityEngine.Debug.Log ("Sinal \"" + aniName + "\" não carregado corretamente."); } - else UnityEngine.Debug.Log ("Sinal \"" + aniName + "\" não carregado corretamente."); } } - } - // Reproduz palavra - if (loaded) - { - if (spelled) + // Reproduz palavra + if (loaded) { - // Default - playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle); - spelled = false; - } + if (spelled) + { + // Default + playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle); + spelled = false; + } - if (this.flags.Contains(aniName) || this.intervalAnimations.Contains(aniName)) - { - lastAnimationSubtitle = ""; - playAnimation(Subtitle.TYPE_WORD, aniName, ""); + if (this.flags.Contains(aniName) || this.intervalAnimations.Contains(aniName)) + { + lastAnimationSubtitle = ""; + playAnimation(Subtitle.TYPE_WORD, aniName, ""); + } + else + { + lastAnimationSubtitle = aniName; + playAnimation(Subtitle.TYPE_WORD, aniName); + } } + + // Soletra palavra else { - lastAnimationSubtitle = aniName; - playAnimation(Subtitle.TYPE_WORD, aniName); - } - } + // Se a animação não foi carregada e nem está marcada como não existente, + // adiciona ao set de animações não existentes + if ( ! nonexistent) + nonexistentAssetBundles.Add(aniName); - // Soletra palavra - else - { - // Se a animação não foi carregada e nem está marcada como não existente, - // adiciona ao set de animações não existentes - if ( ! nonexistent) - nonexistentAssetBundles.Add(aniName); + UnityEngine.Debug.Log("~~ To spell: " + aniName); - UnityEngine.Debug.Log("~~ To spell: " + aniName); + if (this.flags.Contains(aniName) || this.intervalAnimations.Contains(aniName)) + { + playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", 1.6F); + continue; + } - if (this.flags.Contains(aniName) || this.intervalAnimations.Contains(aniName)) - { - playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", 1.6F); - continue; - } + // Se já houve o soletramento de alguma palavra, reproduz animação default + if (spelled) + playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle, 1.6F); + else + spelled = true; - // Se já houve o soletramento de alguma palavra, reproduz animação default - if (spelled) - playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle, 1.6F); - else - spelled = true; - - lastAnimationSubtitle = spellWord(aniName); + lastAnimationSubtitle = spellWord(aniName); + } } - } - // Default - playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, ""); + // Default + playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, ""); - this.loading = false; - // onPlayingStateChange(); - this.randomAnimations.unlockFor("loadAndPlay"); + this.loading = false; + // onPlayingStateChange(); + this.randomAnimations.unlockFor("loadAndPlay"); + } } - //int _id = 0; + private System.Object playingLocker = new System.Object(); - /* - * Sincroniza as legendas com as animações. - */ + /* Sincroniza as legendas com as animações. */ IEnumerator handleStates() { - this.randomAnimations.lockFor("handleStates"); + lock (this.playingLocker) + { + this.randomAnimations.lockFor("handleStates"); - // this.playing = true; + // this.playing = true; - // Enquanto estiver executando a rotina "loadAndPlay" - // ou existir animações na fila de reprodução - while (loading || animQueue.Count > 0) - { - if (animQueue.Count > 0) - { - AnimationReference reference = animQueue.Peek(); + bool isNotEmpty; - setSubtitle(reference.subtitle); + lock (animQueue) { isNotEmpty = animQueue.Count > 0; } - if (COMPONENT_ANIMATION.IsPlaying(reference.name)) + // Enquanto estiver executando a rotina "loadAndPlay" + // ou existir animações na fila de reprodução + while (loading || isNotEmpty) + { + if (isNotEmpty) { - bool changing = false; + AnimationReference reference; + lock (animQueue) { reference = animQueue.Peek(); } - if ( ! this.playing) - { - this.playing = true; - changing = true; - } + this.subtitles.setText(reference.subtitle); - if (this.intervalAnimations.Contains(reference.name)) + if (COMPONENT_ANIMATION.IsPlaying(reference.name)) { - if ( ! this.playingIntervalAnimation) + bool changing = false; + + if ( ! this.playing) { - this.playingIntervalAnimation = true; + this.playing = true; changing = true; } - } - else if (this.playingIntervalAnimation) - { - this.playingIntervalAnimation = false; - changing = true; - } - if (changing) onPlayingStateChange(); + if (this.intervalAnimations.Contains(reference.name)) + { + if ( ! this.playingIntervalAnimation) + { + this.playingIntervalAnimation = true; + changing = true; + } + } + else if (this.playingIntervalAnimation) + { + this.playingIntervalAnimation = false; + changing = true; + } + + if (changing) onPlayingStateChange(); + + // reference.playing = true; + do { yield return null; } + while (COMPONENT_ANIMATION.IsPlaying(reference.name)); + } - // reference.playing = true; - do { yield return null; } - while (COMPONENT_ANIMATION.IsPlaying(reference.name)); + if (reference.state == null) + lock (animQueue) { animQueue.Dequeue(); } + else + yield return null; } + else yield return null; - if (reference.state == null) - animQueue.Dequeue(); - else - yield return null; - } - else yield return null; + this.subtitles.setText(""); - setSubtitle(""); - } + lock (animQueue) { isNotEmpty = animQueue.Count > 0; } + } - this.playing = false; - this.paused = false; - this.playingIntervalAnimation = false; - onPlayingStateChange(); + this.playing = false; + this.paused = false; + this.playingIntervalAnimation = false; + onPlayingStateChange(); - this.randomAnimations.unlockFor("handleStates"); + this.randomAnimations.unlockFor("handleStates"); + } } } diff --git a/Assets/Scripts/Player Manager/RandomAnimations.cs b/Assets/Scripts/Player Manager/RandomAnimations.cs index 6b3f37a..c2277f2 100644 --- a/Assets/Scripts/Player Manager/RandomAnimations.cs +++ b/Assets/Scripts/Player Manager/RandomAnimations.cs @@ -27,17 +27,23 @@ public class RandomAnimations : MonoBehaviour { /* Bloquear animações para o GameObject object. */ public void lockFor(String id) { - this.blockingObjects.Add(id); + lock (this.blockingObjects) { + this.blockingObjects.Add(id); + } } /* Desbloquear animações para o GameObject object. */ public void unlockFor(String id) { - this.blockingObjects.Remove(id); + lock (this.blockingObjects) { + this.blockingObjects.Remove(id); + } } /* Desbloquear animações para todos os GameObjects. */ public void unlockAll() { - this.blockingObjects.Clear(); + lock (this.blockingObjects) { + this.blockingObjects.Clear(); + } } /* Atribui as animações e inicia o processo para reproduzir. */ @@ -54,12 +60,19 @@ public class RandomAnimations : MonoBehaviour { { while (true) { - if (blockingObjects.Count == 0) + bool isNotBlocked; + lock (this.blockingObjects) { + isNotBlocked = this.blockingObjects.Count == 0; + } + + if (isNotBlocked) { yield return new WaitForSeconds(this.time); - if (blockingObjects.Count > 0) - continue; + lock (this.blockingObjects) { + if (this.blockingObjects.Count > 0) + continue; + } int index = sortIndex(); diff --git a/Assets/Scripts/Player Manager/Subtitle.cs b/Assets/Scripts/Player Manager/Subtitle.cs index 0ef851e..75db5bc 100644 --- a/Assets/Scripts/Player Manager/Subtitle.cs +++ b/Assets/Scripts/Player Manager/Subtitle.cs @@ -1,5 +1,8 @@ using UnityEngine.UI; +/** + * Gerenciador de legendas + */ public class Subtitle { public const short TYPE_NONE = -1; @@ -7,23 +10,37 @@ public class Subtitle { public const short TYPE_LETTER = 1; public const short TYPE_NUMBER = 2; + // Configuração de velocidade de palavras protected DefaultSignSpeed defaultWordSpeed = new DefaultSignSpeed(); + // Configuração de velocidade da primeira letra de palavras a serem soletradas + // Necessário que seja maior para não haver corte quando a mão está + // muito distante do local onde soletra para a maioria das letras protected DefaultSignSpeed defaultFirstLetterSpeed = new DefaultSignSpeed(); + // Configuração de velocidade das letras seguintes, ou velocidade padrão de letras protected DefaultSignSpeed defaultLetterSpeed = new DefaultSignSpeed(); + // Configuração de velocidade dos números protected DefaultSignSpeed defaultNumberSpeed = new DefaultSignSpeed(); + // Posição do slider de velocidade private float sliderPosition = DefaultSignSpeed.DEFAULT; + // Velocade de palavras private float wordSpeed = DefaultSignSpeed.DEFAULT; + // Velocade de letras private float letterSpeed = DefaultSignSpeed.DEFAULT; + // Velocade de números private float numberSpeed = DefaultSignSpeed.DEFAULT; - public Text SUBTITLES; + // Referência para a legenda + public Text subtitle; + public Subtitle(Text subtitle) { + this.subtitle = subtitle; + } - public Subtitle(Text subtitles) - { - this.SUBTITLES = subtitles; + /* Alterar legenda */ + public void setText(string text) { + this.subtitle.text = text; } public DefaultSignSpeed DefaultWordSpeed { @@ -98,9 +115,7 @@ public class Subtitle { } - /* - * Destaca caractere de uma string. - */ + /* Destaca caractere de uma string. */ public static string highlight(string word, int index) { string subtitle = ""; diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index 63932e1..c0dfc4b 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -85,7 +85,9 @@ public class PlayerManager : GenericPlayerManager { //private bool cancelTranslation() - public void playTranslate() { + public void playTranslate() + { + stopTranslation(); StartCoroutine("translate", translateScreenText.text); } @@ -114,24 +116,29 @@ public class PlayerManager : GenericPlayerManager { } } + private System.Object stateLocker = new System.Object(); + protected override void onPlayingStateChange() { - if (base.isPlaying() && ! base.isPlayingIntervalAnimation()) + lock (this.stateLocker) { - setPlayingState(true); - - if (base.isPaused()) - { - this.pauseButtonImage.switchAttribute(true); - this.screenManager.setPauseMenuState(true); - } - else + if (base.isPlaying() && ! base.isPlayingIntervalAnimation()) { - this.pauseButtonImage.switchAttribute(false); - this.screenManager.setPauseMenuState(false); + setPlayingState(true); + + if (base.isPaused()) + { + this.pauseButtonImage.switchAttribute(true); + this.screenManager.setPauseMenuState(true); + } + else + { + this.pauseButtonImage.switchAttribute(false); + this.screenManager.setPauseMenuState(false); + } } + else setPlayingState(false); } - else setPlayingState(false); } // Called from microphone icon at main interface diff --git a/Assets/Scripts/UI/MakersScreenTextResizer.cs b/Assets/Scripts/UI/MakersScreenTextResizer.cs new file mode 100644 index 0000000..1bd3c38 --- /dev/null +++ b/Assets/Scripts/UI/MakersScreenTextResizer.cs @@ -0,0 +1,29 @@ +using UnityEngine; +using UnityEngine.UI; + +public class MakersScreenTextResizer : MonoBehaviour { + + protected void Start () + { + Text text = gameObject.GetComponent(); + + if (Screen.dpi < 140) + text.fontSize = 22; + + // 240 + else if (Screen.dpi < 280) + text.fontSize = 30; + + // 320 + else if (Screen.dpi < 400) + text.fontSize = 38; + + // 480 + else if (Screen.dpi < 500) + text.fontSize = 46; + + else + text.fontSize = 54; + } + +} diff --git a/Assets/Scripts/UI/MakersScreenTextResizer.cs.meta b/Assets/Scripts/UI/MakersScreenTextResizer.cs.meta new file mode 100644 index 0000000..5b0ee4e --- /dev/null +++ b/Assets/Scripts/UI/MakersScreenTextResizer.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: a7be422a80edfef4f8e4e8a6aca4378e +timeCreated: 1456251341 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/ScreenManager.cs b/Assets/Scripts/UI/ScreenManager.cs index 6084224..171520e 100644 --- a/Assets/Scripts/UI/ScreenManager.cs +++ b/Assets/Scripts/UI/ScreenManager.cs @@ -12,6 +12,7 @@ public class ScreenManager : MonoBehaviour { public GameObject translateScreen; public GameObject dictScreen; public GameObject tutorialScreen; + public GameObject makersScreen; public SwitchImageAttribute textButtonImage; public SwitchImageAttribute dictButtonImage; @@ -90,6 +91,11 @@ public class ScreenManager : MonoBehaviour { { tutorialScreen.SetActive(false); } + + if (makersScreen.activeSelf) + { + makersScreen.SetActive(false); + } } public void switchScreen(GameObject screen) @@ -155,4 +161,8 @@ public class ScreenManager : MonoBehaviour { this.connectionErrorDialog.SetActive(true); } + public void switchToMakersScreen() { + switchScreen(this.makersScreen); + } + } diff --git a/Assets/Scripts/UI/SliderHandleResizer.cs b/Assets/Scripts/UI/SliderHandleResizer.cs new file mode 100644 index 0000000..4783edd --- /dev/null +++ b/Assets/Scripts/UI/SliderHandleResizer.cs @@ -0,0 +1,29 @@ +using UnityEngine; +using UnityEngine.UI; + +public class SliderHandlerResizer : MonoBehaviour { + + protected void Start () + { + Text text = gameObject.GetComponent(); + + if (Screen.dpi < 140) + text.fontSize = 22; + + // 240 + else if (Screen.dpi < 280) + text.fontSize = 30; + + // 320 + else if (Screen.dpi < 400) + text.fontSize = 38; + + // 480 + else if (Screen.dpi < 500) + text.fontSize = 46; + + else + text.fontSize = 54; + } + +} diff --git a/Assets/Scripts/UI/SliderHandleResizer.cs.meta b/Assets/Scripts/UI/SliderHandleResizer.cs.meta new file mode 100644 index 0000000..cfc01d8 --- /dev/null +++ b/Assets/Scripts/UI/SliderHandleResizer.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: f8ddca5505d51db4fbe6293aa36f2101 +timeCreated: 1456251713 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/TutorialManager.cs b/Assets/Scripts/UI/TutorialManager.cs index 3f9ee2c..ec8fe2e 100644 --- a/Assets/Scripts/UI/TutorialManager.cs +++ b/Assets/Scripts/UI/TutorialManager.cs @@ -3,6 +3,8 @@ using UnityEngine.UI; public class TutorialManager : MonoBehaviour { + public ScreenManager screenManager; + public Text description; public Image translateImage; public Image micImage; @@ -72,9 +74,9 @@ public class TutorialManager : MonoBehaviour { { if (index == 5) { - this.gameObject.SetActive(false); + //this.gameObject.SetActive(false); + this.screenManager.switchToMakersScreen(); - this.index = 0; select(0); } else select(this.index + 1); diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index c8e51ec..e15bfaa 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -153,19 +153,19 @@ PlayerSettings: AndroidKeystoreName: C:/Users/mateu/Desktop/keystore.keystore AndroidKeyaliasName: AndroidTVCompatibility: 0 - AndroidIsGame: 1 - androidEnableBanner: 1 + AndroidIsGame: 0 + androidEnableBanner: 0 m_AndroidBanners: - width: 320 height: 180 - banner: {fileID: 2800000, guid: 919bd8c190f26ec48b930878bec99f3e, type: 3} + banner: {fileID: 0} androidGamepadSupportLevel: 0 resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: - m_BuildTarget: m_Icons: - serializedVersion: 2 - m_Icon: {fileID: 2800000, guid: 919bd8c190f26ec48b930878bec99f3e, type: 3} + m_Icon: {fileID: 2800000, guid: ea7ce2ab1d26fe142a763356a03419f5, type: 3} m_Width: 128 m_Height: 128 m_BuildTargetBatching: [] -- libgit2 0.21.2