Commit 9d63b8f5c71b94689752aaab5df007bd8cbe6c9f
1 parent
eaed9e21
Exists in
master
and in
7 other branches
Demo e org
Showing
38 changed files
with
2266 additions
and
309 deletions
Show diff stats
21.9 KB
| @@ -0,0 +1,56 @@ | @@ -0,0 +1,56 @@ | ||
| 1 | +fileFormatVersion: 2 | ||
| 2 | +guid: ea7ce2ab1d26fe142a763356a03419f5 | ||
| 3 | +timeCreated: 1456249216 | ||
| 4 | +licenseType: Pro | ||
| 5 | +TextureImporter: | ||
| 6 | + fileIDToRecycleName: {} | ||
| 7 | + serializedVersion: 2 | ||
| 8 | + mipmaps: | ||
| 9 | + mipMapMode: 0 | ||
| 10 | + enableMipMap: 1 | ||
| 11 | + linearTexture: 0 | ||
| 12 | + correctGamma: 0 | ||
| 13 | + fadeOut: 0 | ||
| 14 | + borderMipMap: 0 | ||
| 15 | + mipMapFadeDistanceStart: 1 | ||
| 16 | + mipMapFadeDistanceEnd: 3 | ||
| 17 | + bumpmap: | ||
| 18 | + convertToNormalMap: 0 | ||
| 19 | + externalNormalMap: 0 | ||
| 20 | + heightScale: .25 | ||
| 21 | + normalMapFilter: 0 | ||
| 22 | + isReadable: 0 | ||
| 23 | + grayScaleToAlpha: 0 | ||
| 24 | + generateCubemap: 0 | ||
| 25 | + cubemapConvolution: 0 | ||
| 26 | + cubemapConvolutionSteps: 8 | ||
| 27 | + cubemapConvolutionExponent: 1.5 | ||
| 28 | + seamlessCubemap: 0 | ||
| 29 | + textureFormat: -1 | ||
| 30 | + maxTextureSize: 2048 | ||
| 31 | + textureSettings: | ||
| 32 | + filterMode: -1 | ||
| 33 | + aniso: -1 | ||
| 34 | + mipBias: -1 | ||
| 35 | + wrapMode: 1 | ||
| 36 | + nPOTScale: 0 | ||
| 37 | + lightmap: 0 | ||
| 38 | + rGBM: 0 | ||
| 39 | + compressionQuality: 50 | ||
| 40 | + allowsAlphaSplitting: 0 | ||
| 41 | + spriteMode: 1 | ||
| 42 | + spriteExtrude: 1 | ||
| 43 | + spriteMeshType: 1 | ||
| 44 | + alignment: 0 | ||
| 45 | + spritePivot: {x: .5, y: .5} | ||
| 46 | + spriteBorder: {x: 0, y: 0, z: 0, w: 0} | ||
| 47 | + spritePixelsToUnits: 100 | ||
| 48 | + alphaIsTransparency: 1 | ||
| 49 | + textureType: 8 | ||
| 50 | + buildTargetSettings: [] | ||
| 51 | + spriteSheet: | ||
| 52 | + sprites: [] | ||
| 53 | + spritePackingTag: | ||
| 54 | + userData: | ||
| 55 | + assetBundleName: | ||
| 56 | + assetBundleVariant: |
904 KB
| @@ -0,0 +1,56 @@ | @@ -0,0 +1,56 @@ | ||
| 1 | +fileFormatVersion: 2 | ||
| 2 | +guid: 093a2b7f60adfe24ab00dd4e3eef9ac3 | ||
| 3 | +timeCreated: 1456249216 | ||
| 4 | +licenseType: Pro | ||
| 5 | +TextureImporter: | ||
| 6 | + fileIDToRecycleName: {} | ||
| 7 | + serializedVersion: 2 | ||
| 8 | + mipmaps: | ||
| 9 | + mipMapMode: 0 | ||
| 10 | + enableMipMap: 1 | ||
| 11 | + linearTexture: 0 | ||
| 12 | + correctGamma: 0 | ||
| 13 | + fadeOut: 0 | ||
| 14 | + borderMipMap: 0 | ||
| 15 | + mipMapFadeDistanceStart: 1 | ||
| 16 | + mipMapFadeDistanceEnd: 3 | ||
| 17 | + bumpmap: | ||
| 18 | + convertToNormalMap: 0 | ||
| 19 | + externalNormalMap: 0 | ||
| 20 | + heightScale: .25 | ||
| 21 | + normalMapFilter: 0 | ||
| 22 | + isReadable: 0 | ||
| 23 | + grayScaleToAlpha: 0 | ||
| 24 | + generateCubemap: 0 | ||
| 25 | + cubemapConvolution: 0 | ||
| 26 | + cubemapConvolutionSteps: 8 | ||
| 27 | + cubemapConvolutionExponent: 1.5 | ||
| 28 | + seamlessCubemap: 0 | ||
| 29 | + textureFormat: -1 | ||
| 30 | + maxTextureSize: 2048 | ||
| 31 | + textureSettings: | ||
| 32 | + filterMode: -1 | ||
| 33 | + aniso: -1 | ||
| 34 | + mipBias: -1 | ||
| 35 | + wrapMode: 1 | ||
| 36 | + nPOTScale: 0 | ||
| 37 | + lightmap: 0 | ||
| 38 | + rGBM: 0 | ||
| 39 | + compressionQuality: 50 | ||
| 40 | + allowsAlphaSplitting: 0 | ||
| 41 | + spriteMode: 1 | ||
| 42 | + spriteExtrude: 1 | ||
| 43 | + spriteMeshType: 1 | ||
| 44 | + alignment: 0 | ||
| 45 | + spritePivot: {x: .5, y: .5} | ||
| 46 | + spriteBorder: {x: 0, y: 0, z: 0, w: 0} | ||
| 47 | + spritePixelsToUnits: 100 | ||
| 48 | + alphaIsTransparency: 1 | ||
| 49 | + textureType: 8 | ||
| 50 | + buildTargetSettings: [] | ||
| 51 | + spriteSheet: | ||
| 52 | + sprites: [] | ||
| 53 | + spritePackingTag: | ||
| 54 | + userData: | ||
| 55 | + assetBundleName: | ||
| 56 | + assetBundleVariant: |
6.63 KB
| @@ -0,0 +1,56 @@ | @@ -0,0 +1,56 @@ | ||
| 1 | +fileFormatVersion: 2 | ||
| 2 | +guid: 359a81b8c2c4de045a51c9ea52aa9fa7 | ||
| 3 | +timeCreated: 1456247283 | ||
| 4 | +licenseType: Pro | ||
| 5 | +TextureImporter: | ||
| 6 | + fileIDToRecycleName: {} | ||
| 7 | + serializedVersion: 2 | ||
| 8 | + mipmaps: | ||
| 9 | + mipMapMode: 0 | ||
| 10 | + enableMipMap: 1 | ||
| 11 | + linearTexture: 0 | ||
| 12 | + correctGamma: 0 | ||
| 13 | + fadeOut: 0 | ||
| 14 | + borderMipMap: 0 | ||
| 15 | + mipMapFadeDistanceStart: 1 | ||
| 16 | + mipMapFadeDistanceEnd: 3 | ||
| 17 | + bumpmap: | ||
| 18 | + convertToNormalMap: 0 | ||
| 19 | + externalNormalMap: 0 | ||
| 20 | + heightScale: .25 | ||
| 21 | + normalMapFilter: 0 | ||
| 22 | + isReadable: 0 | ||
| 23 | + grayScaleToAlpha: 0 | ||
| 24 | + generateCubemap: 0 | ||
| 25 | + cubemapConvolution: 0 | ||
| 26 | + cubemapConvolutionSteps: 8 | ||
| 27 | + cubemapConvolutionExponent: 1.5 | ||
| 28 | + seamlessCubemap: 0 | ||
| 29 | + textureFormat: -1 | ||
| 30 | + maxTextureSize: 2048 | ||
| 31 | + textureSettings: | ||
| 32 | + filterMode: -1 | ||
| 33 | + aniso: -1 | ||
| 34 | + mipBias: -1 | ||
| 35 | + wrapMode: 1 | ||
| 36 | + nPOTScale: 0 | ||
| 37 | + lightmap: 0 | ||
| 38 | + rGBM: 0 | ||
| 39 | + compressionQuality: 50 | ||
| 40 | + allowsAlphaSplitting: 0 | ||
| 41 | + spriteMode: 1 | ||
| 42 | + spriteExtrude: 1 | ||
| 43 | + spriteMeshType: 1 | ||
| 44 | + alignment: 0 | ||
| 45 | + spritePivot: {x: .5, y: .5} | ||
| 46 | + spriteBorder: {x: 0, y: 0, z: 0, w: 0} | ||
| 47 | + spritePixelsToUnits: 100 | ||
| 48 | + alphaIsTransparency: 1 | ||
| 49 | + textureType: 8 | ||
| 50 | + buildTargetSettings: [] | ||
| 51 | + spriteSheet: | ||
| 52 | + sprites: [] | ||
| 53 | + spritePackingTag: | ||
| 54 | + userData: | ||
| 55 | + assetBundleName: | ||
| 56 | + assetBundleVariant: |
5.22 KB
| @@ -0,0 +1,56 @@ | @@ -0,0 +1,56 @@ | ||
| 1 | +fileFormatVersion: 2 | ||
| 2 | +guid: 146c86da3c7a27944895b4bd8df77ecb | ||
| 3 | +timeCreated: 1456247283 | ||
| 4 | +licenseType: Pro | ||
| 5 | +TextureImporter: | ||
| 6 | + fileIDToRecycleName: {} | ||
| 7 | + serializedVersion: 2 | ||
| 8 | + mipmaps: | ||
| 9 | + mipMapMode: 0 | ||
| 10 | + enableMipMap: 1 | ||
| 11 | + linearTexture: 0 | ||
| 12 | + correctGamma: 0 | ||
| 13 | + fadeOut: 0 | ||
| 14 | + borderMipMap: 0 | ||
| 15 | + mipMapFadeDistanceStart: 1 | ||
| 16 | + mipMapFadeDistanceEnd: 3 | ||
| 17 | + bumpmap: | ||
| 18 | + convertToNormalMap: 0 | ||
| 19 | + externalNormalMap: 0 | ||
| 20 | + heightScale: .25 | ||
| 21 | + normalMapFilter: 0 | ||
| 22 | + isReadable: 0 | ||
| 23 | + grayScaleToAlpha: 0 | ||
| 24 | + generateCubemap: 0 | ||
| 25 | + cubemapConvolution: 0 | ||
| 26 | + cubemapConvolutionSteps: 8 | ||
| 27 | + cubemapConvolutionExponent: 1.5 | ||
| 28 | + seamlessCubemap: 0 | ||
| 29 | + textureFormat: -1 | ||
| 30 | + maxTextureSize: 2048 | ||
| 31 | + textureSettings: | ||
| 32 | + filterMode: -1 | ||
| 33 | + aniso: -1 | ||
| 34 | + mipBias: -1 | ||
| 35 | + wrapMode: 1 | ||
| 36 | + nPOTScale: 0 | ||
| 37 | + lightmap: 0 | ||
| 38 | + rGBM: 0 | ||
| 39 | + compressionQuality: 50 | ||
| 40 | + allowsAlphaSplitting: 0 | ||
| 41 | + spriteMode: 1 | ||
| 42 | + spriteExtrude: 1 | ||
| 43 | + spriteMeshType: 1 | ||
| 44 | + alignment: 0 | ||
| 45 | + spritePivot: {x: .5, y: .5} | ||
| 46 | + spriteBorder: {x: 0, y: 0, z: 0, w: 0} | ||
| 47 | + spritePixelsToUnits: 100 | ||
| 48 | + alphaIsTransparency: 1 | ||
| 49 | + textureType: 8 | ||
| 50 | + buildTargetSettings: [] | ||
| 51 | + spriteSheet: | ||
| 52 | + sprites: [] | ||
| 53 | + spritePackingTag: | ||
| 54 | + userData: | ||
| 55 | + assetBundleName: | ||
| 56 | + assetBundleVariant: |
4.42 KB
| @@ -0,0 +1,56 @@ | @@ -0,0 +1,56 @@ | ||
| 1 | +fileFormatVersion: 2 | ||
| 2 | +guid: f88d012f31e17a346ad5315d5e895d13 | ||
| 3 | +timeCreated: 1456247284 | ||
| 4 | +licenseType: Pro | ||
| 5 | +TextureImporter: | ||
| 6 | + fileIDToRecycleName: {} | ||
| 7 | + serializedVersion: 2 | ||
| 8 | + mipmaps: | ||
| 9 | + mipMapMode: 0 | ||
| 10 | + enableMipMap: 1 | ||
| 11 | + linearTexture: 0 | ||
| 12 | + correctGamma: 0 | ||
| 13 | + fadeOut: 0 | ||
| 14 | + borderMipMap: 0 | ||
| 15 | + mipMapFadeDistanceStart: 1 | ||
| 16 | + mipMapFadeDistanceEnd: 3 | ||
| 17 | + bumpmap: | ||
| 18 | + convertToNormalMap: 0 | ||
| 19 | + externalNormalMap: 0 | ||
| 20 | + heightScale: .25 | ||
| 21 | + normalMapFilter: 0 | ||
| 22 | + isReadable: 0 | ||
| 23 | + grayScaleToAlpha: 0 | ||
| 24 | + generateCubemap: 0 | ||
| 25 | + cubemapConvolution: 0 | ||
| 26 | + cubemapConvolutionSteps: 8 | ||
| 27 | + cubemapConvolutionExponent: 1.5 | ||
| 28 | + seamlessCubemap: 0 | ||
| 29 | + textureFormat: -1 | ||
| 30 | + maxTextureSize: 2048 | ||
| 31 | + textureSettings: | ||
| 32 | + filterMode: -1 | ||
| 33 | + aniso: -1 | ||
| 34 | + mipBias: -1 | ||
| 35 | + wrapMode: 1 | ||
| 36 | + nPOTScale: 0 | ||
| 37 | + lightmap: 0 | ||
| 38 | + rGBM: 0 | ||
| 39 | + compressionQuality: 50 | ||
| 40 | + allowsAlphaSplitting: 0 | ||
| 41 | + spriteMode: 1 | ||
| 42 | + spriteExtrude: 1 | ||
| 43 | + spriteMeshType: 1 | ||
| 44 | + alignment: 0 | ||
| 45 | + spritePivot: {x: .5, y: .5} | ||
| 46 | + spriteBorder: {x: 0, y: 0, z: 0, w: 0} | ||
| 47 | + spritePixelsToUnits: 100 | ||
| 48 | + alphaIsTransparency: 1 | ||
| 49 | + textureType: 8 | ||
| 50 | + buildTargetSettings: [] | ||
| 51 | + spriteSheet: | ||
| 52 | + sprites: [] | ||
| 53 | + spritePackingTag: | ||
| 54 | + userData: | ||
| 55 | + assetBundleName: | ||
| 56 | + assetBundleVariant: |
34.4 KB
| @@ -0,0 +1,56 @@ | @@ -0,0 +1,56 @@ | ||
| 1 | +fileFormatVersion: 2 | ||
| 2 | +guid: 2fe7271373ab84e42a7712fc31ff017d | ||
| 3 | +timeCreated: 1456247283 | ||
| 4 | +licenseType: Pro | ||
| 5 | +TextureImporter: | ||
| 6 | + fileIDToRecycleName: {} | ||
| 7 | + serializedVersion: 2 | ||
| 8 | + mipmaps: | ||
| 9 | + mipMapMode: 0 | ||
| 10 | + enableMipMap: 1 | ||
| 11 | + linearTexture: 0 | ||
| 12 | + correctGamma: 0 | ||
| 13 | + fadeOut: 0 | ||
| 14 | + borderMipMap: 0 | ||
| 15 | + mipMapFadeDistanceStart: 1 | ||
| 16 | + mipMapFadeDistanceEnd: 3 | ||
| 17 | + bumpmap: | ||
| 18 | + convertToNormalMap: 0 | ||
| 19 | + externalNormalMap: 0 | ||
| 20 | + heightScale: .25 | ||
| 21 | + normalMapFilter: 0 | ||
| 22 | + isReadable: 0 | ||
| 23 | + grayScaleToAlpha: 0 | ||
| 24 | + generateCubemap: 0 | ||
| 25 | + cubemapConvolution: 0 | ||
| 26 | + cubemapConvolutionSteps: 8 | ||
| 27 | + cubemapConvolutionExponent: 1.5 | ||
| 28 | + seamlessCubemap: 0 | ||
| 29 | + textureFormat: -1 | ||
| 30 | + maxTextureSize: 2048 | ||
| 31 | + textureSettings: | ||
| 32 | + filterMode: -1 | ||
| 33 | + aniso: -1 | ||
| 34 | + mipBias: -1 | ||
| 35 | + wrapMode: 1 | ||
| 36 | + nPOTScale: 0 | ||
| 37 | + lightmap: 0 | ||
| 38 | + rGBM: 0 | ||
| 39 | + compressionQuality: 50 | ||
| 40 | + allowsAlphaSplitting: 0 | ||
| 41 | + spriteMode: 1 | ||
| 42 | + spriteExtrude: 1 | ||
| 43 | + spriteMeshType: 1 | ||
| 44 | + alignment: 0 | ||
| 45 | + spritePivot: {x: .5, y: .5} | ||
| 46 | + spriteBorder: {x: 0, y: 0, z: 0, w: 0} | ||
| 47 | + spritePixelsToUnits: 100 | ||
| 48 | + alphaIsTransparency: 1 | ||
| 49 | + textureType: 8 | ||
| 50 | + buildTargetSettings: [] | ||
| 51 | + spriteSheet: | ||
| 52 | + sprites: [] | ||
| 53 | + spritePackingTag: | ||
| 54 | + userData: | ||
| 55 | + assetBundleName: | ||
| 56 | + assetBundleVariant: |
24 KB
| @@ -0,0 +1,56 @@ | @@ -0,0 +1,56 @@ | ||
| 1 | +fileFormatVersion: 2 | ||
| 2 | +guid: feeae326a499bfc4eb18998b933a7148 | ||
| 3 | +timeCreated: 1456247284 | ||
| 4 | +licenseType: Pro | ||
| 5 | +TextureImporter: | ||
| 6 | + fileIDToRecycleName: {} | ||
| 7 | + serializedVersion: 2 | ||
| 8 | + mipmaps: | ||
| 9 | + mipMapMode: 0 | ||
| 10 | + enableMipMap: 1 | ||
| 11 | + linearTexture: 0 | ||
| 12 | + correctGamma: 0 | ||
| 13 | + fadeOut: 0 | ||
| 14 | + borderMipMap: 0 | ||
| 15 | + mipMapFadeDistanceStart: 1 | ||
| 16 | + mipMapFadeDistanceEnd: 3 | ||
| 17 | + bumpmap: | ||
| 18 | + convertToNormalMap: 0 | ||
| 19 | + externalNormalMap: 0 | ||
| 20 | + heightScale: .25 | ||
| 21 | + normalMapFilter: 0 | ||
| 22 | + isReadable: 0 | ||
| 23 | + grayScaleToAlpha: 0 | ||
| 24 | + generateCubemap: 0 | ||
| 25 | + cubemapConvolution: 0 | ||
| 26 | + cubemapConvolutionSteps: 8 | ||
| 27 | + cubemapConvolutionExponent: 1.5 | ||
| 28 | + seamlessCubemap: 0 | ||
| 29 | + textureFormat: -1 | ||
| 30 | + maxTextureSize: 2048 | ||
| 31 | + textureSettings: | ||
| 32 | + filterMode: -1 | ||
| 33 | + aniso: -1 | ||
| 34 | + mipBias: -1 | ||
| 35 | + wrapMode: 1 | ||
| 36 | + nPOTScale: 0 | ||
| 37 | + lightmap: 0 | ||
| 38 | + rGBM: 0 | ||
| 39 | + compressionQuality: 50 | ||
| 40 | + allowsAlphaSplitting: 0 | ||
| 41 | + spriteMode: 1 | ||
| 42 | + spriteExtrude: 1 | ||
| 43 | + spriteMeshType: 1 | ||
| 44 | + alignment: 0 | ||
| 45 | + spritePivot: {x: .5, y: .5} | ||
| 46 | + spriteBorder: {x: 0, y: 0, z: 0, w: 0} | ||
| 47 | + spritePixelsToUnits: 100 | ||
| 48 | + alphaIsTransparency: 1 | ||
| 49 | + textureType: 8 | ||
| 50 | + buildTargetSettings: [] | ||
| 51 | + spriteSheet: | ||
| 52 | + sprites: [] | ||
| 53 | + spritePackingTag: | ||
| 54 | + userData: | ||
| 55 | + assetBundleName: | ||
| 56 | + assetBundleVariant: |
20.4 KB
| @@ -0,0 +1,56 @@ | @@ -0,0 +1,56 @@ | ||
| 1 | +fileFormatVersion: 2 | ||
| 2 | +guid: 0d877e85117f65d4586d74db7d9ef266 | ||
| 3 | +timeCreated: 1456247283 | ||
| 4 | +licenseType: Pro | ||
| 5 | +TextureImporter: | ||
| 6 | + fileIDToRecycleName: {} | ||
| 7 | + serializedVersion: 2 | ||
| 8 | + mipmaps: | ||
| 9 | + mipMapMode: 0 | ||
| 10 | + enableMipMap: 1 | ||
| 11 | + linearTexture: 0 | ||
| 12 | + correctGamma: 0 | ||
| 13 | + fadeOut: 0 | ||
| 14 | + borderMipMap: 0 | ||
| 15 | + mipMapFadeDistanceStart: 1 | ||
| 16 | + mipMapFadeDistanceEnd: 3 | ||
| 17 | + bumpmap: | ||
| 18 | + convertToNormalMap: 0 | ||
| 19 | + externalNormalMap: 0 | ||
| 20 | + heightScale: .25 | ||
| 21 | + normalMapFilter: 0 | ||
| 22 | + isReadable: 0 | ||
| 23 | + grayScaleToAlpha: 0 | ||
| 24 | + generateCubemap: 0 | ||
| 25 | + cubemapConvolution: 0 | ||
| 26 | + cubemapConvolutionSteps: 8 | ||
| 27 | + cubemapConvolutionExponent: 1.5 | ||
| 28 | + seamlessCubemap: 0 | ||
| 29 | + textureFormat: -1 | ||
| 30 | + maxTextureSize: 2048 | ||
| 31 | + textureSettings: | ||
| 32 | + filterMode: -1 | ||
| 33 | + aniso: -1 | ||
| 34 | + mipBias: -1 | ||
| 35 | + wrapMode: 1 | ||
| 36 | + nPOTScale: 0 | ||
| 37 | + lightmap: 0 | ||
| 38 | + rGBM: 0 | ||
| 39 | + compressionQuality: 50 | ||
| 40 | + allowsAlphaSplitting: 0 | ||
| 41 | + spriteMode: 1 | ||
| 42 | + spriteExtrude: 1 | ||
| 43 | + spriteMeshType: 1 | ||
| 44 | + alignment: 0 | ||
| 45 | + spritePivot: {x: .5, y: .5} | ||
| 46 | + spriteBorder: {x: 0, y: 0, z: 0, w: 0} | ||
| 47 | + spritePixelsToUnits: 100 | ||
| 48 | + alphaIsTransparency: 1 | ||
| 49 | + textureType: 8 | ||
| 50 | + buildTargetSettings: [] | ||
| 51 | + spriteSheet: | ||
| 52 | + sprites: [] | ||
| 53 | + spritePackingTag: | ||
| 54 | + userData: | ||
| 55 | + assetBundleName: | ||
| 56 | + assetBundleVariant: |
27.2 KB
| @@ -0,0 +1,56 @@ | @@ -0,0 +1,56 @@ | ||
| 1 | +fileFormatVersion: 2 | ||
| 2 | +guid: 78f9e308bccfa854ea0358b3df63d77f | ||
| 3 | +timeCreated: 1456247284 | ||
| 4 | +licenseType: Pro | ||
| 5 | +TextureImporter: | ||
| 6 | + fileIDToRecycleName: {} | ||
| 7 | + serializedVersion: 2 | ||
| 8 | + mipmaps: | ||
| 9 | + mipMapMode: 0 | ||
| 10 | + enableMipMap: 1 | ||
| 11 | + linearTexture: 0 | ||
| 12 | + correctGamma: 0 | ||
| 13 | + fadeOut: 0 | ||
| 14 | + borderMipMap: 0 | ||
| 15 | + mipMapFadeDistanceStart: 1 | ||
| 16 | + mipMapFadeDistanceEnd: 3 | ||
| 17 | + bumpmap: | ||
| 18 | + convertToNormalMap: 0 | ||
| 19 | + externalNormalMap: 0 | ||
| 20 | + heightScale: .25 | ||
| 21 | + normalMapFilter: 0 | ||
| 22 | + isReadable: 0 | ||
| 23 | + grayScaleToAlpha: 0 | ||
| 24 | + generateCubemap: 0 | ||
| 25 | + cubemapConvolution: 0 | ||
| 26 | + cubemapConvolutionSteps: 8 | ||
| 27 | + cubemapConvolutionExponent: 1.5 | ||
| 28 | + seamlessCubemap: 0 | ||
| 29 | + textureFormat: -1 | ||
| 30 | + maxTextureSize: 2048 | ||
| 31 | + textureSettings: | ||
| 32 | + filterMode: -1 | ||
| 33 | + aniso: -1 | ||
| 34 | + mipBias: -1 | ||
| 35 | + wrapMode: 1 | ||
| 36 | + nPOTScale: 0 | ||
| 37 | + lightmap: 0 | ||
| 38 | + rGBM: 0 | ||
| 39 | + compressionQuality: 50 | ||
| 40 | + allowsAlphaSplitting: 0 | ||
| 41 | + spriteMode: 1 | ||
| 42 | + spriteExtrude: 1 | ||
| 43 | + spriteMeshType: 1 | ||
| 44 | + alignment: 0 | ||
| 45 | + spritePivot: {x: .5, y: .5} | ||
| 46 | + spriteBorder: {x: 0, y: 0, z: 0, w: 0} | ||
| 47 | + spritePixelsToUnits: 100 | ||
| 48 | + alphaIsTransparency: 1 | ||
| 49 | + textureType: 8 | ||
| 50 | + buildTargetSettings: [] | ||
| 51 | + spriteSheet: | ||
| 52 | + sprites: [] | ||
| 53 | + spritePackingTag: | ||
| 54 | + userData: | ||
| 55 | + assetBundleName: | ||
| 56 | + assetBundleVariant: |
18.6 KB
| @@ -0,0 +1,56 @@ | @@ -0,0 +1,56 @@ | ||
| 1 | +fileFormatVersion: 2 | ||
| 2 | +guid: 6660d37921c0cb046af9d4717fc72237 | ||
| 3 | +timeCreated: 1456247284 | ||
| 4 | +licenseType: Pro | ||
| 5 | +TextureImporter: | ||
| 6 | + fileIDToRecycleName: {} | ||
| 7 | + serializedVersion: 2 | ||
| 8 | + mipmaps: | ||
| 9 | + mipMapMode: 0 | ||
| 10 | + enableMipMap: 1 | ||
| 11 | + linearTexture: 0 | ||
| 12 | + correctGamma: 0 | ||
| 13 | + fadeOut: 0 | ||
| 14 | + borderMipMap: 0 | ||
| 15 | + mipMapFadeDistanceStart: 1 | ||
| 16 | + mipMapFadeDistanceEnd: 3 | ||
| 17 | + bumpmap: | ||
| 18 | + convertToNormalMap: 0 | ||
| 19 | + externalNormalMap: 0 | ||
| 20 | + heightScale: .25 | ||
| 21 | + normalMapFilter: 0 | ||
| 22 | + isReadable: 0 | ||
| 23 | + grayScaleToAlpha: 0 | ||
| 24 | + generateCubemap: 0 | ||
| 25 | + cubemapConvolution: 0 | ||
| 26 | + cubemapConvolutionSteps: 8 | ||
| 27 | + cubemapConvolutionExponent: 1.5 | ||
| 28 | + seamlessCubemap: 0 | ||
| 29 | + textureFormat: -1 | ||
| 30 | + maxTextureSize: 2048 | ||
| 31 | + textureSettings: | ||
| 32 | + filterMode: -1 | ||
| 33 | + aniso: -1 | ||
| 34 | + mipBias: -1 | ||
| 35 | + wrapMode: 1 | ||
| 36 | + nPOTScale: 0 | ||
| 37 | + lightmap: 0 | ||
| 38 | + rGBM: 0 | ||
| 39 | + compressionQuality: 50 | ||
| 40 | + allowsAlphaSplitting: 0 | ||
| 41 | + spriteMode: 1 | ||
| 42 | + spriteExtrude: 1 | ||
| 43 | + spriteMeshType: 1 | ||
| 44 | + alignment: 0 | ||
| 45 | + spritePivot: {x: .5, y: .5} | ||
| 46 | + spriteBorder: {x: 0, y: 0, z: 0, w: 0} | ||
| 47 | + spritePixelsToUnits: 100 | ||
| 48 | + alphaIsTransparency: 1 | ||
| 49 | + textureType: 8 | ||
| 50 | + buildTargetSettings: [] | ||
| 51 | + spriteSheet: | ||
| 52 | + sprites: [] | ||
| 53 | + spritePackingTag: | ||
| 54 | + userData: | ||
| 55 | + assetBundleName: | ||
| 56 | + assetBundleVariant: |
29 KB
| @@ -0,0 +1,56 @@ | @@ -0,0 +1,56 @@ | ||
| 1 | +fileFormatVersion: 2 | ||
| 2 | +guid: c8d7dd1fea55820428d8a9afdfff7bea | ||
| 3 | +timeCreated: 1456247284 | ||
| 4 | +licenseType: Pro | ||
| 5 | +TextureImporter: | ||
| 6 | + fileIDToRecycleName: {} | ||
| 7 | + serializedVersion: 2 | ||
| 8 | + mipmaps: | ||
| 9 | + mipMapMode: 0 | ||
| 10 | + enableMipMap: 1 | ||
| 11 | + linearTexture: 0 | ||
| 12 | + correctGamma: 0 | ||
| 13 | + fadeOut: 0 | ||
| 14 | + borderMipMap: 0 | ||
| 15 | + mipMapFadeDistanceStart: 1 | ||
| 16 | + mipMapFadeDistanceEnd: 3 | ||
| 17 | + bumpmap: | ||
| 18 | + convertToNormalMap: 0 | ||
| 19 | + externalNormalMap: 0 | ||
| 20 | + heightScale: .25 | ||
| 21 | + normalMapFilter: 0 | ||
| 22 | + isReadable: 0 | ||
| 23 | + grayScaleToAlpha: 0 | ||
| 24 | + generateCubemap: 0 | ||
| 25 | + cubemapConvolution: 0 | ||
| 26 | + cubemapConvolutionSteps: 8 | ||
| 27 | + cubemapConvolutionExponent: 1.5 | ||
| 28 | + seamlessCubemap: 0 | ||
| 29 | + textureFormat: -1 | ||
| 30 | + maxTextureSize: 2048 | ||
| 31 | + textureSettings: | ||
| 32 | + filterMode: -1 | ||
| 33 | + aniso: -1 | ||
| 34 | + mipBias: -1 | ||
| 35 | + wrapMode: 1 | ||
| 36 | + nPOTScale: 0 | ||
| 37 | + lightmap: 0 | ||
| 38 | + rGBM: 0 | ||
| 39 | + compressionQuality: 50 | ||
| 40 | + allowsAlphaSplitting: 0 | ||
| 41 | + spriteMode: 1 | ||
| 42 | + spriteExtrude: 1 | ||
| 43 | + spriteMeshType: 1 | ||
| 44 | + alignment: 0 | ||
| 45 | + spritePivot: {x: .5, y: .5} | ||
| 46 | + spriteBorder: {x: 0, y: 0, z: 0, w: 0} | ||
| 47 | + spritePixelsToUnits: 100 | ||
| 48 | + alphaIsTransparency: 1 | ||
| 49 | + textureType: 8 | ||
| 50 | + buildTargetSettings: [] | ||
| 51 | + spriteSheet: | ||
| 52 | + sprites: [] | ||
| 53 | + spritePackingTag: | ||
| 54 | + userData: | ||
| 55 | + assetBundleName: | ||
| 56 | + assetBundleVariant: |
33.9 KB
| @@ -0,0 +1,56 @@ | @@ -0,0 +1,56 @@ | ||
| 1 | +fileFormatVersion: 2 | ||
| 2 | +guid: 638d58b65a3bfcf45955f6c3a1fbb4f9 | ||
| 3 | +timeCreated: 1456247284 | ||
| 4 | +licenseType: Pro | ||
| 5 | +TextureImporter: | ||
| 6 | + fileIDToRecycleName: {} | ||
| 7 | + serializedVersion: 2 | ||
| 8 | + mipmaps: | ||
| 9 | + mipMapMode: 0 | ||
| 10 | + enableMipMap: 1 | ||
| 11 | + linearTexture: 0 | ||
| 12 | + correctGamma: 0 | ||
| 13 | + fadeOut: 0 | ||
| 14 | + borderMipMap: 0 | ||
| 15 | + mipMapFadeDistanceStart: 1 | ||
| 16 | + mipMapFadeDistanceEnd: 3 | ||
| 17 | + bumpmap: | ||
| 18 | + convertToNormalMap: 0 | ||
| 19 | + externalNormalMap: 0 | ||
| 20 | + heightScale: .25 | ||
| 21 | + normalMapFilter: 0 | ||
| 22 | + isReadable: 0 | ||
| 23 | + grayScaleToAlpha: 0 | ||
| 24 | + generateCubemap: 0 | ||
| 25 | + cubemapConvolution: 0 | ||
| 26 | + cubemapConvolutionSteps: 8 | ||
| 27 | + cubemapConvolutionExponent: 1.5 | ||
| 28 | + seamlessCubemap: 0 | ||
| 29 | + textureFormat: -1 | ||
| 30 | + maxTextureSize: 2048 | ||
| 31 | + textureSettings: | ||
| 32 | + filterMode: -1 | ||
| 33 | + aniso: -1 | ||
| 34 | + mipBias: -1 | ||
| 35 | + wrapMode: 1 | ||
| 36 | + nPOTScale: 0 | ||
| 37 | + lightmap: 0 | ||
| 38 | + rGBM: 0 | ||
| 39 | + compressionQuality: 50 | ||
| 40 | + allowsAlphaSplitting: 0 | ||
| 41 | + spriteMode: 1 | ||
| 42 | + spriteExtrude: 1 | ||
| 43 | + spriteMeshType: 1 | ||
| 44 | + alignment: 0 | ||
| 45 | + spritePivot: {x: .5, y: .5} | ||
| 46 | + spriteBorder: {x: 0, y: 0, z: 0, w: 0} | ||
| 47 | + spritePixelsToUnits: 100 | ||
| 48 | + alphaIsTransparency: 1 | ||
| 49 | + textureType: 8 | ||
| 50 | + buildTargetSettings: [] | ||
| 51 | + spriteSheet: | ||
| 52 | + sprites: [] | ||
| 53 | + spritePackingTag: | ||
| 54 | + userData: | ||
| 55 | + assetBundleName: | ||
| 56 | + assetBundleVariant: |
Assets/Scenes/Main.unity
| @@ -704,6 +704,73 @@ CanvasRenderer: | @@ -704,6 +704,73 @@ CanvasRenderer: | ||
| 704 | type: 2} | 704 | type: 2} |
| 705 | m_PrefabInternal: {fileID: 0} | 705 | m_PrefabInternal: {fileID: 0} |
| 706 | m_GameObject: {fileID: 191800645} | 706 | m_GameObject: {fileID: 191800645} |
| 707 | +--- !u!1 &197321765 | ||
| 708 | +GameObject: | ||
| 709 | + m_ObjectHideFlags: 0 | ||
| 710 | + m_PrefabParentObject: {fileID: 0} | ||
| 711 | + m_PrefabInternal: {fileID: 0} | ||
| 712 | + serializedVersion: 4 | ||
| 713 | + m_Component: | ||
| 714 | + - 224: {fileID: 197321766} | ||
| 715 | + - 222: {fileID: 197321768} | ||
| 716 | + - 114: {fileID: 197321767} | ||
| 717 | + m_Layer: 5 | ||
| 718 | + m_Name: secret_tec | ||
| 719 | + m_TagString: Untagged | ||
| 720 | + m_Icon: {fileID: 0} | ||
| 721 | + m_NavMeshLayer: 0 | ||
| 722 | + m_StaticEditorFlags: 0 | ||
| 723 | + m_IsActive: 1 | ||
| 724 | +--- !u!224 &197321766 | ||
| 725 | +RectTransform: | ||
| 726 | + m_ObjectHideFlags: 0 | ||
| 727 | + m_PrefabParentObject: {fileID: 0} | ||
| 728 | + m_PrefabInternal: {fileID: 0} | ||
| 729 | + m_GameObject: {fileID: 197321765} | ||
| 730 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 731 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 732 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 733 | + m_Children: [] | ||
| 734 | + m_Father: {fileID: 1010778543} | ||
| 735 | + m_RootOrder: 1 | ||
| 736 | + m_AnchorMin: {x: 0, y: .610000014} | ||
| 737 | + m_AnchorMax: {x: 1, y: .790000021} | ||
| 738 | + m_AnchoredPosition: {x: 0, y: 0} | ||
| 739 | + m_SizeDelta: {x: 0, y: 0} | ||
| 740 | + m_Pivot: {x: .5, y: .5} | ||
| 741 | +--- !u!114 &197321767 | ||
| 742 | +MonoBehaviour: | ||
| 743 | + m_ObjectHideFlags: 0 | ||
| 744 | + m_PrefabParentObject: {fileID: 0} | ||
| 745 | + m_PrefabInternal: {fileID: 0} | ||
| 746 | + m_GameObject: {fileID: 197321765} | ||
| 747 | + m_Enabled: 1 | ||
| 748 | + m_EditorHideFlags: 0 | ||
| 749 | + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
| 750 | + m_Name: | ||
| 751 | + m_EditorClassIdentifier: | ||
| 752 | + m_Material: {fileID: 0} | ||
| 753 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
| 754 | + m_RaycastTarget: 1 | ||
| 755 | + m_OnCullStateChanged: | ||
| 756 | + m_PersistentCalls: | ||
| 757 | + m_Calls: [] | ||
| 758 | + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | ||
| 759 | + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ||
| 760 | + m_Sprite: {fileID: 21300000, guid: 359a81b8c2c4de045a51c9ea52aa9fa7, type: 3} | ||
| 761 | + m_Type: 0 | ||
| 762 | + m_PreserveAspect: 1 | ||
| 763 | + m_FillCenter: 1 | ||
| 764 | + m_FillMethod: 4 | ||
| 765 | + m_FillAmount: 1 | ||
| 766 | + m_FillClockwise: 1 | ||
| 767 | + m_FillOrigin: 0 | ||
| 768 | +--- !u!222 &197321768 | ||
| 769 | +CanvasRenderer: | ||
| 770 | + m_ObjectHideFlags: 0 | ||
| 771 | + m_PrefabParentObject: {fileID: 0} | ||
| 772 | + m_PrefabInternal: {fileID: 0} | ||
| 773 | + m_GameObject: {fileID: 197321765} | ||
| 707 | --- !u!1 &212041959 | 774 | --- !u!1 &212041959 |
| 708 | GameObject: | 775 | GameObject: |
| 709 | m_ObjectHideFlags: 0 | 776 | m_ObjectHideFlags: 0 |
| @@ -825,6 +892,7 @@ MonoBehaviour: | @@ -825,6 +892,7 @@ MonoBehaviour: | ||
| 825 | m_Script: {fileID: 11500000, guid: 76b77d949fd9e294bb95149436284217, type: 3} | 892 | m_Script: {fileID: 11500000, guid: 76b77d949fd9e294bb95149436284217, type: 3} |
| 826 | m_Name: | 893 | m_Name: |
| 827 | m_EditorClassIdentifier: | 894 | m_EditorClassIdentifier: |
| 895 | + screenManager: {fileID: 2131993092} | ||
| 828 | description: {fileID: 2010584311} | 896 | description: {fileID: 2010584311} |
| 829 | translateImage: {fileID: 45157148} | 897 | translateImage: {fileID: 45157148} |
| 830 | micImage: {fileID: 510126320} | 898 | micImage: {fileID: 510126320} |
| @@ -2299,6 +2367,7 @@ MonoBehaviour: | @@ -2299,6 +2367,7 @@ MonoBehaviour: | ||
| 2299 | m_Script: {fileID: 11500000, guid: eeb6a455eb0dfd94aa6bc3484e5fecff, type: 3} | 2367 | m_Script: {fileID: 11500000, guid: eeb6a455eb0dfd94aa6bc3484e5fecff, type: 3} |
| 2300 | m_Name: | 2368 | m_Name: |
| 2301 | m_EditorClassIdentifier: | 2369 | m_EditorClassIdentifier: |
| 2370 | + glosa: | ||
| 2302 | SUBTITLES: {fileID: 1795476622} | 2371 | SUBTITLES: {fileID: 1795476622} |
| 2303 | randomAnimations: {fileID: 2111966982} | 2372 | randomAnimations: {fileID: 2111966982} |
| 2304 | translateScreenText: {fileID: 1202010950} | 2373 | translateScreenText: {fileID: 1202010950} |
| @@ -2915,6 +2984,146 @@ CanvasRenderer: | @@ -2915,6 +2984,146 @@ CanvasRenderer: | ||
| 2915 | type: 2} | 2984 | type: 2} |
| 2916 | m_PrefabInternal: {fileID: 0} | 2985 | m_PrefabInternal: {fileID: 0} |
| 2917 | m_GameObject: {fileID: 814612176} | 2986 | m_GameObject: {fileID: 814612176} |
| 2987 | +--- !u!1 &815279417 | ||
| 2988 | +GameObject: | ||
| 2989 | + m_ObjectHideFlags: 0 | ||
| 2990 | + m_PrefabParentObject: {fileID: 100084, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} | ||
| 2991 | + m_PrefabInternal: {fileID: 0} | ||
| 2992 | + serializedVersion: 4 | ||
| 2993 | + m_Component: | ||
| 2994 | + - 224: {fileID: 815279418} | ||
| 2995 | + - 222: {fileID: 815279422} | ||
| 2996 | + - 114: {fileID: 815279421} | ||
| 2997 | + - 114: {fileID: 815279420} | ||
| 2998 | + - 114: {fileID: 815279419} | ||
| 2999 | + m_Layer: 5 | ||
| 3000 | + m_Name: b_close | ||
| 3001 | + m_TagString: Untagged | ||
| 3002 | + m_Icon: {fileID: 0} | ||
| 3003 | + m_NavMeshLayer: 0 | ||
| 3004 | + m_StaticEditorFlags: 0 | ||
| 3005 | + m_IsActive: 1 | ||
| 3006 | +--- !u!224 &815279418 | ||
| 3007 | +RectTransform: | ||
| 3008 | + m_ObjectHideFlags: 0 | ||
| 3009 | + m_PrefabParentObject: {fileID: 22409254, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
| 3010 | + type: 2} | ||
| 3011 | + m_PrefabInternal: {fileID: 0} | ||
| 3012 | + m_GameObject: {fileID: 815279417} | ||
| 3013 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 3014 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 3015 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 3016 | + m_Children: [] | ||
| 3017 | + m_Father: {fileID: 2044204295} | ||
| 3018 | + m_RootOrder: 1 | ||
| 3019 | + m_AnchorMin: {x: 0, y: .910000026} | ||
| 3020 | + m_AnchorMax: {x: .970000029, y: .980000019} | ||
| 3021 | + m_AnchoredPosition: {x: 0, y: 0} | ||
| 3022 | + m_SizeDelta: {x: 0, y: 0} | ||
| 3023 | + m_Pivot: {x: 1, y: 1} | ||
| 3024 | +--- !u!114 &815279419 | ||
| 3025 | +MonoBehaviour: | ||
| 3026 | + m_ObjectHideFlags: 0 | ||
| 3027 | + m_PrefabParentObject: {fileID: 11446186, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
| 3028 | + type: 2} | ||
| 3029 | + m_PrefabInternal: {fileID: 0} | ||
| 3030 | + m_GameObject: {fileID: 815279417} | ||
| 3031 | + m_Enabled: 0 | ||
| 3032 | + m_EditorHideFlags: 0 | ||
| 3033 | + m_Script: {fileID: 1573420865, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
| 3034 | + m_Name: | ||
| 3035 | + m_EditorClassIdentifier: | ||
| 3036 | + m_EffectColor: {r: 0, g: 0, b: 0, a: .5} | ||
| 3037 | + m_EffectDistance: {x: 1, y: -1} | ||
| 3038 | + m_UseGraphicAlpha: 1 | ||
| 3039 | +--- !u!114 &815279420 | ||
| 3040 | +MonoBehaviour: | ||
| 3041 | + m_ObjectHideFlags: 0 | ||
| 3042 | + m_PrefabParentObject: {fileID: 11464464, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
| 3043 | + type: 2} | ||
| 3044 | + m_PrefabInternal: {fileID: 0} | ||
| 3045 | + m_GameObject: {fileID: 815279417} | ||
| 3046 | + m_Enabled: 1 | ||
| 3047 | + m_EditorHideFlags: 0 | ||
| 3048 | + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
| 3049 | + m_Name: | ||
| 3050 | + m_EditorClassIdentifier: | ||
| 3051 | + m_Navigation: | ||
| 3052 | + m_Mode: 3 | ||
| 3053 | + m_SelectOnUp: {fileID: 0} | ||
| 3054 | + m_SelectOnDown: {fileID: 0} | ||
| 3055 | + m_SelectOnLeft: {fileID: 0} | ||
| 3056 | + m_SelectOnRight: {fileID: 0} | ||
| 3057 | + m_Transition: 1 | ||
| 3058 | + m_Colors: | ||
| 3059 | + m_NormalColor: {r: 0, g: 0, b: 0, a: .233999997} | ||
| 3060 | + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} | ||
| 3061 | + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} | ||
| 3062 | + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} | ||
| 3063 | + m_ColorMultiplier: 1 | ||
| 3064 | + m_FadeDuration: .100000001 | ||
| 3065 | + m_SpriteState: | ||
| 3066 | + m_HighlightedSprite: {fileID: 0} | ||
| 3067 | + m_PressedSprite: {fileID: 0} | ||
| 3068 | + m_DisabledSprite: {fileID: 0} | ||
| 3069 | + m_AnimationTriggers: | ||
| 3070 | + m_NormalTrigger: Normal | ||
| 3071 | + m_HighlightedTrigger: Highlighted | ||
| 3072 | + m_PressedTrigger: Pressed | ||
| 3073 | + m_DisabledTrigger: Disabled | ||
| 3074 | + m_Interactable: 1 | ||
| 3075 | + m_TargetGraphic: {fileID: 815279421} | ||
| 3076 | + m_OnClick: | ||
| 3077 | + m_PersistentCalls: | ||
| 3078 | + m_Calls: | ||
| 3079 | + - m_Target: {fileID: 2131993092} | ||
| 3080 | + m_MethodName: hideScreen | ||
| 3081 | + m_Mode: 1 | ||
| 3082 | + m_Arguments: | ||
| 3083 | + m_ObjectArgument: {fileID: 0} | ||
| 3084 | + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine | ||
| 3085 | + m_IntArgument: 0 | ||
| 3086 | + m_FloatArgument: 0 | ||
| 3087 | + m_StringArgument: | ||
| 3088 | + m_BoolArgument: 0 | ||
| 3089 | + m_CallState: 2 | ||
| 3090 | + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, | ||
| 3091 | + Culture=neutral, PublicKeyToken=null | ||
| 3092 | +--- !u!114 &815279421 | ||
| 3093 | +MonoBehaviour: | ||
| 3094 | + m_ObjectHideFlags: 0 | ||
| 3095 | + m_PrefabParentObject: {fileID: 11468796, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
| 3096 | + type: 2} | ||
| 3097 | + m_PrefabInternal: {fileID: 0} | ||
| 3098 | + m_GameObject: {fileID: 815279417} | ||
| 3099 | + m_Enabled: 1 | ||
| 3100 | + m_EditorHideFlags: 0 | ||
| 3101 | + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
| 3102 | + m_Name: | ||
| 3103 | + m_EditorClassIdentifier: | ||
| 3104 | + m_Material: {fileID: 0} | ||
| 3105 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
| 3106 | + m_RaycastTarget: 1 | ||
| 3107 | + m_OnCullStateChanged: | ||
| 3108 | + m_PersistentCalls: | ||
| 3109 | + m_Calls: [] | ||
| 3110 | + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | ||
| 3111 | + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ||
| 3112 | + m_Sprite: {fileID: 21300000, guid: d210b63ba2d5c22499f56e30b3ff5402, type: 3} | ||
| 3113 | + m_Type: 0 | ||
| 3114 | + m_PreserveAspect: 1 | ||
| 3115 | + m_FillCenter: 1 | ||
| 3116 | + m_FillMethod: 4 | ||
| 3117 | + m_FillAmount: 1 | ||
| 3118 | + m_FillClockwise: 1 | ||
| 3119 | + m_FillOrigin: 0 | ||
| 3120 | +--- !u!222 &815279422 | ||
| 3121 | +CanvasRenderer: | ||
| 3122 | + m_ObjectHideFlags: 0 | ||
| 3123 | + m_PrefabParentObject: {fileID: 22249114, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
| 3124 | + type: 2} | ||
| 3125 | + m_PrefabInternal: {fileID: 0} | ||
| 3126 | + m_GameObject: {fileID: 815279417} | ||
| 2918 | --- !u!1 &832064354 | 3127 | --- !u!1 &832064354 |
| 2919 | GameObject: | 3128 | GameObject: |
| 2920 | m_ObjectHideFlags: 0 | 3129 | m_ObjectHideFlags: 0 |
| @@ -2978,7 +3187,7 @@ Transform: | @@ -2978,7 +3187,7 @@ Transform: | ||
| 2978 | m_LocalScale: {x: 1, y: 1, z: 1} | 3187 | m_LocalScale: {x: 1, y: 1, z: 1} |
| 2979 | m_Children: [] | 3188 | m_Children: [] |
| 2980 | m_Father: {fileID: 1414104007} | 3189 | m_Father: {fileID: 1414104007} |
| 2981 | - m_RootOrder: 9 | 3190 | + m_RootOrder: 10 |
| 2982 | --- !u!114 &842733391 | 3191 | --- !u!114 &842733391 |
| 2983 | MonoBehaviour: | 3192 | MonoBehaviour: |
| 2984 | m_ObjectHideFlags: 0 | 3193 | m_ObjectHideFlags: 0 |
| @@ -3846,6 +4055,43 @@ CanvasRenderer: | @@ -3846,6 +4055,43 @@ CanvasRenderer: | ||
| 3846 | type: 2} | 4055 | type: 2} |
| 3847 | m_PrefabInternal: {fileID: 0} | 4056 | m_PrefabInternal: {fileID: 0} |
| 3848 | m_GameObject: {fileID: 995712443} | 4057 | m_GameObject: {fileID: 995712443} |
| 4058 | +--- !u!1 &1010778542 | ||
| 4059 | +GameObject: | ||
| 4060 | + m_ObjectHideFlags: 0 | ||
| 4061 | + m_PrefabParentObject: {fileID: 0} | ||
| 4062 | + m_PrefabInternal: {fileID: 0} | ||
| 4063 | + serializedVersion: 4 | ||
| 4064 | + m_Component: | ||
| 4065 | + - 224: {fileID: 1010778543} | ||
| 4066 | + m_Layer: 5 | ||
| 4067 | + m_Name: left | ||
| 4068 | + m_TagString: Untagged | ||
| 4069 | + m_Icon: {fileID: 0} | ||
| 4070 | + m_NavMeshLayer: 0 | ||
| 4071 | + m_StaticEditorFlags: 0 | ||
| 4072 | + m_IsActive: 1 | ||
| 4073 | +--- !u!224 &1010778543 | ||
| 4074 | +RectTransform: | ||
| 4075 | + m_ObjectHideFlags: 0 | ||
| 4076 | + m_PrefabParentObject: {fileID: 0} | ||
| 4077 | + m_PrefabInternal: {fileID: 0} | ||
| 4078 | + m_GameObject: {fileID: 1010778542} | ||
| 4079 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 4080 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 4081 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 4082 | + m_Children: | ||
| 4083 | + - {fileID: 1416567425} | ||
| 4084 | + - {fileID: 197321766} | ||
| 4085 | + - {fileID: 1439673894} | ||
| 4086 | + - {fileID: 1623694773} | ||
| 4087 | + - {fileID: 1494144144} | ||
| 4088 | + m_Father: {fileID: 1221700622} | ||
| 4089 | + m_RootOrder: 0 | ||
| 4090 | + m_AnchorMin: {x: .0599999987, y: 0} | ||
| 4091 | + m_AnchorMax: {x: .469999999, y: 1} | ||
| 4092 | + m_AnchoredPosition: {x: 0, y: 0} | ||
| 4093 | + m_SizeDelta: {x: 0, y: 0} | ||
| 4094 | + m_Pivot: {x: .5, y: .5} | ||
| 3849 | --- !u!1 &1021427527 | 4095 | --- !u!1 &1021427527 |
| 3850 | GameObject: | 4096 | GameObject: |
| 3851 | m_ObjectHideFlags: 0 | 4097 | m_ObjectHideFlags: 0 |
| @@ -4488,7 +4734,7 @@ RectTransform: | @@ -4488,7 +4734,7 @@ RectTransform: | ||
| 4488 | - {fileID: 163763090} | 4734 | - {fileID: 163763090} |
| 4489 | - {fileID: 1266698452} | 4735 | - {fileID: 1266698452} |
| 4490 | m_Father: {fileID: 1414104007} | 4736 | m_Father: {fileID: 1414104007} |
| 4491 | - m_RootOrder: 10 | 4737 | + m_RootOrder: 11 |
| 4492 | m_AnchorMin: {x: .0299999993, y: .300000012} | 4738 | m_AnchorMin: {x: .0299999993, y: .300000012} |
| 4493 | m_AnchorMax: {x: .970000029, y: .699999988} | 4739 | m_AnchorMax: {x: .970000029, y: .699999988} |
| 4494 | m_AnchoredPosition: {x: 0, y: 0} | 4740 | m_AnchoredPosition: {x: 0, y: 0} |
| @@ -4891,6 +5137,40 @@ MonoBehaviour: | @@ -4891,6 +5137,40 @@ MonoBehaviour: | ||
| 4891 | m_SelectionColor: {r: .65882355, g: .807843149, b: 1, a: .752941191} | 5137 | m_SelectionColor: {r: .65882355, g: .807843149, b: 1, a: .752941191} |
| 4892 | m_Text: | 5138 | m_Text: |
| 4893 | m_CaretBlinkRate: .850000024 | 5139 | m_CaretBlinkRate: .850000024 |
| 5140 | +--- !u!1 &1221700621 | ||
| 5141 | +GameObject: | ||
| 5142 | + m_ObjectHideFlags: 0 | ||
| 5143 | + m_PrefabParentObject: {fileID: 0} | ||
| 5144 | + m_PrefabInternal: {fileID: 0} | ||
| 5145 | + serializedVersion: 4 | ||
| 5146 | + m_Component: | ||
| 5147 | + - 224: {fileID: 1221700622} | ||
| 5148 | + m_Layer: 5 | ||
| 5149 | + m_Name: grid | ||
| 5150 | + m_TagString: Untagged | ||
| 5151 | + m_Icon: {fileID: 0} | ||
| 5152 | + m_NavMeshLayer: 0 | ||
| 5153 | + m_StaticEditorFlags: 0 | ||
| 5154 | + m_IsActive: 1 | ||
| 5155 | +--- !u!224 &1221700622 | ||
| 5156 | +RectTransform: | ||
| 5157 | + m_ObjectHideFlags: 0 | ||
| 5158 | + m_PrefabParentObject: {fileID: 0} | ||
| 5159 | + m_PrefabInternal: {fileID: 0} | ||
| 5160 | + m_GameObject: {fileID: 1221700621} | ||
| 5161 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 5162 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 5163 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 5164 | + m_Children: | ||
| 5165 | + - {fileID: 1010778543} | ||
| 5166 | + - {fileID: 1623802273} | ||
| 5167 | + m_Father: {fileID: 2044204295} | ||
| 5168 | + m_RootOrder: 2 | ||
| 5169 | + m_AnchorMin: {x: 0, y: .100000001} | ||
| 5170 | + m_AnchorMax: {x: 1, y: .839999974} | ||
| 5171 | + m_AnchoredPosition: {x: 0, y: 0} | ||
| 5172 | + m_SizeDelta: {x: 0, y: 0} | ||
| 5173 | + m_Pivot: {x: .5, y: .5} | ||
| 4894 | --- !u!1 &1265043069 | 5174 | --- !u!1 &1265043069 |
| 4895 | GameObject: | 5175 | GameObject: |
| 4896 | m_ObjectHideFlags: 0 | 5176 | m_ObjectHideFlags: 0 |
| @@ -5413,53 +5693,120 @@ CanvasRenderer: | @@ -5413,53 +5693,120 @@ CanvasRenderer: | ||
| 5413 | type: 2} | 5693 | type: 2} |
| 5414 | m_PrefabInternal: {fileID: 0} | 5694 | m_PrefabInternal: {fileID: 0} |
| 5415 | m_GameObject: {fileID: 1329557728} | 5695 | m_GameObject: {fileID: 1329557728} |
| 5416 | ---- !u!1 &1382683268 | 5696 | +--- !u!1 &1330400154 |
| 5417 | GameObject: | 5697 | GameObject: |
| 5418 | m_ObjectHideFlags: 0 | 5698 | m_ObjectHideFlags: 0 |
| 5419 | - m_PrefabParentObject: {fileID: 142296, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} | 5699 | + m_PrefabParentObject: {fileID: 0} |
| 5420 | m_PrefabInternal: {fileID: 0} | 5700 | m_PrefabInternal: {fileID: 0} |
| 5421 | serializedVersion: 4 | 5701 | serializedVersion: 4 |
| 5422 | m_Component: | 5702 | m_Component: |
| 5423 | - - 224: {fileID: 1382683269} | ||
| 5424 | - - 222: {fileID: 1382683273} | ||
| 5425 | - - 114: {fileID: 1382683272} | ||
| 5426 | - - 114: {fileID: 1382683271} | ||
| 5427 | - - 114: {fileID: 1382683270} | 5703 | + - 224: {fileID: 1330400155} |
| 5704 | + - 222: {fileID: 1330400157} | ||
| 5705 | + - 114: {fileID: 1330400156} | ||
| 5428 | m_Layer: 5 | 5706 | m_Layer: 5 |
| 5429 | - m_Name: b_back | 5707 | + m_Name: minis_plan |
| 5430 | m_TagString: Untagged | 5708 | m_TagString: Untagged |
| 5431 | m_Icon: {fileID: 0} | 5709 | m_Icon: {fileID: 0} |
| 5432 | m_NavMeshLayer: 0 | 5710 | m_NavMeshLayer: 0 |
| 5433 | m_StaticEditorFlags: 0 | 5711 | m_StaticEditorFlags: 0 |
| 5434 | m_IsActive: 1 | 5712 | m_IsActive: 1 |
| 5435 | ---- !u!224 &1382683269 | 5713 | +--- !u!224 &1330400155 |
| 5436 | RectTransform: | 5714 | RectTransform: |
| 5437 | m_ObjectHideFlags: 0 | 5715 | m_ObjectHideFlags: 0 |
| 5438 | - m_PrefabParentObject: {fileID: 22417840, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
| 5439 | - type: 2} | 5716 | + m_PrefabParentObject: {fileID: 0} |
| 5440 | m_PrefabInternal: {fileID: 0} | 5717 | m_PrefabInternal: {fileID: 0} |
| 5441 | - m_GameObject: {fileID: 1382683268} | 5718 | + m_GameObject: {fileID: 1330400154} |
| 5442 | m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | 5719 | m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} |
| 5443 | m_LocalPosition: {x: 0, y: 0, z: 0} | 5720 | m_LocalPosition: {x: 0, y: 0, z: 0} |
| 5444 | m_LocalScale: {x: 1, y: 1, z: 1} | 5721 | m_LocalScale: {x: 1, y: 1, z: 1} |
| 5445 | m_Children: [] | 5722 | m_Children: [] |
| 5446 | - m_Father: {fileID: 1935189154} | ||
| 5447 | - m_RootOrder: 0 | ||
| 5448 | - m_AnchorMin: {x: .0299999993, y: .924000025} | ||
| 5449 | - m_AnchorMax: {x: .300000012, y: .980000019} | 5723 | + m_Father: {fileID: 1623802273} |
| 5724 | + m_RootOrder: 1 | ||
| 5725 | + m_AnchorMin: {x: .219999999, y: .610000014} | ||
| 5726 | + m_AnchorMax: {x: .779999971, y: .790000021} | ||
| 5450 | m_AnchoredPosition: {x: 0, y: 0} | 5727 | m_AnchoredPosition: {x: 0, y: 0} |
| 5451 | m_SizeDelta: {x: 0, y: 0} | 5728 | m_SizeDelta: {x: 0, y: 0} |
| 5452 | - m_Pivot: {x: 0, y: .5} | ||
| 5453 | ---- !u!114 &1382683270 | 5729 | + m_Pivot: {x: .5, y: .5} |
| 5730 | +--- !u!114 &1330400156 | ||
| 5454 | MonoBehaviour: | 5731 | MonoBehaviour: |
| 5455 | m_ObjectHideFlags: 0 | 5732 | m_ObjectHideFlags: 0 |
| 5456 | - m_PrefabParentObject: {fileID: 11463586, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
| 5457 | - type: 2} | 5733 | + m_PrefabParentObject: {fileID: 0} |
| 5458 | m_PrefabInternal: {fileID: 0} | 5734 | m_PrefabInternal: {fileID: 0} |
| 5459 | - m_GameObject: {fileID: 1382683268} | ||
| 5460 | - m_Enabled: 0 | 5735 | + m_GameObject: {fileID: 1330400154} |
| 5736 | + m_Enabled: 1 | ||
| 5461 | m_EditorHideFlags: 0 | 5737 | m_EditorHideFlags: 0 |
| 5462 | - m_Script: {fileID: 1573420865, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | 5738 | + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} |
| 5739 | + m_Name: | ||
| 5740 | + m_EditorClassIdentifier: | ||
| 5741 | + m_Material: {fileID: 0} | ||
| 5742 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
| 5743 | + m_RaycastTarget: 1 | ||
| 5744 | + m_OnCullStateChanged: | ||
| 5745 | + m_PersistentCalls: | ||
| 5746 | + m_Calls: [] | ||
| 5747 | + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | ||
| 5748 | + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ||
| 5749 | + m_Sprite: {fileID: 21300000, guid: 146c86da3c7a27944895b4bd8df77ecb, type: 3} | ||
| 5750 | + m_Type: 0 | ||
| 5751 | + m_PreserveAspect: 1 | ||
| 5752 | + m_FillCenter: 1 | ||
| 5753 | + m_FillMethod: 4 | ||
| 5754 | + m_FillAmount: 1 | ||
| 5755 | + m_FillClockwise: 1 | ||
| 5756 | + m_FillOrigin: 0 | ||
| 5757 | +--- !u!222 &1330400157 | ||
| 5758 | +CanvasRenderer: | ||
| 5759 | + m_ObjectHideFlags: 0 | ||
| 5760 | + m_PrefabParentObject: {fileID: 0} | ||
| 5761 | + m_PrefabInternal: {fileID: 0} | ||
| 5762 | + m_GameObject: {fileID: 1330400154} | ||
| 5763 | +--- !u!1 &1382683268 | ||
| 5764 | +GameObject: | ||
| 5765 | + m_ObjectHideFlags: 0 | ||
| 5766 | + m_PrefabParentObject: {fileID: 142296, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} | ||
| 5767 | + m_PrefabInternal: {fileID: 0} | ||
| 5768 | + serializedVersion: 4 | ||
| 5769 | + m_Component: | ||
| 5770 | + - 224: {fileID: 1382683269} | ||
| 5771 | + - 222: {fileID: 1382683273} | ||
| 5772 | + - 114: {fileID: 1382683272} | ||
| 5773 | + - 114: {fileID: 1382683271} | ||
| 5774 | + - 114: {fileID: 1382683270} | ||
| 5775 | + m_Layer: 5 | ||
| 5776 | + m_Name: b_back | ||
| 5777 | + m_TagString: Untagged | ||
| 5778 | + m_Icon: {fileID: 0} | ||
| 5779 | + m_NavMeshLayer: 0 | ||
| 5780 | + m_StaticEditorFlags: 0 | ||
| 5781 | + m_IsActive: 1 | ||
| 5782 | +--- !u!224 &1382683269 | ||
| 5783 | +RectTransform: | ||
| 5784 | + m_ObjectHideFlags: 0 | ||
| 5785 | + m_PrefabParentObject: {fileID: 22417840, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
| 5786 | + type: 2} | ||
| 5787 | + m_PrefabInternal: {fileID: 0} | ||
| 5788 | + m_GameObject: {fileID: 1382683268} | ||
| 5789 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 5790 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 5791 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 5792 | + m_Children: [] | ||
| 5793 | + m_Father: {fileID: 1935189154} | ||
| 5794 | + m_RootOrder: 0 | ||
| 5795 | + m_AnchorMin: {x: .0299999993, y: .924000025} | ||
| 5796 | + m_AnchorMax: {x: .300000012, y: .980000019} | ||
| 5797 | + m_AnchoredPosition: {x: 0, y: 0} | ||
| 5798 | + m_SizeDelta: {x: 0, y: 0} | ||
| 5799 | + m_Pivot: {x: 0, y: .5} | ||
| 5800 | +--- !u!114 &1382683270 | ||
| 5801 | +MonoBehaviour: | ||
| 5802 | + m_ObjectHideFlags: 0 | ||
| 5803 | + m_PrefabParentObject: {fileID: 11463586, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
| 5804 | + type: 2} | ||
| 5805 | + m_PrefabInternal: {fileID: 0} | ||
| 5806 | + m_GameObject: {fileID: 1382683268} | ||
| 5807 | + m_Enabled: 0 | ||
| 5808 | + m_EditorHideFlags: 0 | ||
| 5809 | + m_Script: {fileID: 1573420865, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
| 5463 | m_Name: | 5810 | m_Name: |
| 5464 | m_EditorClassIdentifier: | 5811 | m_EditorClassIdentifier: |
| 5465 | m_EffectColor: {r: 0, g: 0, b: 0, a: .5} | 5812 | m_EffectColor: {r: 0, g: 0, b: 0, a: .5} |
| @@ -5553,6 +5900,90 @@ CanvasRenderer: | @@ -5553,6 +5900,90 @@ CanvasRenderer: | ||
| 5553 | type: 2} | 5900 | type: 2} |
| 5554 | m_PrefabInternal: {fileID: 0} | 5901 | m_PrefabInternal: {fileID: 0} |
| 5555 | m_GameObject: {fileID: 1382683268} | 5902 | m_GameObject: {fileID: 1382683268} |
| 5903 | +--- !u!1 &1412335969 | ||
| 5904 | +GameObject: | ||
| 5905 | + m_ObjectHideFlags: 0 | ||
| 5906 | + m_PrefabParentObject: {fileID: 0} | ||
| 5907 | + m_PrefabInternal: {fileID: 0} | ||
| 5908 | + serializedVersion: 4 | ||
| 5909 | + m_Component: | ||
| 5910 | + - 224: {fileID: 1412335970} | ||
| 5911 | + - 222: {fileID: 1412335972} | ||
| 5912 | + - 114: {fileID: 1412335971} | ||
| 5913 | + - 114: {fileID: 1412335973} | ||
| 5914 | + m_Layer: 5 | ||
| 5915 | + m_Name: text | ||
| 5916 | + m_TagString: Untagged | ||
| 5917 | + m_Icon: {fileID: 0} | ||
| 5918 | + m_NavMeshLayer: 0 | ||
| 5919 | + m_StaticEditorFlags: 0 | ||
| 5920 | + m_IsActive: 1 | ||
| 5921 | +--- !u!224 &1412335970 | ||
| 5922 | +RectTransform: | ||
| 5923 | + m_ObjectHideFlags: 0 | ||
| 5924 | + m_PrefabParentObject: {fileID: 0} | ||
| 5925 | + m_PrefabInternal: {fileID: 0} | ||
| 5926 | + m_GameObject: {fileID: 1412335969} | ||
| 5927 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 5928 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 5929 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 5930 | + m_Children: [] | ||
| 5931 | + m_Father: {fileID: 2044204295} | ||
| 5932 | + m_RootOrder: 0 | ||
| 5933 | + m_AnchorMin: {x: 0, y: .860000014} | ||
| 5934 | + m_AnchorMax: {x: 1, y: 1} | ||
| 5935 | + m_AnchoredPosition: {x: 0, y: 0} | ||
| 5936 | + m_SizeDelta: {x: 0, y: 0} | ||
| 5937 | + m_Pivot: {x: .5, y: .5} | ||
| 5938 | +--- !u!114 &1412335971 | ||
| 5939 | +MonoBehaviour: | ||
| 5940 | + m_ObjectHideFlags: 0 | ||
| 5941 | + m_PrefabParentObject: {fileID: 0} | ||
| 5942 | + m_PrefabInternal: {fileID: 0} | ||
| 5943 | + m_GameObject: {fileID: 1412335969} | ||
| 5944 | + m_Enabled: 1 | ||
| 5945 | + m_EditorHideFlags: 0 | ||
| 5946 | + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
| 5947 | + m_Name: | ||
| 5948 | + m_EditorClassIdentifier: | ||
| 5949 | + m_Material: {fileID: 0} | ||
| 5950 | + m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} | ||
| 5951 | + m_RaycastTarget: 1 | ||
| 5952 | + m_OnCullStateChanged: | ||
| 5953 | + m_PersistentCalls: | ||
| 5954 | + m_Calls: [] | ||
| 5955 | + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | ||
| 5956 | + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ||
| 5957 | + m_FontData: | ||
| 5958 | + m_Font: {fileID: 12800000, guid: 1d71629ab414fbe4a9015401607e12a6, type: 3} | ||
| 5959 | + m_FontSize: 20 | ||
| 5960 | + m_FontStyle: 0 | ||
| 5961 | + m_BestFit: 0 | ||
| 5962 | + m_MinSize: 10 | ||
| 5963 | + m_MaxSize: 40 | ||
| 5964 | + m_Alignment: 4 | ||
| 5965 | + m_RichText: 1 | ||
| 5966 | + m_HorizontalOverflow: 0 | ||
| 5967 | + m_VerticalOverflow: 0 | ||
| 5968 | + m_LineSpacing: 1 | ||
| 5969 | + m_Text: Realizadores | ||
| 5970 | +--- !u!222 &1412335972 | ||
| 5971 | +CanvasRenderer: | ||
| 5972 | + m_ObjectHideFlags: 0 | ||
| 5973 | + m_PrefabParentObject: {fileID: 0} | ||
| 5974 | + m_PrefabInternal: {fileID: 0} | ||
| 5975 | + m_GameObject: {fileID: 1412335969} | ||
| 5976 | +--- !u!114 &1412335973 | ||
| 5977 | +MonoBehaviour: | ||
| 5978 | + m_ObjectHideFlags: 0 | ||
| 5979 | + m_PrefabParentObject: {fileID: 0} | ||
| 5980 | + m_PrefabInternal: {fileID: 0} | ||
| 5981 | + m_GameObject: {fileID: 1412335969} | ||
| 5982 | + m_Enabled: 1 | ||
| 5983 | + m_EditorHideFlags: 0 | ||
| 5984 | + m_Script: {fileID: 11500000, guid: a7be422a80edfef4f8e4e8a6aca4378e, type: 3} | ||
| 5985 | + m_Name: | ||
| 5986 | + m_EditorClassIdentifier: | ||
| 5556 | --- !u!1 &1414104006 | 5987 | --- !u!1 &1414104006 |
| 5557 | GameObject: | 5988 | GameObject: |
| 5558 | m_ObjectHideFlags: 0 | 5989 | m_ObjectHideFlags: 0 |
| @@ -5591,6 +6022,7 @@ RectTransform: | @@ -5591,6 +6022,7 @@ RectTransform: | ||
| 5591 | - {fileID: 951727302} | 6022 | - {fileID: 951727302} |
| 5592 | - {fileID: 954173493} | 6023 | - {fileID: 954173493} |
| 5593 | - {fileID: 228512394} | 6024 | - {fileID: 228512394} |
| 6025 | + - {fileID: 2044204295} | ||
| 5594 | - {fileID: 842733390} | 6026 | - {fileID: 842733390} |
| 5595 | - {fileID: 1164416486} | 6027 | - {fileID: 1164416486} |
| 5596 | m_Father: {fileID: 0} | 6028 | m_Father: {fileID: 0} |
| @@ -5657,6 +6089,73 @@ Canvas: | @@ -5657,6 +6089,73 @@ Canvas: | ||
| 5657 | m_OverridePixelPerfect: 0 | 6089 | m_OverridePixelPerfect: 0 |
| 5658 | m_SortingLayerID: 0 | 6090 | m_SortingLayerID: 0 |
| 5659 | m_SortingOrder: 0 | 6091 | m_SortingOrder: 0 |
| 6092 | +--- !u!1 &1416567424 | ||
| 6093 | +GameObject: | ||
| 6094 | + m_ObjectHideFlags: 0 | ||
| 6095 | + m_PrefabParentObject: {fileID: 0} | ||
| 6096 | + m_PrefabInternal: {fileID: 0} | ||
| 6097 | + serializedVersion: 4 | ||
| 6098 | + m_Component: | ||
| 6099 | + - 224: {fileID: 1416567425} | ||
| 6100 | + - 222: {fileID: 1416567427} | ||
| 6101 | + - 114: {fileID: 1416567426} | ||
| 6102 | + m_Layer: 5 | ||
| 6103 | + m_Name: lavid | ||
| 6104 | + m_TagString: Untagged | ||
| 6105 | + m_Icon: {fileID: 0} | ||
| 6106 | + m_NavMeshLayer: 0 | ||
| 6107 | + m_StaticEditorFlags: 0 | ||
| 6108 | + m_IsActive: 1 | ||
| 6109 | +--- !u!224 &1416567425 | ||
| 6110 | +RectTransform: | ||
| 6111 | + m_ObjectHideFlags: 0 | ||
| 6112 | + m_PrefabParentObject: {fileID: 0} | ||
| 6113 | + m_PrefabInternal: {fileID: 0} | ||
| 6114 | + m_GameObject: {fileID: 1416567424} | ||
| 6115 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 6116 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 6117 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 6118 | + m_Children: [] | ||
| 6119 | + m_Father: {fileID: 1010778543} | ||
| 6120 | + m_RootOrder: 0 | ||
| 6121 | + m_AnchorMin: {x: .100000001, y: .810000002} | ||
| 6122 | + m_AnchorMax: {x: .899999976, y: 1} | ||
| 6123 | + m_AnchoredPosition: {x: 0, y: 3.81469727e-06} | ||
| 6124 | + m_SizeDelta: {x: 0, y: -7.62939453e-06} | ||
| 6125 | + m_Pivot: {x: .5, y: .5} | ||
| 6126 | +--- !u!114 &1416567426 | ||
| 6127 | +MonoBehaviour: | ||
| 6128 | + m_ObjectHideFlags: 0 | ||
| 6129 | + m_PrefabParentObject: {fileID: 0} | ||
| 6130 | + m_PrefabInternal: {fileID: 0} | ||
| 6131 | + m_GameObject: {fileID: 1416567424} | ||
| 6132 | + m_Enabled: 1 | ||
| 6133 | + m_EditorHideFlags: 0 | ||
| 6134 | + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
| 6135 | + m_Name: | ||
| 6136 | + m_EditorClassIdentifier: | ||
| 6137 | + m_Material: {fileID: 0} | ||
| 6138 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
| 6139 | + m_RaycastTarget: 1 | ||
| 6140 | + m_OnCullStateChanged: | ||
| 6141 | + m_PersistentCalls: | ||
| 6142 | + m_Calls: [] | ||
| 6143 | + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | ||
| 6144 | + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ||
| 6145 | + m_Sprite: {fileID: 21300000, guid: feeae326a499bfc4eb18998b933a7148, type: 3} | ||
| 6146 | + m_Type: 0 | ||
| 6147 | + m_PreserveAspect: 1 | ||
| 6148 | + m_FillCenter: 1 | ||
| 6149 | + m_FillMethod: 4 | ||
| 6150 | + m_FillAmount: 1 | ||
| 6151 | + m_FillClockwise: 1 | ||
| 6152 | + m_FillOrigin: 0 | ||
| 6153 | +--- !u!222 &1416567427 | ||
| 6154 | +CanvasRenderer: | ||
| 6155 | + m_ObjectHideFlags: 0 | ||
| 6156 | + m_PrefabParentObject: {fileID: 0} | ||
| 6157 | + m_PrefabInternal: {fileID: 0} | ||
| 6158 | + m_GameObject: {fileID: 1416567424} | ||
| 5660 | --- !u!1 &1431596488 | 6159 | --- !u!1 &1431596488 |
| 5661 | GameObject: | 6160 | GameObject: |
| 5662 | m_ObjectHideFlags: 0 | 6161 | m_ObjectHideFlags: 0 |
| @@ -5848,6 +6347,73 @@ CanvasRenderer: | @@ -5848,6 +6347,73 @@ CanvasRenderer: | ||
| 5848 | type: 2} | 6347 | type: 2} |
| 5849 | m_PrefabInternal: {fileID: 0} | 6348 | m_PrefabInternal: {fileID: 0} |
| 5850 | m_GameObject: {fileID: 1438965114} | 6349 | m_GameObject: {fileID: 1438965114} |
| 6350 | +--- !u!1 &1439673893 | ||
| 6351 | +GameObject: | ||
| 6352 | + m_ObjectHideFlags: 0 | ||
| 6353 | + m_PrefabParentObject: {fileID: 0} | ||
| 6354 | + m_PrefabInternal: {fileID: 0} | ||
| 6355 | + serializedVersion: 4 | ||
| 6356 | + m_Component: | ||
| 6357 | + - 224: {fileID: 1439673894} | ||
| 6358 | + - 222: {fileID: 1439673896} | ||
| 6359 | + - 114: {fileID: 1439673895} | ||
| 6360 | + m_Layer: 5 | ||
| 6361 | + m_Name: minis_dir | ||
| 6362 | + m_TagString: Untagged | ||
| 6363 | + m_Icon: {fileID: 0} | ||
| 6364 | + m_NavMeshLayer: 0 | ||
| 6365 | + m_StaticEditorFlags: 0 | ||
| 6366 | + m_IsActive: 1 | ||
| 6367 | +--- !u!224 &1439673894 | ||
| 6368 | +RectTransform: | ||
| 6369 | + m_ObjectHideFlags: 0 | ||
| 6370 | + m_PrefabParentObject: {fileID: 0} | ||
| 6371 | + m_PrefabInternal: {fileID: 0} | ||
| 6372 | + m_GameObject: {fileID: 1439673893} | ||
| 6373 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 6374 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 6375 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 6376 | + m_Children: [] | ||
| 6377 | + m_Father: {fileID: 1010778543} | ||
| 6378 | + m_RootOrder: 2 | ||
| 6379 | + m_AnchorMin: {x: 0, y: .409999996} | ||
| 6380 | + m_AnchorMax: {x: 1, y: .589999974} | ||
| 6381 | + m_AnchoredPosition: {x: 0, y: 0} | ||
| 6382 | + m_SizeDelta: {x: 0, y: 0} | ||
| 6383 | + m_Pivot: {x: .5, y: .5} | ||
| 6384 | +--- !u!114 &1439673895 | ||
| 6385 | +MonoBehaviour: | ||
| 6386 | + m_ObjectHideFlags: 0 | ||
| 6387 | + m_PrefabParentObject: {fileID: 0} | ||
| 6388 | + m_PrefabInternal: {fileID: 0} | ||
| 6389 | + m_GameObject: {fileID: 1439673893} | ||
| 6390 | + m_Enabled: 1 | ||
| 6391 | + m_EditorHideFlags: 0 | ||
| 6392 | + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
| 6393 | + m_Name: | ||
| 6394 | + m_EditorClassIdentifier: | ||
| 6395 | + m_Material: {fileID: 0} | ||
| 6396 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
| 6397 | + m_RaycastTarget: 1 | ||
| 6398 | + m_OnCullStateChanged: | ||
| 6399 | + m_PersistentCalls: | ||
| 6400 | + m_Calls: [] | ||
| 6401 | + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | ||
| 6402 | + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ||
| 6403 | + m_Sprite: {fileID: 21300000, guid: f88d012f31e17a346ad5315d5e895d13, type: 3} | ||
| 6404 | + m_Type: 0 | ||
| 6405 | + m_PreserveAspect: 1 | ||
| 6406 | + m_FillCenter: 1 | ||
| 6407 | + m_FillMethod: 4 | ||
| 6408 | + m_FillAmount: 1 | ||
| 6409 | + m_FillClockwise: 1 | ||
| 6410 | + m_FillOrigin: 0 | ||
| 6411 | +--- !u!222 &1439673896 | ||
| 6412 | +CanvasRenderer: | ||
| 6413 | + m_ObjectHideFlags: 0 | ||
| 6414 | + m_PrefabParentObject: {fileID: 0} | ||
| 6415 | + m_PrefabInternal: {fileID: 0} | ||
| 6416 | + m_GameObject: {fileID: 1439673893} | ||
| 5851 | --- !u!1 &1445490039 | 6417 | --- !u!1 &1445490039 |
| 5852 | GameObject: | 6418 | GameObject: |
| 5853 | m_ObjectHideFlags: 0 | 6419 | m_ObjectHideFlags: 0 |
| @@ -6141,48 +6707,80 @@ CanvasRenderer: | @@ -6141,48 +6707,80 @@ CanvasRenderer: | ||
| 6141 | type: 2} | 6707 | type: 2} |
| 6142 | m_PrefabInternal: {fileID: 0} | 6708 | m_PrefabInternal: {fileID: 0} |
| 6143 | m_GameObject: {fileID: 1476138799} | 6709 | m_GameObject: {fileID: 1476138799} |
| 6144 | ---- !u!1 &1482831675 | 6710 | +--- !u!1 &1486957249 |
| 6145 | GameObject: | 6711 | GameObject: |
| 6146 | m_ObjectHideFlags: 0 | 6712 | m_ObjectHideFlags: 0 |
| 6147 | - m_PrefabParentObject: {fileID: 183530, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} | 6713 | + m_PrefabParentObject: {fileID: 134996, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} |
| 6148 | m_PrefabInternal: {fileID: 0} | 6714 | m_PrefabInternal: {fileID: 0} |
| 6149 | serializedVersion: 4 | 6715 | serializedVersion: 4 |
| 6150 | m_Component: | 6716 | m_Component: |
| 6151 | - - 224: {fileID: 1482831676} | ||
| 6152 | - - 222: {fileID: 1482831678} | ||
| 6153 | - - 114: {fileID: 1482831677} | 6717 | + - 224: {fileID: 1486957250} |
| 6154 | m_Layer: 5 | 6718 | m_Layer: 5 |
| 6155 | - m_Name: i_title | 6719 | + m_Name: Fill Area |
| 6156 | m_TagString: Untagged | 6720 | m_TagString: Untagged |
| 6157 | m_Icon: {fileID: 0} | 6721 | m_Icon: {fileID: 0} |
| 6158 | m_NavMeshLayer: 0 | 6722 | m_NavMeshLayer: 0 |
| 6159 | m_StaticEditorFlags: 0 | 6723 | m_StaticEditorFlags: 0 |
| 6160 | m_IsActive: 1 | 6724 | m_IsActive: 1 |
| 6161 | ---- !u!224 &1482831676 | 6725 | +--- !u!224 &1486957250 |
| 6162 | RectTransform: | 6726 | RectTransform: |
| 6163 | m_ObjectHideFlags: 0 | 6727 | m_ObjectHideFlags: 0 |
| 6164 | - m_PrefabParentObject: {fileID: 22410032, guid: 5ccb0ba277304a14b9bb8d4e34161675, | 6728 | + m_PrefabParentObject: {fileID: 22424074, guid: 5ccb0ba277304a14b9bb8d4e34161675, |
| 6165 | type: 2} | 6729 | type: 2} |
| 6166 | m_PrefabInternal: {fileID: 0} | 6730 | m_PrefabInternal: {fileID: 0} |
| 6167 | - m_GameObject: {fileID: 1482831675} | 6731 | + m_GameObject: {fileID: 1486957249} |
| 6168 | m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | 6732 | m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} |
| 6169 | m_LocalPosition: {x: 0, y: 0, z: 0} | 6733 | m_LocalPosition: {x: 0, y: 0, z: 0} |
| 6170 | m_LocalScale: {x: 1, y: 1, z: 1} | 6734 | m_LocalScale: {x: 1, y: 1, z: 1} |
| 6171 | - m_Children: [] | ||
| 6172 | - m_Father: {fileID: 1935189154} | 6735 | + m_Children: |
| 6736 | + - {fileID: 1438965115} | ||
| 6737 | + m_Father: {fileID: 268582951} | ||
| 6173 | m_RootOrder: 2 | 6738 | m_RootOrder: 2 |
| 6174 | - m_AnchorMin: {x: .25999999, y: .930000007} | ||
| 6175 | - m_AnchorMax: {x: .74000001, y: .970000029} | ||
| 6176 | - m_AnchoredPosition: {x: 0, y: 0} | ||
| 6177 | - m_SizeDelta: {x: 0, y: 0} | 6739 | + m_AnchorMin: {x: 0, y: .439999998} |
| 6740 | + m_AnchorMax: {x: 1, y: .560000002} | ||
| 6741 | + m_AnchoredPosition: {x: 3, y: 0} | ||
| 6742 | + m_SizeDelta: {x: -26, y: 0} | ||
| 6178 | m_Pivot: {x: .5, y: .5} | 6743 | m_Pivot: {x: .5, y: .5} |
| 6179 | ---- !u!114 &1482831677 | ||
| 6180 | -MonoBehaviour: | 6744 | +--- !u!1 &1494144143 |
| 6745 | +GameObject: | ||
| 6181 | m_ObjectHideFlags: 0 | 6746 | m_ObjectHideFlags: 0 |
| 6182 | - m_PrefabParentObject: {fileID: 11403604, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
| 6183 | - type: 2} | 6747 | + m_PrefabParentObject: {fileID: 0} |
| 6748 | + m_PrefabInternal: {fileID: 0} | ||
| 6749 | + serializedVersion: 4 | ||
| 6750 | + m_Component: | ||
| 6751 | + - 224: {fileID: 1494144144} | ||
| 6752 | + - 222: {fileID: 1494144146} | ||
| 6753 | + - 114: {fileID: 1494144145} | ||
| 6754 | + m_Layer: 5 | ||
| 6755 | + m_Name: lab_sis | ||
| 6756 | + m_TagString: Untagged | ||
| 6757 | + m_Icon: {fileID: 0} | ||
| 6758 | + m_NavMeshLayer: 0 | ||
| 6759 | + m_StaticEditorFlags: 0 | ||
| 6760 | + m_IsActive: 1 | ||
| 6761 | +--- !u!224 &1494144144 | ||
| 6762 | +RectTransform: | ||
| 6763 | + m_ObjectHideFlags: 0 | ||
| 6764 | + m_PrefabParentObject: {fileID: 0} | ||
| 6765 | + m_PrefabInternal: {fileID: 0} | ||
| 6766 | + m_GameObject: {fileID: 1494144143} | ||
| 6767 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 6768 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 6769 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 6770 | + m_Children: [] | ||
| 6771 | + m_Father: {fileID: 1010778543} | ||
| 6772 | + m_RootOrder: 4 | ||
| 6773 | + m_AnchorMin: {x: .25999999, y: .00999999978} | ||
| 6774 | + m_AnchorMax: {x: .74000001, y: .189999998} | ||
| 6775 | + m_AnchoredPosition: {x: 0, y: 0} | ||
| 6776 | + m_SizeDelta: {x: 0, y: 0} | ||
| 6777 | + m_Pivot: {x: .5, y: .5} | ||
| 6778 | +--- !u!114 &1494144145 | ||
| 6779 | +MonoBehaviour: | ||
| 6780 | + m_ObjectHideFlags: 0 | ||
| 6781 | + m_PrefabParentObject: {fileID: 0} | ||
| 6184 | m_PrefabInternal: {fileID: 0} | 6782 | m_PrefabInternal: {fileID: 0} |
| 6185 | - m_GameObject: {fileID: 1482831675} | 6783 | + m_GameObject: {fileID: 1494144143} |
| 6186 | m_Enabled: 1 | 6784 | m_Enabled: 1 |
| 6187 | m_EditorHideFlags: 0 | 6785 | m_EditorHideFlags: 0 |
| 6188 | m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | 6786 | m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} |
| @@ -6196,7 +6794,7 @@ MonoBehaviour: | @@ -6196,7 +6794,7 @@ MonoBehaviour: | ||
| 6196 | m_Calls: [] | 6794 | m_Calls: [] |
| 6197 | m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | 6795 | m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, |
| 6198 | Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 6796 | Version=1.0.0.0, Culture=neutral, PublicKeyToken=null |
| 6199 | - m_Sprite: {fileID: 21300000, guid: b022b6e070c6d4f4cb20908c3325e638, type: 3} | 6797 | + m_Sprite: {fileID: 21300000, guid: 78f9e308bccfa854ea0358b3df63d77f, type: 3} |
| 6200 | m_Type: 0 | 6798 | m_Type: 0 |
| 6201 | m_PreserveAspect: 1 | 6799 | m_PreserveAspect: 1 |
| 6202 | m_FillCenter: 1 | 6800 | m_FillCenter: 1 |
| @@ -6204,47 +6802,12 @@ MonoBehaviour: | @@ -6204,47 +6802,12 @@ MonoBehaviour: | ||
| 6204 | m_FillAmount: 1 | 6802 | m_FillAmount: 1 |
| 6205 | m_FillClockwise: 1 | 6803 | m_FillClockwise: 1 |
| 6206 | m_FillOrigin: 0 | 6804 | m_FillOrigin: 0 |
| 6207 | ---- !u!222 &1482831678 | 6805 | +--- !u!222 &1494144146 |
| 6208 | CanvasRenderer: | 6806 | CanvasRenderer: |
| 6209 | m_ObjectHideFlags: 0 | 6807 | m_ObjectHideFlags: 0 |
| 6210 | - m_PrefabParentObject: {fileID: 22290882, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
| 6211 | - type: 2} | ||
| 6212 | - m_PrefabInternal: {fileID: 0} | ||
| 6213 | - m_GameObject: {fileID: 1482831675} | ||
| 6214 | ---- !u!1 &1486957249 | ||
| 6215 | -GameObject: | ||
| 6216 | - m_ObjectHideFlags: 0 | ||
| 6217 | - m_PrefabParentObject: {fileID: 134996, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} | ||
| 6218 | - m_PrefabInternal: {fileID: 0} | ||
| 6219 | - serializedVersion: 4 | ||
| 6220 | - m_Component: | ||
| 6221 | - - 224: {fileID: 1486957250} | ||
| 6222 | - m_Layer: 5 | ||
| 6223 | - m_Name: Fill Area | ||
| 6224 | - m_TagString: Untagged | ||
| 6225 | - m_Icon: {fileID: 0} | ||
| 6226 | - m_NavMeshLayer: 0 | ||
| 6227 | - m_StaticEditorFlags: 0 | ||
| 6228 | - m_IsActive: 1 | ||
| 6229 | ---- !u!224 &1486957250 | ||
| 6230 | -RectTransform: | ||
| 6231 | - m_ObjectHideFlags: 0 | ||
| 6232 | - m_PrefabParentObject: {fileID: 22424074, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
| 6233 | - type: 2} | 6808 | + m_PrefabParentObject: {fileID: 0} |
| 6234 | m_PrefabInternal: {fileID: 0} | 6809 | m_PrefabInternal: {fileID: 0} |
| 6235 | - m_GameObject: {fileID: 1486957249} | ||
| 6236 | - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 6237 | - m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 6238 | - m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 6239 | - m_Children: | ||
| 6240 | - - {fileID: 1438965115} | ||
| 6241 | - m_Father: {fileID: 268582951} | ||
| 6242 | - m_RootOrder: 2 | ||
| 6243 | - m_AnchorMin: {x: 0, y: .439999998} | ||
| 6244 | - m_AnchorMax: {x: 1, y: .560000002} | ||
| 6245 | - m_AnchoredPosition: {x: 3, y: 0} | ||
| 6246 | - m_SizeDelta: {x: -26, y: 0} | ||
| 6247 | - m_Pivot: {x: .5, y: .5} | 6810 | + m_GameObject: {fileID: 1494144143} |
| 6248 | --- !u!1 &1496206516 | 6811 | --- !u!1 &1496206516 |
| 6249 | GameObject: | 6812 | GameObject: |
| 6250 | m_ObjectHideFlags: 0 | 6813 | m_ObjectHideFlags: 0 |
| @@ -6673,6 +7236,110 @@ MonoBehaviour: | @@ -6673,6 +7236,110 @@ MonoBehaviour: | ||
| 6673 | ctrlBochecha_L: {fileID: 0} | 7236 | ctrlBochecha_L: {fileID: 0} |
| 6674 | ctrlBochecha_R: {fileID: 0} | 7237 | ctrlBochecha_R: {fileID: 0} |
| 6675 | BnMandibula: {fileID: 0} | 7238 | BnMandibula: {fileID: 0} |
| 7239 | +--- !u!1 &1623694772 | ||
| 7240 | +GameObject: | ||
| 7241 | + m_ObjectHideFlags: 0 | ||
| 7242 | + m_PrefabParentObject: {fileID: 0} | ||
| 7243 | + m_PrefabInternal: {fileID: 0} | ||
| 7244 | + serializedVersion: 4 | ||
| 7245 | + m_Component: | ||
| 7246 | + - 224: {fileID: 1623694773} | ||
| 7247 | + - 222: {fileID: 1623694775} | ||
| 7248 | + - 114: {fileID: 1623694774} | ||
| 7249 | + m_Layer: 5 | ||
| 7250 | + m_Name: camara | ||
| 7251 | + m_TagString: Untagged | ||
| 7252 | + m_Icon: {fileID: 0} | ||
| 7253 | + m_NavMeshLayer: 0 | ||
| 7254 | + m_StaticEditorFlags: 0 | ||
| 7255 | + m_IsActive: 1 | ||
| 7256 | +--- !u!224 &1623694773 | ||
| 7257 | +RectTransform: | ||
| 7258 | + m_ObjectHideFlags: 0 | ||
| 7259 | + m_PrefabParentObject: {fileID: 0} | ||
| 7260 | + m_PrefabInternal: {fileID: 0} | ||
| 7261 | + m_GameObject: {fileID: 1623694772} | ||
| 7262 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 7263 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 7264 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 7265 | + m_Children: [] | ||
| 7266 | + m_Father: {fileID: 1010778543} | ||
| 7267 | + m_RootOrder: 3 | ||
| 7268 | + m_AnchorMin: {x: .300000012, y: .209999993} | ||
| 7269 | + m_AnchorMax: {x: .699999988, y: .389999986} | ||
| 7270 | + m_AnchoredPosition: {x: 0, y: 0} | ||
| 7271 | + m_SizeDelta: {x: 0, y: 0} | ||
| 7272 | + m_Pivot: {x: .5, y: .5} | ||
| 7273 | +--- !u!114 &1623694774 | ||
| 7274 | +MonoBehaviour: | ||
| 7275 | + m_ObjectHideFlags: 0 | ||
| 7276 | + m_PrefabParentObject: {fileID: 0} | ||
| 7277 | + m_PrefabInternal: {fileID: 0} | ||
| 7278 | + m_GameObject: {fileID: 1623694772} | ||
| 7279 | + m_Enabled: 1 | ||
| 7280 | + m_EditorHideFlags: 0 | ||
| 7281 | + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
| 7282 | + m_Name: | ||
| 7283 | + m_EditorClassIdentifier: | ||
| 7284 | + m_Material: {fileID: 0} | ||
| 7285 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
| 7286 | + m_RaycastTarget: 1 | ||
| 7287 | + m_OnCullStateChanged: | ||
| 7288 | + m_PersistentCalls: | ||
| 7289 | + m_Calls: [] | ||
| 7290 | + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | ||
| 7291 | + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ||
| 7292 | + m_Sprite: {fileID: 21300000, guid: 0d877e85117f65d4586d74db7d9ef266, type: 3} | ||
| 7293 | + m_Type: 0 | ||
| 7294 | + m_PreserveAspect: 1 | ||
| 7295 | + m_FillCenter: 1 | ||
| 7296 | + m_FillMethod: 4 | ||
| 7297 | + m_FillAmount: 1 | ||
| 7298 | + m_FillClockwise: 1 | ||
| 7299 | + m_FillOrigin: 0 | ||
| 7300 | +--- !u!222 &1623694775 | ||
| 7301 | +CanvasRenderer: | ||
| 7302 | + m_ObjectHideFlags: 0 | ||
| 7303 | + m_PrefabParentObject: {fileID: 0} | ||
| 7304 | + m_PrefabInternal: {fileID: 0} | ||
| 7305 | + m_GameObject: {fileID: 1623694772} | ||
| 7306 | +--- !u!1 &1623802272 | ||
| 7307 | +GameObject: | ||
| 7308 | + m_ObjectHideFlags: 0 | ||
| 7309 | + m_PrefabParentObject: {fileID: 0} | ||
| 7310 | + m_PrefabInternal: {fileID: 0} | ||
| 7311 | + serializedVersion: 4 | ||
| 7312 | + m_Component: | ||
| 7313 | + - 224: {fileID: 1623802273} | ||
| 7314 | + m_Layer: 5 | ||
| 7315 | + m_Name: right | ||
| 7316 | + m_TagString: Untagged | ||
| 7317 | + m_Icon: {fileID: 0} | ||
| 7318 | + m_NavMeshLayer: 0 | ||
| 7319 | + m_StaticEditorFlags: 0 | ||
| 7320 | + m_IsActive: 1 | ||
| 7321 | +--- !u!224 &1623802273 | ||
| 7322 | +RectTransform: | ||
| 7323 | + m_ObjectHideFlags: 0 | ||
| 7324 | + m_PrefabParentObject: {fileID: 0} | ||
| 7325 | + m_PrefabInternal: {fileID: 0} | ||
| 7326 | + m_GameObject: {fileID: 1623802272} | ||
| 7327 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 7328 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 7329 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 7330 | + m_Children: | ||
| 7331 | + - {fileID: 1922820117} | ||
| 7332 | + - {fileID: 1330400155} | ||
| 7333 | + - {fileID: 1878890615} | ||
| 7334 | + - {fileID: 2034973519} | ||
| 7335 | + - {fileID: 2048170209} | ||
| 7336 | + m_Father: {fileID: 1221700622} | ||
| 7337 | + m_RootOrder: 1 | ||
| 7338 | + m_AnchorMin: {x: .529999971, y: 0} | ||
| 7339 | + m_AnchorMax: {x: .939999998, y: 1} | ||
| 7340 | + m_AnchoredPosition: {x: 0, y: 0} | ||
| 7341 | + m_SizeDelta: {x: 0, y: 0} | ||
| 7342 | + m_Pivot: {x: .5, y: .5} | ||
| 6676 | --- !u!1 &1632068376 | 7343 | --- !u!1 &1632068376 |
| 6677 | GameObject: | 7344 | GameObject: |
| 6678 | m_ObjectHideFlags: 0 | 7345 | m_ObjectHideFlags: 0 |
| @@ -7330,6 +7997,73 @@ RectTransform: | @@ -7330,6 +7997,73 @@ RectTransform: | ||
| 7330 | m_AnchoredPosition: {x: 0, y: 0} | 7997 | m_AnchoredPosition: {x: 0, y: 0} |
| 7331 | m_SizeDelta: {x: 0, y: 0} | 7998 | m_SizeDelta: {x: 0, y: 0} |
| 7332 | m_Pivot: {x: .5, y: .5} | 7999 | m_Pivot: {x: .5, y: .5} |
| 8000 | +--- !u!1 &1878890614 | ||
| 8001 | +GameObject: | ||
| 8002 | + m_ObjectHideFlags: 0 | ||
| 8003 | + m_PrefabParentObject: {fileID: 0} | ||
| 8004 | + m_PrefabInternal: {fileID: 0} | ||
| 8005 | + serializedVersion: 4 | ||
| 8006 | + m_Component: | ||
| 8007 | + - 224: {fileID: 1878890615} | ||
| 8008 | + - 222: {fileID: 1878890617} | ||
| 8009 | + - 114: {fileID: 1878890616} | ||
| 8010 | + m_Layer: 5 | ||
| 8011 | + m_Name: gov | ||
| 8012 | + m_TagString: Untagged | ||
| 8013 | + m_Icon: {fileID: 0} | ||
| 8014 | + m_NavMeshLayer: 0 | ||
| 8015 | + m_StaticEditorFlags: 0 | ||
| 8016 | + m_IsActive: 1 | ||
| 8017 | +--- !u!224 &1878890615 | ||
| 8018 | +RectTransform: | ||
| 8019 | + m_ObjectHideFlags: 0 | ||
| 8020 | + m_PrefabParentObject: {fileID: 0} | ||
| 8021 | + m_PrefabInternal: {fileID: 0} | ||
| 8022 | + m_GameObject: {fileID: 1878890614} | ||
| 8023 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 8024 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 8025 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 8026 | + m_Children: [] | ||
| 8027 | + m_Father: {fileID: 1623802273} | ||
| 8028 | + m_RootOrder: 2 | ||
| 8029 | + m_AnchorMin: {x: 0, y: .409999996} | ||
| 8030 | + m_AnchorMax: {x: 1, y: .589999974} | ||
| 8031 | + m_AnchoredPosition: {x: 0, y: 0} | ||
| 8032 | + m_SizeDelta: {x: 0, y: 0} | ||
| 8033 | + m_Pivot: {x: .5, y: .5} | ||
| 8034 | +--- !u!114 &1878890616 | ||
| 8035 | +MonoBehaviour: | ||
| 8036 | + m_ObjectHideFlags: 0 | ||
| 8037 | + m_PrefabParentObject: {fileID: 0} | ||
| 8038 | + m_PrefabInternal: {fileID: 0} | ||
| 8039 | + m_GameObject: {fileID: 1878890614} | ||
| 8040 | + m_Enabled: 1 | ||
| 8041 | + m_EditorHideFlags: 0 | ||
| 8042 | + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
| 8043 | + m_Name: | ||
| 8044 | + m_EditorClassIdentifier: | ||
| 8045 | + m_Material: {fileID: 0} | ||
| 8046 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
| 8047 | + m_RaycastTarget: 1 | ||
| 8048 | + m_OnCullStateChanged: | ||
| 8049 | + m_PersistentCalls: | ||
| 8050 | + m_Calls: [] | ||
| 8051 | + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | ||
| 8052 | + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ||
| 8053 | + m_Sprite: {fileID: 21300000, guid: 2fe7271373ab84e42a7712fc31ff017d, type: 3} | ||
| 8054 | + m_Type: 0 | ||
| 8055 | + m_PreserveAspect: 1 | ||
| 8056 | + m_FillCenter: 1 | ||
| 8057 | + m_FillMethod: 4 | ||
| 8058 | + m_FillAmount: 1 | ||
| 8059 | + m_FillClockwise: 1 | ||
| 8060 | + m_FillOrigin: 0 | ||
| 8061 | +--- !u!222 &1878890617 | ||
| 8062 | +CanvasRenderer: | ||
| 8063 | + m_ObjectHideFlags: 0 | ||
| 8064 | + m_PrefabParentObject: {fileID: 0} | ||
| 8065 | + m_PrefabInternal: {fileID: 0} | ||
| 8066 | + m_GameObject: {fileID: 1878890614} | ||
| 7333 | --- !u!1 &1920630438 | 8067 | --- !u!1 &1920630438 |
| 7334 | GameObject: | 8068 | GameObject: |
| 7335 | m_ObjectHideFlags: 0 | 8069 | m_ObjectHideFlags: 0 |
| @@ -7444,6 +8178,73 @@ Transform: | @@ -7444,6 +8178,73 @@ Transform: | ||
| 7444 | m_Children: [] | 8178 | m_Children: [] |
| 7445 | m_Father: {fileID: 0} | 8179 | m_Father: {fileID: 0} |
| 7446 | m_RootOrder: 2 | 8180 | m_RootOrder: 2 |
| 8181 | +--- !u!1 &1922820116 | ||
| 8182 | +GameObject: | ||
| 8183 | + m_ObjectHideFlags: 0 | ||
| 8184 | + m_PrefabParentObject: {fileID: 0} | ||
| 8185 | + m_PrefabInternal: {fileID: 0} | ||
| 8186 | + serializedVersion: 4 | ||
| 8187 | + m_Component: | ||
| 8188 | + - 224: {fileID: 1922820117} | ||
| 8189 | + - 222: {fileID: 1922820119} | ||
| 8190 | + - 114: {fileID: 1922820118} | ||
| 8191 | + m_Layer: 5 | ||
| 8192 | + m_Name: ufpb | ||
| 8193 | + m_TagString: Untagged | ||
| 8194 | + m_Icon: {fileID: 0} | ||
| 8195 | + m_NavMeshLayer: 0 | ||
| 8196 | + m_StaticEditorFlags: 0 | ||
| 8197 | + m_IsActive: 1 | ||
| 8198 | +--- !u!224 &1922820117 | ||
| 8199 | +RectTransform: | ||
| 8200 | + m_ObjectHideFlags: 0 | ||
| 8201 | + m_PrefabParentObject: {fileID: 0} | ||
| 8202 | + m_PrefabInternal: {fileID: 0} | ||
| 8203 | + m_GameObject: {fileID: 1922820116} | ||
| 8204 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 8205 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 8206 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 8207 | + m_Children: [] | ||
| 8208 | + m_Father: {fileID: 1623802273} | ||
| 8209 | + m_RootOrder: 0 | ||
| 8210 | + m_AnchorMin: {x: 0, y: .810000002} | ||
| 8211 | + m_AnchorMax: {x: 1, y: 1} | ||
| 8212 | + m_AnchoredPosition: {x: 0, y: 0} | ||
| 8213 | + m_SizeDelta: {x: 0, y: 0} | ||
| 8214 | + m_Pivot: {x: .5, y: .5} | ||
| 8215 | +--- !u!114 &1922820118 | ||
| 8216 | +MonoBehaviour: | ||
| 8217 | + m_ObjectHideFlags: 0 | ||
| 8218 | + m_PrefabParentObject: {fileID: 0} | ||
| 8219 | + m_PrefabInternal: {fileID: 0} | ||
| 8220 | + m_GameObject: {fileID: 1922820116} | ||
| 8221 | + m_Enabled: 1 | ||
| 8222 | + m_EditorHideFlags: 0 | ||
| 8223 | + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
| 8224 | + m_Name: | ||
| 8225 | + m_EditorClassIdentifier: | ||
| 8226 | + m_Material: {fileID: 0} | ||
| 8227 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
| 8228 | + m_RaycastTarget: 1 | ||
| 8229 | + m_OnCullStateChanged: | ||
| 8230 | + m_PersistentCalls: | ||
| 8231 | + m_Calls: [] | ||
| 8232 | + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | ||
| 8233 | + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ||
| 8234 | + m_Sprite: {fileID: 21300000, guid: 638d58b65a3bfcf45955f6c3a1fbb4f9, type: 3} | ||
| 8235 | + m_Type: 0 | ||
| 8236 | + m_PreserveAspect: 1 | ||
| 8237 | + m_FillCenter: 1 | ||
| 8238 | + m_FillMethod: 4 | ||
| 8239 | + m_FillAmount: 1 | ||
| 8240 | + m_FillClockwise: 1 | ||
| 8241 | + m_FillOrigin: 0 | ||
| 8242 | +--- !u!222 &1922820119 | ||
| 8243 | +CanvasRenderer: | ||
| 8244 | + m_ObjectHideFlags: 0 | ||
| 8245 | + m_PrefabParentObject: {fileID: 0} | ||
| 8246 | + m_PrefabInternal: {fileID: 0} | ||
| 8247 | + m_GameObject: {fileID: 1922820116} | ||
| 7447 | --- !u!1 &1923959836 | 8248 | --- !u!1 &1923959836 |
| 7448 | GameObject: | 8249 | GameObject: |
| 7449 | m_ObjectHideFlags: 0 | 8250 | m_ObjectHideFlags: 0 |
| @@ -7613,7 +8414,7 @@ RectTransform: | @@ -7613,7 +8414,7 @@ RectTransform: | ||
| 7613 | m_Children: | 8414 | m_Children: |
| 7614 | - {fileID: 1382683269} | 8415 | - {fileID: 1382683269} |
| 7615 | - {fileID: 1053934345} | 8416 | - {fileID: 1053934345} |
| 7616 | - - {fileID: 1482831676} | 8417 | + - {fileID: 2054908656} |
| 7617 | - {fileID: 1999953885} | 8418 | - {fileID: 1999953885} |
| 7618 | - {fileID: 2002966284} | 8419 | - {fileID: 2002966284} |
| 7619 | - {fileID: 1175405161} | 8420 | - {fileID: 1175405161} |
| @@ -8127,6 +8928,195 @@ CanvasRenderer: | @@ -8127,6 +8928,195 @@ CanvasRenderer: | ||
| 8127 | type: 2} | 8928 | type: 2} |
| 8128 | m_PrefabInternal: {fileID: 0} | 8929 | m_PrefabInternal: {fileID: 0} |
| 8129 | m_GameObject: {fileID: 2023188708} | 8930 | m_GameObject: {fileID: 2023188708} |
| 8931 | +--- !u!1 &2034973518 | ||
| 8932 | +GameObject: | ||
| 8933 | + m_ObjectHideFlags: 0 | ||
| 8934 | + m_PrefabParentObject: {fileID: 0} | ||
| 8935 | + m_PrefabInternal: {fileID: 0} | ||
| 8936 | + serializedVersion: 4 | ||
| 8937 | + m_Component: | ||
| 8938 | + - 224: {fileID: 2034973519} | ||
| 8939 | + - 222: {fileID: 2034973521} | ||
| 8940 | + - 114: {fileID: 2034973520} | ||
| 8941 | + m_Layer: 5 | ||
| 8942 | + m_Name: rnp | ||
| 8943 | + m_TagString: Untagged | ||
| 8944 | + m_Icon: {fileID: 0} | ||
| 8945 | + m_NavMeshLayer: 0 | ||
| 8946 | + m_StaticEditorFlags: 0 | ||
| 8947 | + m_IsActive: 1 | ||
| 8948 | +--- !u!224 &2034973519 | ||
| 8949 | +RectTransform: | ||
| 8950 | + m_ObjectHideFlags: 0 | ||
| 8951 | + m_PrefabParentObject: {fileID: 0} | ||
| 8952 | + m_PrefabInternal: {fileID: 0} | ||
| 8953 | + m_GameObject: {fileID: 2034973518} | ||
| 8954 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 8955 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 8956 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 8957 | + m_Children: [] | ||
| 8958 | + m_Father: {fileID: 1623802273} | ||
| 8959 | + m_RootOrder: 3 | ||
| 8960 | + m_AnchorMin: {x: .150000006, y: .209999993} | ||
| 8961 | + m_AnchorMax: {x: .850000024, y: .389999986} | ||
| 8962 | + m_AnchoredPosition: {x: 0, y: 0} | ||
| 8963 | + m_SizeDelta: {x: 0, y: 0} | ||
| 8964 | + m_Pivot: {x: .5, y: .5} | ||
| 8965 | +--- !u!114 &2034973520 | ||
| 8966 | +MonoBehaviour: | ||
| 8967 | + m_ObjectHideFlags: 0 | ||
| 8968 | + m_PrefabParentObject: {fileID: 0} | ||
| 8969 | + m_PrefabInternal: {fileID: 0} | ||
| 8970 | + m_GameObject: {fileID: 2034973518} | ||
| 8971 | + m_Enabled: 1 | ||
| 8972 | + m_EditorHideFlags: 0 | ||
| 8973 | + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
| 8974 | + m_Name: | ||
| 8975 | + m_EditorClassIdentifier: | ||
| 8976 | + m_Material: {fileID: 0} | ||
| 8977 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
| 8978 | + m_RaycastTarget: 1 | ||
| 8979 | + m_OnCullStateChanged: | ||
| 8980 | + m_PersistentCalls: | ||
| 8981 | + m_Calls: [] | ||
| 8982 | + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | ||
| 8983 | + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ||
| 8984 | + m_Sprite: {fileID: 21300000, guid: 6660d37921c0cb046af9d4717fc72237, type: 3} | ||
| 8985 | + m_Type: 0 | ||
| 8986 | + m_PreserveAspect: 1 | ||
| 8987 | + m_FillCenter: 1 | ||
| 8988 | + m_FillMethod: 4 | ||
| 8989 | + m_FillAmount: 1 | ||
| 8990 | + m_FillClockwise: 1 | ||
| 8991 | + m_FillOrigin: 0 | ||
| 8992 | +--- !u!222 &2034973521 | ||
| 8993 | +CanvasRenderer: | ||
| 8994 | + m_ObjectHideFlags: 0 | ||
| 8995 | + m_PrefabParentObject: {fileID: 0} | ||
| 8996 | + m_PrefabInternal: {fileID: 0} | ||
| 8997 | + m_GameObject: {fileID: 2034973518} | ||
| 8998 | +--- !u!1 &2044204294 | ||
| 8999 | +GameObject: | ||
| 9000 | + m_ObjectHideFlags: 0 | ||
| 9001 | + m_PrefabParentObject: {fileID: 0} | ||
| 9002 | + m_PrefabInternal: {fileID: 0} | ||
| 9003 | + serializedVersion: 4 | ||
| 9004 | + m_Component: | ||
| 9005 | + - 224: {fileID: 2044204295} | ||
| 9006 | + - 222: {fileID: 2044204297} | ||
| 9007 | + - 114: {fileID: 2044204296} | ||
| 9008 | + - 114: {fileID: 2044204298} | ||
| 9009 | + m_Layer: 5 | ||
| 9010 | + m_Name: screen_makers | ||
| 9011 | + m_TagString: Untagged | ||
| 9012 | + m_Icon: {fileID: 0} | ||
| 9013 | + m_NavMeshLayer: 0 | ||
| 9014 | + m_StaticEditorFlags: 0 | ||
| 9015 | + m_IsActive: 0 | ||
| 9016 | +--- !u!224 &2044204295 | ||
| 9017 | +RectTransform: | ||
| 9018 | + m_ObjectHideFlags: 0 | ||
| 9019 | + m_PrefabParentObject: {fileID: 0} | ||
| 9020 | + m_PrefabInternal: {fileID: 0} | ||
| 9021 | + m_GameObject: {fileID: 2044204294} | ||
| 9022 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 9023 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 9024 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 9025 | + m_Children: | ||
| 9026 | + - {fileID: 1412335970} | ||
| 9027 | + - {fileID: 815279418} | ||
| 9028 | + - {fileID: 1221700622} | ||
| 9029 | + m_Father: {fileID: 1414104007} | ||
| 9030 | + m_RootOrder: 9 | ||
| 9031 | + m_AnchorMin: {x: 0, y: 0} | ||
| 9032 | + m_AnchorMax: {x: 1, y: 1} | ||
| 9033 | + m_AnchoredPosition: {x: 0, y: 0} | ||
| 9034 | + m_SizeDelta: {x: 0, y: 0} | ||
| 9035 | + m_Pivot: {x: .5, y: .5} | ||
| 9036 | +--- !u!114 &2044204296 | ||
| 9037 | +MonoBehaviour: | ||
| 9038 | + m_ObjectHideFlags: 0 | ||
| 9039 | + m_PrefabParentObject: {fileID: 0} | ||
| 9040 | + m_PrefabInternal: {fileID: 0} | ||
| 9041 | + m_GameObject: {fileID: 2044204294} | ||
| 9042 | + m_Enabled: 1 | ||
| 9043 | + m_EditorHideFlags: 0 | ||
| 9044 | + m_Script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
| 9045 | + m_Name: | ||
| 9046 | + m_EditorClassIdentifier: | ||
| 9047 | + m_Material: {fileID: 0} | ||
| 9048 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
| 9049 | + m_RaycastTarget: 1 | ||
| 9050 | + m_OnCullStateChanged: | ||
| 9051 | + m_PersistentCalls: | ||
| 9052 | + m_Calls: [] | ||
| 9053 | + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | ||
| 9054 | + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ||
| 9055 | + m_Texture: {fileID: 0} | ||
| 9056 | + m_UVRect: | ||
| 9057 | + serializedVersion: 2 | ||
| 9058 | + x: 0 | ||
| 9059 | + y: 0 | ||
| 9060 | + width: 1 | ||
| 9061 | + height: 1 | ||
| 9062 | +--- !u!222 &2044204297 | ||
| 9063 | +CanvasRenderer: | ||
| 9064 | + m_ObjectHideFlags: 0 | ||
| 9065 | + m_PrefabParentObject: {fileID: 0} | ||
| 9066 | + m_PrefabInternal: {fileID: 0} | ||
| 9067 | + m_GameObject: {fileID: 2044204294} | ||
| 9068 | +--- !u!114 &2044204298 | ||
| 9069 | +MonoBehaviour: | ||
| 9070 | + m_ObjectHideFlags: 0 | ||
| 9071 | + m_PrefabParentObject: {fileID: 0} | ||
| 9072 | + m_PrefabInternal: {fileID: 0} | ||
| 9073 | + m_GameObject: {fileID: 2044204294} | ||
| 9074 | + m_Enabled: 1 | ||
| 9075 | + m_EditorHideFlags: 0 | ||
| 9076 | + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
| 9077 | + m_Name: | ||
| 9078 | + m_EditorClassIdentifier: | ||
| 9079 | + m_Navigation: | ||
| 9080 | + m_Mode: 3 | ||
| 9081 | + m_SelectOnUp: {fileID: 0} | ||
| 9082 | + m_SelectOnDown: {fileID: 0} | ||
| 9083 | + m_SelectOnLeft: {fileID: 0} | ||
| 9084 | + m_SelectOnRight: {fileID: 0} | ||
| 9085 | + m_Transition: 1 | ||
| 9086 | + m_Colors: | ||
| 9087 | + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} | ||
| 9088 | + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} | ||
| 9089 | + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} | ||
| 9090 | + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} | ||
| 9091 | + m_ColorMultiplier: 1 | ||
| 9092 | + m_FadeDuration: .100000001 | ||
| 9093 | + m_SpriteState: | ||
| 9094 | + m_HighlightedSprite: {fileID: 0} | ||
| 9095 | + m_PressedSprite: {fileID: 0} | ||
| 9096 | + m_DisabledSprite: {fileID: 0} | ||
| 9097 | + m_AnimationTriggers: | ||
| 9098 | + m_NormalTrigger: Normal | ||
| 9099 | + m_HighlightedTrigger: Highlighted | ||
| 9100 | + m_PressedTrigger: Pressed | ||
| 9101 | + m_DisabledTrigger: Disabled | ||
| 9102 | + m_Interactable: 1 | ||
| 9103 | + m_TargetGraphic: {fileID: 2044204296} | ||
| 9104 | + m_OnClick: | ||
| 9105 | + m_PersistentCalls: | ||
| 9106 | + m_Calls: | ||
| 9107 | + - m_Target: {fileID: 2131993092} | ||
| 9108 | + m_MethodName: hideScreen | ||
| 9109 | + m_Mode: 1 | ||
| 9110 | + m_Arguments: | ||
| 9111 | + m_ObjectArgument: {fileID: 0} | ||
| 9112 | + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine | ||
| 9113 | + m_IntArgument: 0 | ||
| 9114 | + m_FloatArgument: 0 | ||
| 9115 | + m_StringArgument: | ||
| 9116 | + m_BoolArgument: 0 | ||
| 9117 | + m_CallState: 2 | ||
| 9118 | + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, | ||
| 9119 | + Culture=neutral, PublicKeyToken=null | ||
| 8130 | --- !u!1 &2047431285 | 9120 | --- !u!1 &2047431285 |
| 8131 | GameObject: | 9121 | GameObject: |
| 8132 | m_ObjectHideFlags: 0 | 9122 | m_ObjectHideFlags: 0 |
| @@ -8213,6 +9203,143 @@ CanvasRenderer: | @@ -8213,6 +9203,143 @@ CanvasRenderer: | ||
| 8213 | type: 2} | 9203 | type: 2} |
| 8214 | m_PrefabInternal: {fileID: 0} | 9204 | m_PrefabInternal: {fileID: 0} |
| 8215 | m_GameObject: {fileID: 2047431285} | 9205 | m_GameObject: {fileID: 2047431285} |
| 9206 | +--- !u!1 &2048170208 | ||
| 9207 | +GameObject: | ||
| 9208 | + m_ObjectHideFlags: 0 | ||
| 9209 | + m_PrefabParentObject: {fileID: 0} | ||
| 9210 | + m_PrefabInternal: {fileID: 0} | ||
| 9211 | + serializedVersion: 4 | ||
| 9212 | + m_Component: | ||
| 9213 | + - 224: {fileID: 2048170209} | ||
| 9214 | + - 222: {fileID: 2048170211} | ||
| 9215 | + - 114: {fileID: 2048170210} | ||
| 9216 | + m_Layer: 5 | ||
| 9217 | + m_Name: ufcg | ||
| 9218 | + m_TagString: Untagged | ||
| 9219 | + m_Icon: {fileID: 0} | ||
| 9220 | + m_NavMeshLayer: 0 | ||
| 9221 | + m_StaticEditorFlags: 0 | ||
| 9222 | + m_IsActive: 1 | ||
| 9223 | +--- !u!224 &2048170209 | ||
| 9224 | +RectTransform: | ||
| 9225 | + m_ObjectHideFlags: 0 | ||
| 9226 | + m_PrefabParentObject: {fileID: 0} | ||
| 9227 | + m_PrefabInternal: {fileID: 0} | ||
| 9228 | + m_GameObject: {fileID: 2048170208} | ||
| 9229 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 9230 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 9231 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 9232 | + m_Children: [] | ||
| 9233 | + m_Father: {fileID: 1623802273} | ||
| 9234 | + m_RootOrder: 4 | ||
| 9235 | + m_AnchorMin: {x: .25999999, y: .00999999978} | ||
| 9236 | + m_AnchorMax: {x: .74000001, y: .189999998} | ||
| 9237 | + m_AnchoredPosition: {x: 0, y: 0} | ||
| 9238 | + m_SizeDelta: {x: 0, y: 0} | ||
| 9239 | + m_Pivot: {x: .5, y: .5} | ||
| 9240 | +--- !u!114 &2048170210 | ||
| 9241 | +MonoBehaviour: | ||
| 9242 | + m_ObjectHideFlags: 0 | ||
| 9243 | + m_PrefabParentObject: {fileID: 0} | ||
| 9244 | + m_PrefabInternal: {fileID: 0} | ||
| 9245 | + m_GameObject: {fileID: 2048170208} | ||
| 9246 | + m_Enabled: 1 | ||
| 9247 | + m_EditorHideFlags: 0 | ||
| 9248 | + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
| 9249 | + m_Name: | ||
| 9250 | + m_EditorClassIdentifier: | ||
| 9251 | + m_Material: {fileID: 0} | ||
| 9252 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
| 9253 | + m_RaycastTarget: 1 | ||
| 9254 | + m_OnCullStateChanged: | ||
| 9255 | + m_PersistentCalls: | ||
| 9256 | + m_Calls: [] | ||
| 9257 | + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | ||
| 9258 | + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ||
| 9259 | + m_Sprite: {fileID: 21300000, guid: c8d7dd1fea55820428d8a9afdfff7bea, type: 3} | ||
| 9260 | + m_Type: 0 | ||
| 9261 | + m_PreserveAspect: 1 | ||
| 9262 | + m_FillCenter: 1 | ||
| 9263 | + m_FillMethod: 4 | ||
| 9264 | + m_FillAmount: 1 | ||
| 9265 | + m_FillClockwise: 1 | ||
| 9266 | + m_FillOrigin: 0 | ||
| 9267 | +--- !u!222 &2048170211 | ||
| 9268 | +CanvasRenderer: | ||
| 9269 | + m_ObjectHideFlags: 0 | ||
| 9270 | + m_PrefabParentObject: {fileID: 0} | ||
| 9271 | + m_PrefabInternal: {fileID: 0} | ||
| 9272 | + m_GameObject: {fileID: 2048170208} | ||
| 9273 | +--- !u!1 &2054908655 | ||
| 9274 | +GameObject: | ||
| 9275 | + m_ObjectHideFlags: 0 | ||
| 9276 | + m_PrefabParentObject: {fileID: 110030, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} | ||
| 9277 | + m_PrefabInternal: {fileID: 0} | ||
| 9278 | + serializedVersion: 4 | ||
| 9279 | + m_Component: | ||
| 9280 | + - 224: {fileID: 2054908656} | ||
| 9281 | + - 222: {fileID: 2054908658} | ||
| 9282 | + - 114: {fileID: 2054908657} | ||
| 9283 | + m_Layer: 5 | ||
| 9284 | + m_Name: i_title | ||
| 9285 | + m_TagString: Untagged | ||
| 9286 | + m_Icon: {fileID: 0} | ||
| 9287 | + m_NavMeshLayer: 0 | ||
| 9288 | + m_StaticEditorFlags: 0 | ||
| 9289 | + m_IsActive: 1 | ||
| 9290 | +--- !u!224 &2054908656 | ||
| 9291 | +RectTransform: | ||
| 9292 | + m_ObjectHideFlags: 0 | ||
| 9293 | + m_PrefabParentObject: {fileID: 22412448, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
| 9294 | + type: 2} | ||
| 9295 | + m_PrefabInternal: {fileID: 0} | ||
| 9296 | + m_GameObject: {fileID: 2054908655} | ||
| 9297 | + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| 9298 | + m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| 9299 | + m_LocalScale: {x: 1, y: 1, z: 1} | ||
| 9300 | + m_Children: [] | ||
| 9301 | + m_Father: {fileID: 1935189154} | ||
| 9302 | + m_RootOrder: 2 | ||
| 9303 | + m_AnchorMin: {x: .200000003, y: .93599999} | ||
| 9304 | + m_AnchorMax: {x: .800000012, y: .967999995} | ||
| 9305 | + m_AnchoredPosition: {x: 0, y: 0} | ||
| 9306 | + m_SizeDelta: {x: 0, y: 0} | ||
| 9307 | + m_Pivot: {x: .5, y: .5} | ||
| 9308 | +--- !u!114 &2054908657 | ||
| 9309 | +MonoBehaviour: | ||
| 9310 | + m_ObjectHideFlags: 0 | ||
| 9311 | + m_PrefabParentObject: {fileID: 11404830, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
| 9312 | + type: 2} | ||
| 9313 | + m_PrefabInternal: {fileID: 0} | ||
| 9314 | + m_GameObject: {fileID: 2054908655} | ||
| 9315 | + m_Enabled: 1 | ||
| 9316 | + m_EditorHideFlags: 0 | ||
| 9317 | + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} | ||
| 9318 | + m_Name: | ||
| 9319 | + m_EditorClassIdentifier: | ||
| 9320 | + m_Material: {fileID: 0} | ||
| 9321 | + m_Color: {r: 1, g: 1, b: 1, a: 1} | ||
| 9322 | + m_RaycastTarget: 1 | ||
| 9323 | + m_OnCullStateChanged: | ||
| 9324 | + m_PersistentCalls: | ||
| 9325 | + m_Calls: [] | ||
| 9326 | + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, | ||
| 9327 | + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | ||
| 9328 | + m_Sprite: {fileID: 21300000, guid: b022b6e070c6d4f4cb20908c3325e638, type: 3} | ||
| 9329 | + m_Type: 0 | ||
| 9330 | + m_PreserveAspect: 1 | ||
| 9331 | + m_FillCenter: 1 | ||
| 9332 | + m_FillMethod: 4 | ||
| 9333 | + m_FillAmount: 1 | ||
| 9334 | + m_FillClockwise: 1 | ||
| 9335 | + m_FillOrigin: 0 | ||
| 9336 | +--- !u!222 &2054908658 | ||
| 9337 | +CanvasRenderer: | ||
| 9338 | + m_ObjectHideFlags: 0 | ||
| 9339 | + m_PrefabParentObject: {fileID: 22296126, guid: 5ccb0ba277304a14b9bb8d4e34161675, | ||
| 9340 | + type: 2} | ||
| 9341 | + m_PrefabInternal: {fileID: 0} | ||
| 9342 | + m_GameObject: {fileID: 2054908655} | ||
| 8216 | --- !u!1 &2063109691 | 9343 | --- !u!1 &2063109691 |
| 8217 | GameObject: | 9344 | GameObject: |
| 8218 | m_ObjectHideFlags: 0 | 9345 | m_ObjectHideFlags: 0 |
| @@ -8861,6 +9988,7 @@ MonoBehaviour: | @@ -8861,6 +9988,7 @@ MonoBehaviour: | ||
| 8861 | translateScreen: {fileID: 1935189153} | 9988 | translateScreen: {fileID: 1935189153} |
| 8862 | dictScreen: {fileID: 951727301} | 9989 | dictScreen: {fileID: 951727301} |
| 8863 | tutorialScreen: {fileID: 228512393} | 9990 | tutorialScreen: {fileID: 228512393} |
| 9991 | + makersScreen: {fileID: 2044204294} | ||
| 8864 | textButtonImage: {fileID: 930426944} | 9992 | textButtonImage: {fileID: 930426944} |
| 8865 | dictButtonImage: {fileID: 1649730299} | 9993 | dictButtonImage: {fileID: 1649730299} |
| 8866 | infoButtonImage: {fileID: 2079280005} | 9994 | infoButtonImage: {fileID: 2079280005} |
Assets/Scripts/Player Manager/DefaultSignSpeed.cs
| @@ -47,8 +47,7 @@ public class DefaultSignSpeed | @@ -47,8 +47,7 @@ public class DefaultSignSpeed | ||
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | 49 | ||
| 50 | - private float calculateUnit() | ||
| 51 | - { | 50 | + private float calculateUnit() { |
| 52 | return (this.max - this.speed) / (DEFAULT_MAX - DEFAULT); | 51 | return (this.max - this.speed) / (DEFAULT_MAX - DEFAULT); |
| 53 | } | 52 | } |
| 54 | 53 | ||
| @@ -56,8 +55,7 @@ public class DefaultSignSpeed | @@ -56,8 +55,7 @@ public class DefaultSignSpeed | ||
| 56 | * Retorna velocidade em relação ao estado do slider. | 55 | * Retorna velocidade em relação ao estado do slider. |
| 57 | * @param slider - estado do slider (valor entre "speed - max" e "max") | 56 | * @param slider - estado do slider (valor entre "speed - max" e "max") |
| 58 | */ | 57 | */ |
| 59 | - public float getProportional(float slider) | ||
| 60 | - { | 58 | + public float getProportional(float slider) { |
| 61 | return this.speed + (slider - DEFAULT) * this.unit; | 59 | return this.speed + (slider - DEFAULT) * this.unit; |
| 62 | } | 60 | } |
| 63 | } | 61 | } |
| 64 | \ No newline at end of file | 62 | \ No newline at end of file |
Assets/Scripts/Player Manager/GenericPlayerManager.cs
| @@ -11,69 +11,80 @@ using UnityEngine.UI; | @@ -11,69 +11,80 @@ using UnityEngine.UI; | ||
| 11 | public abstract class GenericPlayerManager : MonoBehaviour { | 11 | public abstract class GenericPlayerManager : MonoBehaviour { |
| 12 | 12 | ||
| 13 | private const string DEFAULT_ANIMATION = "_default"; | 13 | private const string DEFAULT_ANIMATION = "_default"; |
| 14 | - // private const string NONE_ANIMATION = "_defaultWORD"; | ||
| 15 | 14 | ||
| 16 | protected float fadeLength = 0.6F; | 15 | protected float fadeLength = 0.6F; |
| 16 | + public string glosa = ""; | ||
| 17 | 17 | ||
| 18 | - protected string glosa = ""; | ||
| 19 | - private static String[] stringPos = { DEFAULT_ANIMATION };//vetor que sera usado para quebrar a glosa | 18 | + // Vetor usado para quebrar a glosa |
| 19 | + private static String[] stringPos = { DEFAULT_ANIMATION }; | ||
| 20 | 20 | ||
| 21 | + // Referencia para o avatar | ||
| 21 | private GameObject AVATAR; | 22 | private GameObject AVATAR; |
| 23 | + // Referencia para o componente animador do avatar | ||
| 22 | private Animation COMPONENT_ANIMATION; | 24 | private Animation COMPONENT_ANIMATION; |
| 23 | private BoxCollider AVATAR_COLLIDER; | 25 | private BoxCollider AVATAR_COLLIDER; |
| 24 | public Text SUBTITLES; | 26 | public Text SUBTITLES; |
| 25 | 27 | ||
| 26 | - // Guarda os nomes das palavras ja carregadas. | 28 | + // Guarda os nomes das palavras já carregadas |
| 27 | private HashSet<string> loadedAssetBundles = new HashSet<string>(); | 29 | private HashSet<string> loadedAssetBundles = new HashSet<string>(); |
| 28 | - // Guarda os nomes das palavras que nao tem assetbundle. | 30 | + // Guarda os nomes das palavras que não tem assetbundle |
| 29 | private HashSet<string> nonexistentAssetBundles = new HashSet<string>(); | 31 | private HashSet<string> nonexistentAssetBundles = new HashSet<string>(); |
| 30 | 32 | ||
| 31 | - // Lista de animações sendo reproduzidas. | ||
| 32 | - // Utilizada para alterar velocidade e apresentar a legenda. | ||
| 33 | - private volatile Queue<AnimationReference> animQueue = new Queue<AnimationReference>(); | 33 | + // Fila de animações para reprodução |
| 34 | + // Utilizada para alterar velocidade e apresentar a legenda | ||
| 35 | + private Queue<AnimationReference> animQueue = new Queue<AnimationReference>(); | ||
| 34 | 36 | ||
| 37 | + // Sinais de intervalo de animações: não sinaliza reprodução na UI | ||
| 35 | private HashSet<string> intervalAnimations = new HashSet<string>(); | 38 | private HashSet<string> intervalAnimations = new HashSet<string>(); |
| 39 | + // Sinais ignorados na apresentação de legenda | ||
| 36 | private HashSet<string> flags = new HashSet<string>(); | 40 | private HashSet<string> flags = new HashSet<string>(); |
| 37 | 41 | ||
| 38 | - private volatile bool loadingSingleAnimation = false; | 42 | + // True quando está reproduzindo alguma animação de intervalo |
| 39 | private volatile bool playingIntervalAnimation = false; | 43 | private volatile bool playingIntervalAnimation = false; |
| 44 | + // True quando está na função LoadAndPlay | ||
| 40 | private volatile bool loading = false; | 45 | private volatile bool loading = false; |
| 46 | + // True quando está reproduzindo qualquer animação | ||
| 41 | private volatile bool playing = false; | 47 | private volatile bool playing = false; |
| 48 | + // True quando é chamada a função de pausa | ||
| 42 | private volatile bool paused = false; | 49 | private volatile bool paused = false; |
| 43 | 50 | ||
| 51 | + // Gerenciador de animações de intervalo | ||
| 44 | public RandomAnimations randomAnimations; | 52 | public RandomAnimations randomAnimations; |
| 45 | - private Subtitle subtitle = null; | 53 | + // Gerenciados de legendas |
| 54 | + private Subtitle subtitles = null; | ||
| 46 | 55 | ||
| 47 | public virtual void Start() | 56 | public virtual void Start() |
| 48 | { | 57 | { |
| 49 | - subtitle = new Subtitle(SUBTITLES); | ||
| 50 | - subtitle.DefaultWordSpeed = new DefaultSignSpeed(); | ||
| 51 | - subtitle.DefaultFirstLetterSpeed = new DefaultSignSpeed(2.1F, 2.8F); | ||
| 52 | - subtitle.DefaultLetterSpeed = new DefaultSignSpeed(3F, 4.3F); | ||
| 53 | - subtitle.DefaultNumberSpeed = new DefaultSignSpeed(1.5F, 2.9F); | ||
| 54 | - | ||
| 55 | - AVATAR = GameObject.FindGameObjectWithTag("avatar");//referencia para o avatar | ||
| 56 | - COMPONENT_ANIMATION = AVATAR.GetComponent<Animation>();//referencia para o componente animador do avatar | 58 | + // Configuração de velocidade das animações |
| 59 | + subtitles = new Subtitle(SUBTITLES); | ||
| 60 | + subtitles.DefaultWordSpeed = new DefaultSignSpeed(); | ||
| 61 | + subtitles.DefaultFirstLetterSpeed = new DefaultSignSpeed(2.1F, 2.8F); | ||
| 62 | + subtitles.DefaultLetterSpeed = new DefaultSignSpeed(3F, 4.3F); | ||
| 63 | + subtitles.DefaultNumberSpeed = new DefaultSignSpeed(1.5F, 2.9F); | ||
| 64 | + | ||
| 65 | + AVATAR = GameObject.FindGameObjectWithTag("avatar"); | ||
| 66 | + COMPONENT_ANIMATION = AVATAR.GetComponent<Animation>(); | ||
| 57 | AVATAR_COLLIDER = GameObject.FindGameObjectWithTag("avatar").GetComponent<BoxCollider>(); | 67 | AVATAR_COLLIDER = GameObject.FindGameObjectWithTag("avatar").GetComponent<BoxCollider>(); |
| 58 | 68 | ||
| 69 | + // Sinais ignorados na legenda | ||
| 59 | string[] flags = new string[] { | 70 | string[] flags = new string[] { |
| 60 | "[PONTO]", | 71 | "[PONTO]", |
| 61 | "[INTERROGACAO]", | 72 | "[INTERROGACAO]", |
| 62 | "[EXCLAMACAO]" | 73 | "[EXCLAMACAO]" |
| 63 | }; | 74 | }; |
| 64 | - | ||
| 65 | foreach (string flag in flags) | 75 | foreach (string flag in flags) |
| 66 | this.flags.Add(flag); | 76 | this.flags.Add(flag); |
| 67 | 77 | ||
| 78 | + // Sinal default é tratado como animação de intervalo: não sinaliza reprodução na UI | ||
| 68 | this.intervalAnimations.Add(DEFAULT_ANIMATION); | 79 | this.intervalAnimations.Add(DEFAULT_ANIMATION); |
| 69 | } | 80 | } |
| 70 | 81 | ||
| 71 | - public bool isLoadingSingleAnimation() { return loadingSingleAnimation; } | ||
| 72 | public bool isPlayingIntervalAnimation() { return playingIntervalAnimation; } | 82 | public bool isPlayingIntervalAnimation() { return playingIntervalAnimation; } |
| 73 | public bool isLoading() { return loading; } | 83 | public bool isLoading() { return loading; } |
| 74 | public bool isPlaying() { return playing; } | 84 | public bool isPlaying() { return playing; } |
| 75 | public bool isPaused() { return paused; } | 85 | public bool isPaused() { return paused; } |
| 76 | 86 | ||
| 87 | + /* Configura as animações de intervalo */ | ||
| 77 | public void setRandomAnimations(string[] intervalAnimations) | 88 | public void setRandomAnimations(string[] intervalAnimations) |
| 78 | { | 89 | { |
| 79 | foreach (string name in intervalAnimations) | 90 | foreach (string name in intervalAnimations) |
| @@ -89,31 +100,29 @@ public abstract class GenericPlayerManager : MonoBehaviour { | @@ -89,31 +100,29 @@ public abstract class GenericPlayerManager : MonoBehaviour { | ||
| 89 | AVATAR_COLLIDER.enabled = isActive; | 100 | AVATAR_COLLIDER.enabled = isActive; |
| 90 | } | 101 | } |
| 91 | 102 | ||
| 92 | - protected virtual void setSubtitle(string text) { | ||
| 93 | - SUBTITLES.text = text; | ||
| 94 | - } | ||
| 95 | - | ||
| 96 | // Define a velocidade das animacões com base no slider da GUI | 103 | // Define a velocidade das animacões com base no slider da GUI |
| 97 | public void setSlider(float sliderPosition) | 104 | public void setSlider(float sliderPosition) |
| 98 | { | 105 | { |
| 99 | - subtitle.SliderPosition = sliderPosition; | ||
| 100 | - subtitle.updateWordSpeed(); | ||
| 101 | - subtitle.updateLetterSpeed(); | ||
| 102 | - subtitle.updateNumberSpeed(); | 106 | + subtitles.SliderPosition = sliderPosition; |
| 107 | + subtitles.updateWordSpeed(); | ||
| 108 | + subtitles.updateLetterSpeed(); | ||
| 109 | + subtitles.updateNumberSpeed(); | ||
| 103 | 110 | ||
| 104 | - if ( ! paused) | 111 | + if ( ! paused) lock (animQueue) |
| 112 | + { | ||
| 105 | foreach (AnimationReference reference in animQueue) | 113 | foreach (AnimationReference reference in animQueue) |
| 106 | if (reference.type != Subtitle.TYPE_NONE && reference.state != null) | 114 | if (reference.type != Subtitle.TYPE_NONE && reference.state != null) |
| 107 | reference.state.speed = getSpeedByType(reference.type); | 115 | reference.state.speed = getSpeedByType(reference.type); |
| 116 | + } | ||
| 108 | } | 117 | } |
| 109 | 118 | ||
| 110 | private float getSpeedByType(short type) | 119 | private float getSpeedByType(short type) |
| 111 | { | 120 | { |
| 112 | switch (type) | 121 | switch (type) |
| 113 | { | 122 | { |
| 114 | - case Subtitle.TYPE_WORD: return subtitle.WordSpeed; | ||
| 115 | - case Subtitle.TYPE_LETTER: return subtitle.LetterSpeed; | ||
| 116 | - case Subtitle.TYPE_NUMBER: return subtitle.NumberSpeed; | 123 | + case Subtitle.TYPE_WORD: return subtitles.WordSpeed; |
| 124 | + case Subtitle.TYPE_LETTER: return subtitles.LetterSpeed; | ||
| 125 | + case Subtitle.TYPE_NUMBER: return subtitles.NumberSpeed; | ||
| 117 | } | 126 | } |
| 118 | 127 | ||
| 119 | return 2F; | 128 | return 2F; |
| @@ -134,9 +143,9 @@ public abstract class GenericPlayerManager : MonoBehaviour { | @@ -134,9 +143,9 @@ public abstract class GenericPlayerManager : MonoBehaviour { | ||
| 134 | StopCoroutine("handleStates"); | 143 | StopCoroutine("handleStates"); |
| 135 | this.randomAnimations.unlockFor("handleStates"); | 144 | this.randomAnimations.unlockFor("handleStates"); |
| 136 | 145 | ||
| 137 | - setSubtitle(""); | 146 | + this.subtitles.setText(""); |
| 138 | 147 | ||
| 139 | - animQueue.Clear(); | 148 | + lock (animQueue) { animQueue.Clear(); } |
| 140 | 149 | ||
| 141 | COMPONENT_ANIMATION.Stop(); | 150 | COMPONENT_ANIMATION.Stop(); |
| 142 | COMPONENT_ANIMATION.CrossFade(DEFAULT_ANIMATION, fadeLength, PlayMode.StopAll); | 151 | COMPONENT_ANIMATION.CrossFade(DEFAULT_ANIMATION, fadeLength, PlayMode.StopAll); |
| @@ -163,7 +172,10 @@ public abstract class GenericPlayerManager : MonoBehaviour { | @@ -163,7 +172,10 @@ public abstract class GenericPlayerManager : MonoBehaviour { | ||
| 163 | { | 172 | { |
| 164 | AnimationState state = COMPONENT_ANIMATION.CrossFadeQueued(name, fadeLength, QueueMode.CompleteOthers); | 173 | AnimationState state = COMPONENT_ANIMATION.CrossFadeQueued(name, fadeLength, QueueMode.CompleteOthers); |
| 165 | state.speed = speed; | 174 | state.speed = speed; |
| 166 | - animQueue.Enqueue(new AnimationReference(name, subtitle, state, type)); | 175 | + |
| 176 | + lock (this.animQueue) { | ||
| 177 | + animQueue.Enqueue(new AnimationReference(name, subtitle, state, type)); | ||
| 178 | + } | ||
| 167 | 179 | ||
| 168 | return state; | 180 | return state; |
| 169 | } | 181 | } |
| @@ -196,32 +208,25 @@ public abstract class GenericPlayerManager : MonoBehaviour { | @@ -196,32 +208,25 @@ public abstract class GenericPlayerManager : MonoBehaviour { | ||
| 196 | */ | 208 | */ |
| 197 | protected abstract void onPlayingStateChange(); | 209 | protected abstract void onPlayingStateChange(); |
| 198 | 210 | ||
| 199 | - public void switchPauseState(bool paused) | 211 | + public void setPauseState(bool paused) |
| 200 | { | 212 | { |
| 201 | if (this.paused != paused) | 213 | if (this.paused != paused) |
| 202 | { | 214 | { |
| 203 | this.paused = paused; | 215 | this.paused = paused; |
| 204 | 216 | ||
| 205 | - foreach (AnimationReference reference in animQueue) | ||
| 206 | - if (reference.state != null) | ||
| 207 | - reference.state.speed = paused ? 0F : getSpeedByType(reference.type); | 217 | + lock (animQueue) |
| 218 | + { | ||
| 219 | + foreach (AnimationReference reference in animQueue) | ||
| 220 | + if (reference.state != null) | ||
| 221 | + reference.state.speed = paused ? 0F : getSpeedByType(reference.type); | ||
| 222 | + } | ||
| 208 | 223 | ||
| 209 | onPlayingStateChange(); | 224 | onPlayingStateChange(); |
| 210 | } | 225 | } |
| 211 | } | 226 | } |
| 212 | 227 | ||
| 213 | - public void setPauseState(bool paused) | ||
| 214 | - { | ||
| 215 | - if (this.paused != paused) | ||
| 216 | - { | ||
| 217 | - this.paused = paused; | ||
| 218 | - | ||
| 219 | - foreach (AnimationReference reference in animQueue) | ||
| 220 | - if (reference.state != null) | ||
| 221 | - reference.state.speed = paused ? 0F : getSpeedByType(reference.type); | ||
| 222 | - | ||
| 223 | - onPlayingStateChange(); | ||
| 224 | - } | 228 | + public void switchPauseState() { |
| 229 | + setPauseState( ! this.paused); | ||
| 225 | } | 230 | } |
| 226 | 231 | ||
| 227 | public bool play() | 232 | public bool play() |
| @@ -245,17 +250,20 @@ public abstract class GenericPlayerManager : MonoBehaviour { | @@ -245,17 +250,20 @@ public abstract class GenericPlayerManager : MonoBehaviour { | ||
| 245 | return play(true, false, true); | 250 | return play(true, false, true); |
| 246 | } | 251 | } |
| 247 | 252 | ||
| 253 | + private System.Object playLocker = new System.Object(); | ||
| 254 | + | ||
| 248 | public bool play(bool stopLoading, bool stopPlaying, bool forceLoading) | 255 | public bool play(bool stopLoading, bool stopPlaying, bool forceLoading) |
| 249 | { | 256 | { |
| 250 | - try { | ||
| 251 | - if (loading) | 257 | + lock (this.playLocker) |
| 258 | + { | ||
| 259 | + if (this.loading) | ||
| 252 | { | 260 | { |
| 253 | if (stopLoading) | 261 | if (stopLoading) |
| 254 | stopAll(); | 262 | stopAll(); |
| 255 | else | 263 | else |
| 256 | return false; | 264 | return false; |
| 257 | } | 265 | } |
| 258 | - else if (playing) | 266 | + else if (this.playing) |
| 259 | { | 267 | { |
| 260 | if (stopPlaying) | 268 | if (stopPlaying) |
| 261 | stopAnimations(); | 269 | stopAnimations(); |
| @@ -263,7 +271,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { | @@ -263,7 +271,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { | ||
| 263 | else if ( ! forceLoading) | 271 | else if ( ! forceLoading) |
| 264 | return false; | 272 | return false; |
| 265 | } | 273 | } |
| 266 | - } catch (NullReferenceException nre) { nre.ToString(); } | 274 | + } |
| 267 | 275 | ||
| 268 | StartCoroutine("loadAndPlay"); | 276 | StartCoroutine("loadAndPlay"); |
| 269 | return true; | 277 | return true; |
| @@ -280,7 +288,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { | @@ -280,7 +288,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { | ||
| 280 | bool defaultPlayed = false; | 288 | bool defaultPlayed = false; |
| 281 | 289 | ||
| 282 | // A reprodução da primeira letra deve ser longa para não ser cortada no fade | 290 | // A reprodução da primeira letra deve ser longa para não ser cortada no fade |
| 283 | - subtitle.updateLetterSpeed(); | 291 | + this.subtitles.updateLetterSpeed(); |
| 284 | 292 | ||
| 285 | for (int i = 0; i < word.Length; i++) | 293 | for (int i = 0; i < word.Length; i++) |
| 286 | { | 294 | { |
| @@ -289,11 +297,11 @@ public abstract class GenericPlayerManager : MonoBehaviour { | @@ -289,11 +297,11 @@ public abstract class GenericPlayerManager : MonoBehaviour { | ||
| 289 | 297 | ||
| 290 | // Se for uma letra | 298 | // Se for uma letra |
| 291 | if (second >= 65 && second <= 90) | 299 | if (second >= 65 && second <= 90) |
| 292 | - playAnimation(Subtitle.TYPE_LETTER, second.ToString(), lastAnimationSubtitle, subtitle.LetterSpeed); | 300 | + playAnimation(Subtitle.TYPE_LETTER, second.ToString(), lastAnimationSubtitle, subtitles.LetterSpeed); |
| 293 | 301 | ||
| 294 | // Se for um número | 302 | // Se for um número |
| 295 | else if (second >= 48 && second <= 57) | 303 | else if (second >= 48 && second <= 57) |
| 296 | - playAnimation(Subtitle.TYPE_NUMBER, second.ToString(), lastAnimationSubtitle, subtitle.NumberSpeed); | 304 | + playAnimation(Subtitle.TYPE_NUMBER, second.ToString(), lastAnimationSubtitle, subtitles.NumberSpeed); |
| 297 | 305 | ||
| 298 | // Se for uma vírgula | 306 | // Se for uma vírgula |
| 299 | else if (second == 44) | 307 | else if (second == 44) |
| @@ -309,7 +317,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { | @@ -309,7 +317,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { | ||
| 309 | playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle); | 317 | playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle); |
| 310 | 318 | ||
| 311 | // A reprodução da próxima letra deve ser longa para não ser cortada no fade | 319 | // A reprodução da próxima letra deve ser longa para não ser cortada no fade |
| 312 | - subtitle.updateLetterSpeed(); | 320 | + subtitles.updateLetterSpeed(); |
| 313 | } | 321 | } |
| 314 | 322 | ||
| 315 | UnityEngine.Debug.Log("Animação \"" + second + "\" inexistente."); | 323 | UnityEngine.Debug.Log("Animação \"" + second + "\" inexistente."); |
| @@ -317,196 +325,209 @@ public abstract class GenericPlayerManager : MonoBehaviour { | @@ -317,196 +325,209 @@ public abstract class GenericPlayerManager : MonoBehaviour { | ||
| 317 | } | 325 | } |
| 318 | 326 | ||
| 319 | defaultPlayed = false; | 327 | defaultPlayed = false; |
| 320 | - subtitle.updateLetterSpeed(); | 328 | + subtitles.updateLetterSpeed(); |
| 321 | } | 329 | } |
| 322 | 330 | ||
| 323 | return lastAnimationSubtitle; | 331 | return lastAnimationSubtitle; |
| 324 | } | 332 | } |
| 325 | 333 | ||
| 334 | + private System.Object loadingLocker = new System.Object(); | ||
| 335 | + | ||
| 326 | private IEnumerator loadAndPlay() | 336 | private IEnumerator loadAndPlay() |
| 327 | { | 337 | { |
| 328 | - this.randomAnimations.lockFor("loadAndPlay"); | ||
| 329 | - | ||
| 330 | - this.loading = true; | ||
| 331 | - // onPlayingStateChange(); | ||
| 332 | - | ||
| 333 | - string lastAnimationSubtitle = ""; | ||
| 334 | - bool spelled = false; | 338 | + lock (this.loadingLocker) |
| 339 | + { | ||
| 340 | + this.randomAnimations.lockFor("loadAndPlay"); | ||
| 335 | 341 | ||
| 336 | - // Default | ||
| 337 | - playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", 2F); | 342 | + this.loading = true; |
| 343 | + // onPlayingStateChange(); | ||
| 338 | 344 | ||
| 339 | - if ( ! this.playing) | ||
| 340 | - StartCoroutine("handleStates"); | 345 | + string lastAnimationSubtitle = ""; |
| 346 | + bool spelled = false; | ||
| 341 | 347 | ||
| 342 | - stringPos = glosa.Split(' '); | 348 | + // Default |
| 349 | + playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", 2F); | ||
| 343 | 350 | ||
| 344 | - foreach (string aniName in stringPos) | ||
| 345 | - { | ||
| 346 | - try { | ||
| 347 | - if (String.IsNullOrEmpty(aniName)) continue; | ||
| 348 | - } catch (Exception e) { | ||
| 349 | - UnityEngine.Debug.Log(e + " :: NotNullNotEmpty"); | ||
| 350 | - } | 351 | + if ( ! this.playing) |
| 352 | + StartCoroutine("handleStates"); | ||
| 351 | 353 | ||
| 352 | - bool nonexistent = nonexistentAssetBundles.Contains(aniName); | ||
| 353 | - bool loaded = loadedAssetBundles.Contains(aniName); | 354 | + stringPos = glosa.Split(' '); |
| 354 | 355 | ||
| 355 | - if ( ! nonexistent && ! loaded) | 356 | + foreach (string aniName in stringPos) |
| 356 | { | 357 | { |
| 357 | - // Função loadAssetBundle é definida pela classe filha | ||
| 358 | - WWW www = loadAssetBundle(aniName); | 358 | + try { |
| 359 | + if (String.IsNullOrEmpty(aniName)) continue; | ||
| 360 | + } catch (Exception e) { | ||
| 361 | + UnityEngine.Debug.Log(e + " :: NotNullNotEmpty"); | ||
| 362 | + } | ||
| 363 | + | ||
| 364 | + bool nonexistent = nonexistentAssetBundles.Contains(aniName); | ||
| 365 | + bool loaded = loadedAssetBundles.Contains(aniName); | ||
| 359 | 366 | ||
| 360 | - if (www != null) | 367 | + if ( ! nonexistent && ! loaded) |
| 361 | { | 368 | { |
| 362 | - yield return www; | 369 | + // Função loadAssetBundle é definida pela classe filha |
| 370 | + WWW www = loadAssetBundle(aniName); | ||
| 363 | 371 | ||
| 364 | - AssetBundle bundle = null; | 372 | + if (www != null) |
| 373 | + { | ||
| 374 | + yield return www; | ||
| 365 | 375 | ||
| 366 | - if (www.error == null) | ||
| 367 | - bundle = www.assetBundle; | 376 | + AssetBundle bundle = null; |
| 368 | 377 | ||
| 369 | - if (bundle != null && ! String.IsNullOrEmpty(bundle.mainAsset.name)) | ||
| 370 | - { | ||
| 371 | - AnimationClip aniClip = bundle.mainAsset as AnimationClip; | ||
| 372 | - bundle.Unload(false); | 378 | + if (www.error == null) |
| 379 | + bundle = www.assetBundle; | ||
| 373 | 380 | ||
| 374 | - if (aniClip) | 381 | + if (bundle != null && ! String.IsNullOrEmpty(bundle.mainAsset.name)) |
| 375 | { | 382 | { |
| 376 | - COMPONENT_ANIMATION.AddClip(aniClip, aniName); | 383 | + AnimationClip aniClip = bundle.mainAsset as AnimationClip; |
| 384 | + bundle.Unload(false); | ||
| 385 | + | ||
| 386 | + if (aniClip) | ||
| 387 | + { | ||
| 388 | + COMPONENT_ANIMATION.AddClip(aniClip, aniName); | ||
| 377 | 389 | ||
| 378 | - loadedAssetBundles.Add(aniName); | ||
| 379 | - loaded = true; | 390 | + loadedAssetBundles.Add(aniName); |
| 391 | + loaded = true; | ||
| 392 | + } | ||
| 393 | + else UnityEngine.Debug.Log ("Sinal \"" + aniName + "\" não carregado corretamente."); | ||
| 380 | } | 394 | } |
| 381 | - else UnityEngine.Debug.Log ("Sinal \"" + aniName + "\" não carregado corretamente."); | ||
| 382 | } | 395 | } |
| 383 | } | 396 | } |
| 384 | - } | ||
| 385 | 397 | ||
| 386 | - // Reproduz palavra | ||
| 387 | - if (loaded) | ||
| 388 | - { | ||
| 389 | - if (spelled) | 398 | + // Reproduz palavra |
| 399 | + if (loaded) | ||
| 390 | { | 400 | { |
| 391 | - // Default | ||
| 392 | - playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle); | ||
| 393 | - spelled = false; | ||
| 394 | - } | 401 | + if (spelled) |
| 402 | + { | ||
| 403 | + // Default | ||
| 404 | + playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle); | ||
| 405 | + spelled = false; | ||
| 406 | + } | ||
| 395 | 407 | ||
| 396 | - if (this.flags.Contains(aniName) || this.intervalAnimations.Contains(aniName)) | ||
| 397 | - { | ||
| 398 | - lastAnimationSubtitle = ""; | ||
| 399 | - playAnimation(Subtitle.TYPE_WORD, aniName, ""); | 408 | + if (this.flags.Contains(aniName) || this.intervalAnimations.Contains(aniName)) |
| 409 | + { | ||
| 410 | + lastAnimationSubtitle = ""; | ||
| 411 | + playAnimation(Subtitle.TYPE_WORD, aniName, ""); | ||
| 412 | + } | ||
| 413 | + else | ||
| 414 | + { | ||
| 415 | + lastAnimationSubtitle = aniName; | ||
| 416 | + playAnimation(Subtitle.TYPE_WORD, aniName); | ||
| 417 | + } | ||
| 400 | } | 418 | } |
| 419 | + | ||
| 420 | + // Soletra palavra | ||
| 401 | else | 421 | else |
| 402 | { | 422 | { |
| 403 | - lastAnimationSubtitle = aniName; | ||
| 404 | - playAnimation(Subtitle.TYPE_WORD, aniName); | ||
| 405 | - } | ||
| 406 | - } | 423 | + // Se a animação não foi carregada e nem está marcada como não existente, |
| 424 | + // adiciona ao set de animações não existentes | ||
| 425 | + if ( ! nonexistent) | ||
| 426 | + nonexistentAssetBundles.Add(aniName); | ||
| 407 | 427 | ||
| 408 | - // Soletra palavra | ||
| 409 | - else | ||
| 410 | - { | ||
| 411 | - // Se a animação não foi carregada e nem está marcada como não existente, | ||
| 412 | - // adiciona ao set de animações não existentes | ||
| 413 | - if ( ! nonexistent) | ||
| 414 | - nonexistentAssetBundles.Add(aniName); | 428 | + UnityEngine.Debug.Log("~~ To spell: " + aniName); |
| 415 | 429 | ||
| 416 | - UnityEngine.Debug.Log("~~ To spell: " + aniName); | 430 | + if (this.flags.Contains(aniName) || this.intervalAnimations.Contains(aniName)) |
| 431 | + { | ||
| 432 | + playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", 1.6F); | ||
| 433 | + continue; | ||
| 434 | + } | ||
| 417 | 435 | ||
| 418 | - if (this.flags.Contains(aniName) || this.intervalAnimations.Contains(aniName)) | ||
| 419 | - { | ||
| 420 | - playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", 1.6F); | ||
| 421 | - continue; | ||
| 422 | - } | 436 | + // Se já houve o soletramento de alguma palavra, reproduz animação default |
| 437 | + if (spelled) | ||
| 438 | + playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle, 1.6F); | ||
| 439 | + else | ||
| 440 | + spelled = true; | ||
| 423 | 441 | ||
| 424 | - // Se já houve o soletramento de alguma palavra, reproduz animação default | ||
| 425 | - if (spelled) | ||
| 426 | - playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle, 1.6F); | ||
| 427 | - else | ||
| 428 | - spelled = true; | ||
| 429 | - | ||
| 430 | - lastAnimationSubtitle = spellWord(aniName); | 442 | + lastAnimationSubtitle = spellWord(aniName); |
| 443 | + } | ||
| 431 | } | 444 | } |
| 432 | - } | ||
| 433 | 445 | ||
| 434 | - // Default | ||
| 435 | - playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, ""); | 446 | + // Default |
| 447 | + playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, ""); | ||
| 436 | 448 | ||
| 437 | - this.loading = false; | ||
| 438 | - // onPlayingStateChange(); | ||
| 439 | - this.randomAnimations.unlockFor("loadAndPlay"); | 449 | + this.loading = false; |
| 450 | + // onPlayingStateChange(); | ||
| 451 | + this.randomAnimations.unlockFor("loadAndPlay"); | ||
| 452 | + } | ||
| 440 | } | 453 | } |
| 441 | 454 | ||
| 442 | - //int _id = 0; | 455 | + private System.Object playingLocker = new System.Object(); |
| 443 | 456 | ||
| 444 | - /* | ||
| 445 | - * Sincroniza as legendas com as animações. | ||
| 446 | - */ | 457 | + /* Sincroniza as legendas com as animações. */ |
| 447 | IEnumerator handleStates() | 458 | IEnumerator handleStates() |
| 448 | { | 459 | { |
| 449 | - this.randomAnimations.lockFor("handleStates"); | 460 | + lock (this.playingLocker) |
| 461 | + { | ||
| 462 | + this.randomAnimations.lockFor("handleStates"); | ||
| 450 | 463 | ||
| 451 | - // this.playing = true; | 464 | + // this.playing = true; |
| 452 | 465 | ||
| 453 | - // Enquanto estiver executando a rotina "loadAndPlay" | ||
| 454 | - // ou existir animações na fila de reprodução | ||
| 455 | - while (loading || animQueue.Count > 0) | ||
| 456 | - { | ||
| 457 | - if (animQueue.Count > 0) | ||
| 458 | - { | ||
| 459 | - AnimationReference reference = animQueue.Peek(); | 466 | + bool isNotEmpty; |
| 460 | 467 | ||
| 461 | - setSubtitle(reference.subtitle); | 468 | + lock (animQueue) { isNotEmpty = animQueue.Count > 0; } |
| 462 | 469 | ||
| 463 | - if (COMPONENT_ANIMATION.IsPlaying(reference.name)) | 470 | + // Enquanto estiver executando a rotina "loadAndPlay" |
| 471 | + // ou existir animações na fila de reprodução | ||
| 472 | + while (loading || isNotEmpty) | ||
| 473 | + { | ||
| 474 | + if (isNotEmpty) | ||
| 464 | { | 475 | { |
| 465 | - bool changing = false; | 476 | + AnimationReference reference; |
| 477 | + lock (animQueue) { reference = animQueue.Peek(); } | ||
| 466 | 478 | ||
| 467 | - if ( ! this.playing) | ||
| 468 | - { | ||
| 469 | - this.playing = true; | ||
| 470 | - changing = true; | ||
| 471 | - } | 479 | + this.subtitles.setText(reference.subtitle); |
| 472 | 480 | ||
| 473 | - if (this.intervalAnimations.Contains(reference.name)) | 481 | + if (COMPONENT_ANIMATION.IsPlaying(reference.name)) |
| 474 | { | 482 | { |
| 475 | - if ( ! this.playingIntervalAnimation) | 483 | + bool changing = false; |
| 484 | + | ||
| 485 | + if ( ! this.playing) | ||
| 476 | { | 486 | { |
| 477 | - this.playingIntervalAnimation = true; | 487 | + this.playing = true; |
| 478 | changing = true; | 488 | changing = true; |
| 479 | } | 489 | } |
| 480 | - } | ||
| 481 | - else if (this.playingIntervalAnimation) | ||
| 482 | - { | ||
| 483 | - this.playingIntervalAnimation = false; | ||
| 484 | - changing = true; | ||
| 485 | - } | ||
| 486 | 490 | ||
| 487 | - if (changing) onPlayingStateChange(); | 491 | + if (this.intervalAnimations.Contains(reference.name)) |
| 492 | + { | ||
| 493 | + if ( ! this.playingIntervalAnimation) | ||
| 494 | + { | ||
| 495 | + this.playingIntervalAnimation = true; | ||
| 496 | + changing = true; | ||
| 497 | + } | ||
| 498 | + } | ||
| 499 | + else if (this.playingIntervalAnimation) | ||
| 500 | + { | ||
| 501 | + this.playingIntervalAnimation = false; | ||
| 502 | + changing = true; | ||
| 503 | + } | ||
| 504 | + | ||
| 505 | + if (changing) onPlayingStateChange(); | ||
| 506 | + | ||
| 507 | + // reference.playing = true; | ||
| 508 | + do { yield return null; } | ||
| 509 | + while (COMPONENT_ANIMATION.IsPlaying(reference.name)); | ||
| 510 | + } | ||
| 488 | 511 | ||
| 489 | - // reference.playing = true; | ||
| 490 | - do { yield return null; } | ||
| 491 | - while (COMPONENT_ANIMATION.IsPlaying(reference.name)); | 512 | + if (reference.state == null) |
| 513 | + lock (animQueue) { animQueue.Dequeue(); } | ||
| 514 | + else | ||
| 515 | + yield return null; | ||
| 492 | } | 516 | } |
| 517 | + else yield return null; | ||
| 493 | 518 | ||
| 494 | - if (reference.state == null) | ||
| 495 | - animQueue.Dequeue(); | ||
| 496 | - else | ||
| 497 | - yield return null; | ||
| 498 | - } | ||
| 499 | - else yield return null; | 519 | + this.subtitles.setText(""); |
| 500 | 520 | ||
| 501 | - setSubtitle(""); | ||
| 502 | - } | 521 | + lock (animQueue) { isNotEmpty = animQueue.Count > 0; } |
| 522 | + } | ||
| 503 | 523 | ||
| 504 | - this.playing = false; | ||
| 505 | - this.paused = false; | ||
| 506 | - this.playingIntervalAnimation = false; | ||
| 507 | - onPlayingStateChange(); | 524 | + this.playing = false; |
| 525 | + this.paused = false; | ||
| 526 | + this.playingIntervalAnimation = false; | ||
| 527 | + onPlayingStateChange(); | ||
| 508 | 528 | ||
| 509 | - this.randomAnimations.unlockFor("handleStates"); | 529 | + this.randomAnimations.unlockFor("handleStates"); |
| 530 | + } | ||
| 510 | } | 531 | } |
| 511 | 532 | ||
| 512 | } | 533 | } |
Assets/Scripts/Player Manager/RandomAnimations.cs
| @@ -27,17 +27,23 @@ public class RandomAnimations : MonoBehaviour { | @@ -27,17 +27,23 @@ public class RandomAnimations : MonoBehaviour { | ||
| 27 | 27 | ||
| 28 | /* Bloquear animações para o GameObject object. */ | 28 | /* Bloquear animações para o GameObject object. */ |
| 29 | public void lockFor(String id) { | 29 | public void lockFor(String id) { |
| 30 | - this.blockingObjects.Add(id); | 30 | + lock (this.blockingObjects) { |
| 31 | + this.blockingObjects.Add(id); | ||
| 32 | + } | ||
| 31 | } | 33 | } |
| 32 | 34 | ||
| 33 | /* Desbloquear animações para o GameObject object. */ | 35 | /* Desbloquear animações para o GameObject object. */ |
| 34 | public void unlockFor(String id) { | 36 | public void unlockFor(String id) { |
| 35 | - this.blockingObjects.Remove(id); | 37 | + lock (this.blockingObjects) { |
| 38 | + this.blockingObjects.Remove(id); | ||
| 39 | + } | ||
| 36 | } | 40 | } |
| 37 | 41 | ||
| 38 | /* Desbloquear animações para todos os GameObjects. */ | 42 | /* Desbloquear animações para todos os GameObjects. */ |
| 39 | public void unlockAll() { | 43 | public void unlockAll() { |
| 40 | - this.blockingObjects.Clear(); | 44 | + lock (this.blockingObjects) { |
| 45 | + this.blockingObjects.Clear(); | ||
| 46 | + } | ||
| 41 | } | 47 | } |
| 42 | 48 | ||
| 43 | /* Atribui as animações e inicia o processo para reproduzir. */ | 49 | /* Atribui as animações e inicia o processo para reproduzir. */ |
| @@ -54,12 +60,19 @@ public class RandomAnimations : MonoBehaviour { | @@ -54,12 +60,19 @@ public class RandomAnimations : MonoBehaviour { | ||
| 54 | { | 60 | { |
| 55 | while (true) | 61 | while (true) |
| 56 | { | 62 | { |
| 57 | - if (blockingObjects.Count == 0) | 63 | + bool isNotBlocked; |
| 64 | + lock (this.blockingObjects) { | ||
| 65 | + isNotBlocked = this.blockingObjects.Count == 0; | ||
| 66 | + } | ||
| 67 | + | ||
| 68 | + if (isNotBlocked) | ||
| 58 | { | 69 | { |
| 59 | yield return new WaitForSeconds(this.time); | 70 | yield return new WaitForSeconds(this.time); |
| 60 | 71 | ||
| 61 | - if (blockingObjects.Count > 0) | ||
| 62 | - continue; | 72 | + lock (this.blockingObjects) { |
| 73 | + if (this.blockingObjects.Count > 0) | ||
| 74 | + continue; | ||
| 75 | + } | ||
| 63 | 76 | ||
| 64 | int index = sortIndex(); | 77 | int index = sortIndex(); |
| 65 | 78 |
Assets/Scripts/Player Manager/Subtitle.cs
| 1 | using UnityEngine.UI; | 1 | using UnityEngine.UI; |
| 2 | 2 | ||
| 3 | +/** | ||
| 4 | + * Gerenciador de legendas | ||
| 5 | + */ | ||
| 3 | public class Subtitle { | 6 | public class Subtitle { |
| 4 | 7 | ||
| 5 | public const short TYPE_NONE = -1; | 8 | public const short TYPE_NONE = -1; |
| @@ -7,23 +10,37 @@ public class Subtitle { | @@ -7,23 +10,37 @@ public class Subtitle { | ||
| 7 | public const short TYPE_LETTER = 1; | 10 | public const short TYPE_LETTER = 1; |
| 8 | public const short TYPE_NUMBER = 2; | 11 | public const short TYPE_NUMBER = 2; |
| 9 | 12 | ||
| 13 | + // Configuração de velocidade de palavras | ||
| 10 | protected DefaultSignSpeed defaultWordSpeed = new DefaultSignSpeed(); | 14 | protected DefaultSignSpeed defaultWordSpeed = new DefaultSignSpeed(); |
| 15 | + // Configuração de velocidade da primeira letra de palavras a serem soletradas | ||
| 16 | + // Necessário que seja maior para não haver corte quando a mão está | ||
| 17 | + // muito distante do local onde soletra para a maioria das letras | ||
| 11 | protected DefaultSignSpeed defaultFirstLetterSpeed = new DefaultSignSpeed(); | 18 | protected DefaultSignSpeed defaultFirstLetterSpeed = new DefaultSignSpeed(); |
| 19 | + // Configuração de velocidade das letras seguintes, ou velocidade padrão de letras | ||
| 12 | protected DefaultSignSpeed defaultLetterSpeed = new DefaultSignSpeed(); | 20 | protected DefaultSignSpeed defaultLetterSpeed = new DefaultSignSpeed(); |
| 21 | + // Configuração de velocidade dos números | ||
| 13 | protected DefaultSignSpeed defaultNumberSpeed = new DefaultSignSpeed(); | 22 | protected DefaultSignSpeed defaultNumberSpeed = new DefaultSignSpeed(); |
| 14 | 23 | ||
| 24 | + // Posição do slider de velocidade | ||
| 15 | private float sliderPosition = DefaultSignSpeed.DEFAULT; | 25 | private float sliderPosition = DefaultSignSpeed.DEFAULT; |
| 16 | 26 | ||
| 27 | + // Velocade de palavras | ||
| 17 | private float wordSpeed = DefaultSignSpeed.DEFAULT; | 28 | private float wordSpeed = DefaultSignSpeed.DEFAULT; |
| 29 | + // Velocade de letras | ||
| 18 | private float letterSpeed = DefaultSignSpeed.DEFAULT; | 30 | private float letterSpeed = DefaultSignSpeed.DEFAULT; |
| 31 | + // Velocade de números | ||
| 19 | private float numberSpeed = DefaultSignSpeed.DEFAULT; | 32 | private float numberSpeed = DefaultSignSpeed.DEFAULT; |
| 20 | 33 | ||
| 21 | - public Text SUBTITLES; | 34 | + // Referência para a legenda |
| 35 | + public Text subtitle; | ||
| 22 | 36 | ||
| 37 | + public Subtitle(Text subtitle) { | ||
| 38 | + this.subtitle = subtitle; | ||
| 39 | + } | ||
| 23 | 40 | ||
| 24 | - public Subtitle(Text subtitles) | ||
| 25 | - { | ||
| 26 | - this.SUBTITLES = subtitles; | 41 | + /* Alterar legenda */ |
| 42 | + public void setText(string text) { | ||
| 43 | + this.subtitle.text = text; | ||
| 27 | } | 44 | } |
| 28 | 45 | ||
| 29 | public DefaultSignSpeed DefaultWordSpeed { | 46 | public DefaultSignSpeed DefaultWordSpeed { |
| @@ -98,9 +115,7 @@ public class Subtitle { | @@ -98,9 +115,7 @@ public class Subtitle { | ||
| 98 | } | 115 | } |
| 99 | 116 | ||
| 100 | 117 | ||
| 101 | - /* | ||
| 102 | - * Destaca caractere de uma string. | ||
| 103 | - */ | 118 | + /* Destaca caractere de uma string. */ |
| 104 | public static string highlight(string word, int index) | 119 | public static string highlight(string word, int index) |
| 105 | { | 120 | { |
| 106 | string subtitle = ""; | 121 | string subtitle = ""; |
Assets/Scripts/PlayerManager.cs
| @@ -85,7 +85,9 @@ public class PlayerManager : GenericPlayerManager { | @@ -85,7 +85,9 @@ public class PlayerManager : GenericPlayerManager { | ||
| 85 | 85 | ||
| 86 | //private bool cancelTranslation() | 86 | //private bool cancelTranslation() |
| 87 | 87 | ||
| 88 | - public void playTranslate() { | 88 | + public void playTranslate() |
| 89 | + { | ||
| 90 | + stopTranslation(); | ||
| 89 | StartCoroutine("translate", translateScreenText.text); | 91 | StartCoroutine("translate", translateScreenText.text); |
| 90 | } | 92 | } |
| 91 | 93 | ||
| @@ -114,24 +116,29 @@ public class PlayerManager : GenericPlayerManager { | @@ -114,24 +116,29 @@ public class PlayerManager : GenericPlayerManager { | ||
| 114 | } | 116 | } |
| 115 | } | 117 | } |
| 116 | 118 | ||
| 119 | + private System.Object stateLocker = new System.Object(); | ||
| 120 | + | ||
| 117 | protected override void onPlayingStateChange() | 121 | protected override void onPlayingStateChange() |
| 118 | { | 122 | { |
| 119 | - if (base.isPlaying() && ! base.isPlayingIntervalAnimation()) | 123 | + lock (this.stateLocker) |
| 120 | { | 124 | { |
| 121 | - setPlayingState(true); | ||
| 122 | - | ||
| 123 | - if (base.isPaused()) | ||
| 124 | - { | ||
| 125 | - this.pauseButtonImage.switchAttribute(true); | ||
| 126 | - this.screenManager.setPauseMenuState(true); | ||
| 127 | - } | ||
| 128 | - else | 125 | + if (base.isPlaying() && ! base.isPlayingIntervalAnimation()) |
| 129 | { | 126 | { |
| 130 | - this.pauseButtonImage.switchAttribute(false); | ||
| 131 | - this.screenManager.setPauseMenuState(false); | 127 | + setPlayingState(true); |
| 128 | + | ||
| 129 | + if (base.isPaused()) | ||
| 130 | + { | ||
| 131 | + this.pauseButtonImage.switchAttribute(true); | ||
| 132 | + this.screenManager.setPauseMenuState(true); | ||
| 133 | + } | ||
| 134 | + else | ||
| 135 | + { | ||
| 136 | + this.pauseButtonImage.switchAttribute(false); | ||
| 137 | + this.screenManager.setPauseMenuState(false); | ||
| 138 | + } | ||
| 132 | } | 139 | } |
| 140 | + else setPlayingState(false); | ||
| 133 | } | 141 | } |
| 134 | - else setPlayingState(false); | ||
| 135 | } | 142 | } |
| 136 | 143 | ||
| 137 | // Called from microphone icon at main interface | 144 | // Called from microphone icon at main interface |
| @@ -0,0 +1,29 @@ | @@ -0,0 +1,29 @@ | ||
| 1 | +using UnityEngine; | ||
| 2 | +using UnityEngine.UI; | ||
| 3 | + | ||
| 4 | +public class MakersScreenTextResizer : MonoBehaviour { | ||
| 5 | + | ||
| 6 | + protected void Start () | ||
| 7 | + { | ||
| 8 | + Text text = gameObject.GetComponent<Text>(); | ||
| 9 | + | ||
| 10 | + if (Screen.dpi < 140) | ||
| 11 | + text.fontSize = 22; | ||
| 12 | + | ||
| 13 | + // 240 | ||
| 14 | + else if (Screen.dpi < 280) | ||
| 15 | + text.fontSize = 30; | ||
| 16 | + | ||
| 17 | + // 320 | ||
| 18 | + else if (Screen.dpi < 400) | ||
| 19 | + text.fontSize = 38; | ||
| 20 | + | ||
| 21 | + // 480 | ||
| 22 | + else if (Screen.dpi < 500) | ||
| 23 | + text.fontSize = 46; | ||
| 24 | + | ||
| 25 | + else | ||
| 26 | + text.fontSize = 54; | ||
| 27 | + } | ||
| 28 | + | ||
| 29 | +} |
| @@ -0,0 +1,12 @@ | @@ -0,0 +1,12 @@ | ||
| 1 | +fileFormatVersion: 2 | ||
| 2 | +guid: a7be422a80edfef4f8e4e8a6aca4378e | ||
| 3 | +timeCreated: 1456251341 | ||
| 4 | +licenseType: Pro | ||
| 5 | +MonoImporter: | ||
| 6 | + serializedVersion: 2 | ||
| 7 | + defaultReferences: [] | ||
| 8 | + executionOrder: 0 | ||
| 9 | + icon: {instanceID: 0} | ||
| 10 | + userData: | ||
| 11 | + assetBundleName: | ||
| 12 | + assetBundleVariant: |
Assets/Scripts/UI/ScreenManager.cs
| @@ -12,6 +12,7 @@ public class ScreenManager : MonoBehaviour { | @@ -12,6 +12,7 @@ public class ScreenManager : MonoBehaviour { | ||
| 12 | public GameObject translateScreen; | 12 | public GameObject translateScreen; |
| 13 | public GameObject dictScreen; | 13 | public GameObject dictScreen; |
| 14 | public GameObject tutorialScreen; | 14 | public GameObject tutorialScreen; |
| 15 | + public GameObject makersScreen; | ||
| 15 | 16 | ||
| 16 | public SwitchImageAttribute textButtonImage; | 17 | public SwitchImageAttribute textButtonImage; |
| 17 | public SwitchImageAttribute dictButtonImage; | 18 | public SwitchImageAttribute dictButtonImage; |
| @@ -90,6 +91,11 @@ public class ScreenManager : MonoBehaviour { | @@ -90,6 +91,11 @@ public class ScreenManager : MonoBehaviour { | ||
| 90 | { | 91 | { |
| 91 | tutorialScreen.SetActive(false); | 92 | tutorialScreen.SetActive(false); |
| 92 | } | 93 | } |
| 94 | + | ||
| 95 | + if (makersScreen.activeSelf) | ||
| 96 | + { | ||
| 97 | + makersScreen.SetActive(false); | ||
| 98 | + } | ||
| 93 | } | 99 | } |
| 94 | 100 | ||
| 95 | public void switchScreen(GameObject screen) | 101 | public void switchScreen(GameObject screen) |
| @@ -155,4 +161,8 @@ public class ScreenManager : MonoBehaviour { | @@ -155,4 +161,8 @@ public class ScreenManager : MonoBehaviour { | ||
| 155 | this.connectionErrorDialog.SetActive(true); | 161 | this.connectionErrorDialog.SetActive(true); |
| 156 | } | 162 | } |
| 157 | 163 | ||
| 164 | + public void switchToMakersScreen() { | ||
| 165 | + switchScreen(this.makersScreen); | ||
| 166 | + } | ||
| 167 | + | ||
| 158 | } | 168 | } |
| @@ -0,0 +1,29 @@ | @@ -0,0 +1,29 @@ | ||
| 1 | +using UnityEngine; | ||
| 2 | +using UnityEngine.UI; | ||
| 3 | + | ||
| 4 | +public class SliderHandlerResizer : MonoBehaviour { | ||
| 5 | + | ||
| 6 | + protected void Start () | ||
| 7 | + { | ||
| 8 | + Text text = gameObject.GetComponent<Text>(); | ||
| 9 | + | ||
| 10 | + if (Screen.dpi < 140) | ||
| 11 | + text.fontSize = 22; | ||
| 12 | + | ||
| 13 | + // 240 | ||
| 14 | + else if (Screen.dpi < 280) | ||
| 15 | + text.fontSize = 30; | ||
| 16 | + | ||
| 17 | + // 320 | ||
| 18 | + else if (Screen.dpi < 400) | ||
| 19 | + text.fontSize = 38; | ||
| 20 | + | ||
| 21 | + // 480 | ||
| 22 | + else if (Screen.dpi < 500) | ||
| 23 | + text.fontSize = 46; | ||
| 24 | + | ||
| 25 | + else | ||
| 26 | + text.fontSize = 54; | ||
| 27 | + } | ||
| 28 | + | ||
| 29 | +} |
| @@ -0,0 +1,12 @@ | @@ -0,0 +1,12 @@ | ||
| 1 | +fileFormatVersion: 2 | ||
| 2 | +guid: f8ddca5505d51db4fbe6293aa36f2101 | ||
| 3 | +timeCreated: 1456251713 | ||
| 4 | +licenseType: Pro | ||
| 5 | +MonoImporter: | ||
| 6 | + serializedVersion: 2 | ||
| 7 | + defaultReferences: [] | ||
| 8 | + executionOrder: 0 | ||
| 9 | + icon: {instanceID: 0} | ||
| 10 | + userData: | ||
| 11 | + assetBundleName: | ||
| 12 | + assetBundleVariant: |
Assets/Scripts/UI/TutorialManager.cs
| @@ -3,6 +3,8 @@ using UnityEngine.UI; | @@ -3,6 +3,8 @@ using UnityEngine.UI; | ||
| 3 | 3 | ||
| 4 | public class TutorialManager : MonoBehaviour { | 4 | public class TutorialManager : MonoBehaviour { |
| 5 | 5 | ||
| 6 | + public ScreenManager screenManager; | ||
| 7 | + | ||
| 6 | public Text description; | 8 | public Text description; |
| 7 | public Image translateImage; | 9 | public Image translateImage; |
| 8 | public Image micImage; | 10 | public Image micImage; |
| @@ -72,9 +74,9 @@ public class TutorialManager : MonoBehaviour { | @@ -72,9 +74,9 @@ public class TutorialManager : MonoBehaviour { | ||
| 72 | { | 74 | { |
| 73 | if (index == 5) | 75 | if (index == 5) |
| 74 | { | 76 | { |
| 75 | - this.gameObject.SetActive(false); | 77 | + //this.gameObject.SetActive(false); |
| 78 | + this.screenManager.switchToMakersScreen(); | ||
| 76 | 79 | ||
| 77 | - this.index = 0; | ||
| 78 | select(0); | 80 | select(0); |
| 79 | } | 81 | } |
| 80 | else select(this.index + 1); | 82 | else select(this.index + 1); |
ProjectSettings/ProjectSettings.asset
| @@ -153,19 +153,19 @@ PlayerSettings: | @@ -153,19 +153,19 @@ PlayerSettings: | ||
| 153 | AndroidKeystoreName: C:/Users/mateu/Desktop/keystore.keystore | 153 | AndroidKeystoreName: C:/Users/mateu/Desktop/keystore.keystore |
| 154 | AndroidKeyaliasName: | 154 | AndroidKeyaliasName: |
| 155 | AndroidTVCompatibility: 0 | 155 | AndroidTVCompatibility: 0 |
| 156 | - AndroidIsGame: 1 | ||
| 157 | - androidEnableBanner: 1 | 156 | + AndroidIsGame: 0 |
| 157 | + androidEnableBanner: 0 | ||
| 158 | m_AndroidBanners: | 158 | m_AndroidBanners: |
| 159 | - width: 320 | 159 | - width: 320 |
| 160 | height: 180 | 160 | height: 180 |
| 161 | - banner: {fileID: 2800000, guid: 919bd8c190f26ec48b930878bec99f3e, type: 3} | 161 | + banner: {fileID: 0} |
| 162 | androidGamepadSupportLevel: 0 | 162 | androidGamepadSupportLevel: 0 |
| 163 | resolutionDialogBanner: {fileID: 0} | 163 | resolutionDialogBanner: {fileID: 0} |
| 164 | m_BuildTargetIcons: | 164 | m_BuildTargetIcons: |
| 165 | - m_BuildTarget: | 165 | - m_BuildTarget: |
| 166 | m_Icons: | 166 | m_Icons: |
| 167 | - serializedVersion: 2 | 167 | - serializedVersion: 2 |
| 168 | - m_Icon: {fileID: 2800000, guid: 919bd8c190f26ec48b930878bec99f3e, type: 3} | 168 | + m_Icon: {fileID: 2800000, guid: ea7ce2ab1d26fe142a763356a03419f5, type: 3} |
| 169 | m_Width: 128 | 169 | m_Width: 128 |
| 170 | m_Height: 128 | 170 | m_Height: 128 |
| 171 | m_BuildTargetBatching: [] | 171 | m_BuildTargetBatching: [] |