From 5fea83720d5ffebdeb0b28acbf09feb36ecd24b3 Mon Sep 17 00:00:00 2001 From: JonyLucas Date: Fri, 30 Sep 2016 21:39:39 -0300 Subject: [PATCH] Regionalismo: core; New menu button; Checkbox icons --- Assets/Prefabs/RegionListItem.prefab | 14 +++++++------- Assets/RegionSelector.cs | 31 +++++++++++++++++++++++++++++-- Assets/Resources/GUI/menu_btn2.png | Bin 0 -> 2169 bytes Assets/Resources/GUI/menu_btn2.png.meta | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/png redimensionado.meta | 9 +++++++++ Assets/Resources/GUI/png redimensionado/barrade_vel.png | Bin 0 -> 377 bytes Assets/Resources/GUI/png redimensionado/barrade_vel.png.meta | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/png redimensionado/dic_ico_active.png | Bin 0 -> 1649 bytes Assets/Resources/GUI/png redimensionado/dic_ico_active.png.meta | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/png redimensionado/ellipse_2.png | Bin 0 -> 2078 bytes Assets/Resources/GUI/png redimensionado/ellipse_2.png.meta | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/png redimensionado/ellipse_2_2.png | Bin 0 -> 2250 bytes Assets/Resources/GUI/png redimensionado/ellipse_2_2.png.meta | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/png redimensionado/expander.png | Bin 0 -> 356 bytes Assets/Resources/GUI/png redimensionado/expander.png.meta | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/png redimensionado/fast.png | Bin 0 -> 1834 bytes Assets/Resources/GUI/png redimensionado/fast.png.meta | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/png redimensionado/handle.png | Bin 0 -> 968 bytes Assets/Resources/GUI/png redimensionado/handle.png.meta | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/png redimensionado/info_ico.png | Bin 0 -> 2175 bytes Assets/Resources/GUI/png redimensionado/info_ico.png.meta | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/png redimensionado/leg_ico.png | Bin 0 -> 1443 bytes Assets/Resources/GUI/png redimensionado/leg_ico.png.meta | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/png redimensionado/micro_ico.png | Bin 0 -> 1354 bytes Assets/Resources/GUI/png redimensionado/micro_ico.png.meta | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/png redimensionado/pause_ico.png | Bin 0 -> 904 bytes Assets/Resources/GUI/png redimensionado/pause_ico.png.meta | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/png redimensionado/regionalismo_ico.png | Bin 0 -> 1566 bytes Assets/Resources/GUI/png redimensionado/regionalismo_ico.png.meta | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/png redimensionado/selected.png | Bin 0 -> 609 bytes Assets/Resources/GUI/png redimensionado/selected.png.meta | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/png redimensionado/slow.png | Bin 0 -> 1537 bytes Assets/Resources/GUI/png redimensionado/slow.png.meta | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Resources/GUI/png redimensionado/volta_arrow.png | Bin 0 -> 1739 bytes Assets/Resources/GUI/png redimensionado/volta_arrow.png.meta | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Scenes/Main.unity | 41 ++++++++++++++--------------------------- Assets/Scripts/Player Manager/GenericPlayerManager.cs | 76 +++++++++++++++++++++++++++++++++++++++++++++++----------------------------- Assets/Scripts/PlayerManager.cs | 6 +++--- ProjectSettings/GraphicsSettings.asset | 24 ++++++++++++------------ 39 files changed, 1065 insertions(+), 80 deletions(-) create mode 100644 Assets/Resources/GUI/menu_btn2.png create mode 100644 Assets/Resources/GUI/menu_btn2.png.meta create mode 100644 Assets/Resources/GUI/png redimensionado.meta create mode 100644 Assets/Resources/GUI/png redimensionado/barrade_vel.png create mode 100644 Assets/Resources/GUI/png redimensionado/barrade_vel.png.meta create mode 100644 Assets/Resources/GUI/png redimensionado/dic_ico_active.png create mode 100644 Assets/Resources/GUI/png redimensionado/dic_ico_active.png.meta create mode 100644 Assets/Resources/GUI/png redimensionado/ellipse_2.png create mode 100644 Assets/Resources/GUI/png redimensionado/ellipse_2.png.meta create mode 100644 Assets/Resources/GUI/png redimensionado/ellipse_2_2.png create mode 100644 Assets/Resources/GUI/png redimensionado/ellipse_2_2.png.meta create mode 100644 Assets/Resources/GUI/png redimensionado/expander.png create mode 100644 Assets/Resources/GUI/png redimensionado/expander.png.meta create mode 100644 Assets/Resources/GUI/png redimensionado/fast.png create mode 100644 Assets/Resources/GUI/png redimensionado/fast.png.meta create mode 100644 Assets/Resources/GUI/png redimensionado/handle.png create mode 100644 Assets/Resources/GUI/png redimensionado/handle.png.meta create mode 100644 Assets/Resources/GUI/png redimensionado/info_ico.png create mode 100644 Assets/Resources/GUI/png redimensionado/info_ico.png.meta create mode 100644 Assets/Resources/GUI/png redimensionado/leg_ico.png create mode 100644 Assets/Resources/GUI/png redimensionado/leg_ico.png.meta create mode 100644 Assets/Resources/GUI/png redimensionado/micro_ico.png create mode 100644 Assets/Resources/GUI/png redimensionado/micro_ico.png.meta create mode 100644 Assets/Resources/GUI/png redimensionado/pause_ico.png create mode 100644 Assets/Resources/GUI/png redimensionado/pause_ico.png.meta create mode 100644 Assets/Resources/GUI/png redimensionado/regionalismo_ico.png create mode 100644 Assets/Resources/GUI/png redimensionado/regionalismo_ico.png.meta create mode 100644 Assets/Resources/GUI/png redimensionado/selected.png create mode 100644 Assets/Resources/GUI/png redimensionado/selected.png.meta create mode 100644 Assets/Resources/GUI/png redimensionado/slow.png create mode 100644 Assets/Resources/GUI/png redimensionado/slow.png.meta create mode 100644 Assets/Resources/GUI/png redimensionado/volta_arrow.png create mode 100644 Assets/Resources/GUI/png redimensionado/volta_arrow.png.meta diff --git a/Assets/Prefabs/RegionListItem.prefab b/Assets/Prefabs/RegionListItem.prefab index 389294b..a645d16 100644 --- a/Assets/Prefabs/RegionListItem.prefab +++ b/Assets/Prefabs/RegionListItem.prefab @@ -151,14 +151,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0.7931032, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: d210b63ba2d5c22499f56e30b3ff5402, type: 3} + m_Sprite: {fileID: 21300000, guid: 57e77308f4f729a428c756758aca6e4f, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -185,9 +185,9 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 027c7230cdcce254eb1615c2708a1609, type: 3} + m_Sprite: {fileID: 21300000, guid: b9260a4fe271d1f48849e83036e0691b, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -333,10 +333,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 224000011013995246} m_RootOrder: 0 - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.24, y: 0.24} + m_AnchorMax: {x: 0.76, y: 0.76} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &224000011013995246 RectTransform: diff --git a/Assets/RegionSelector.cs b/Assets/RegionSelector.cs index eeca2b1..5fb5de7 100644 --- a/Assets/RegionSelector.cs +++ b/Assets/RegionSelector.cs @@ -7,9 +7,36 @@ using UnityEngine.EventSystems; public class RegionSelector : MonoBehaviour { private readonly Dictionary regions = new Dictionary { - { "Padrão Nacional", "" }, + + { "Padrão Nacional", "" }, + { "Acre", "/AC" }, + { "Alagoas", "/AL" }, + { "Amapá", "/AP" }, + { "Amazonas", "/AM" }, + { "Bahia", "/BA" }, + { "Ceará", "/CE" }, + { "Distrito Federal", "/DF" }, + { "Espírito Santo", "/ES" }, + { "Goiás", "/GO" }, + { "Maranhão", "/MA" }, + { "Mato Grosso", "/MT" }, + { "Mato Grosso do Sul", "/MS" }, + { "Minas Gerais", "/MG" }, + { "Pará", "/PA" }, { "Paraíba", "/PB" }, - { "Pernambuco", "/PE" } + { "Paraná", "/PR"}, + { "Pernambuco", "/PE" }, + { "Piauí", "/PI" }, + { "Rio de Janeiro", "/RJ" }, + { "Rio Grande do Norte", "/RN" }, + { "Rio Grande do Sul", "/RS" }, + { "Rondônia", "/RO" }, + { "Roraima", "/RR" }, + { "Santa Catarina", "/SC" }, + { "São Paulo", "/SP" }, + { "Sergipe", "/SE" }, + { "Tocantins", "/TO" } + }; public PlayerManager manager; diff --git a/Assets/Resources/GUI/menu_btn2.png b/Assets/Resources/GUI/menu_btn2.png new file mode 100644 index 0000000..aea9f78 Binary files /dev/null and b/Assets/Resources/GUI/menu_btn2.png differ diff --git a/Assets/Resources/GUI/menu_btn2.png.meta b/Assets/Resources/GUI/menu_btn2.png.meta new file mode 100644 index 0000000..88adb7e --- /dev/null +++ b/Assets/Resources/GUI/menu_btn2.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: e39b6cc6ad92d7a4a832afbd1fbf778d +timeCreated: 1475279502 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/png redimensionado.meta b/Assets/Resources/GUI/png redimensionado.meta new file mode 100644 index 0000000..cef3ac8 --- /dev/null +++ b/Assets/Resources/GUI/png redimensionado.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: de1659ed32e558d47bb52809c72a3d94 +folderAsset: yes +timeCreated: 1475279501 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/png redimensionado/barrade_vel.png b/Assets/Resources/GUI/png redimensionado/barrade_vel.png new file mode 100644 index 0000000..6971df0 Binary files /dev/null and b/Assets/Resources/GUI/png redimensionado/barrade_vel.png differ diff --git a/Assets/Resources/GUI/png redimensionado/barrade_vel.png.meta b/Assets/Resources/GUI/png redimensionado/barrade_vel.png.meta new file mode 100644 index 0000000..11b1a13 --- /dev/null +++ b/Assets/Resources/GUI/png redimensionado/barrade_vel.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 9e27054bc394a12458db0a95738e6e92 +timeCreated: 1475279501 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/png redimensionado/dic_ico_active.png b/Assets/Resources/GUI/png redimensionado/dic_ico_active.png new file mode 100644 index 0000000..5901c9c Binary files /dev/null and b/Assets/Resources/GUI/png redimensionado/dic_ico_active.png differ diff --git a/Assets/Resources/GUI/png redimensionado/dic_ico_active.png.meta b/Assets/Resources/GUI/png redimensionado/dic_ico_active.png.meta new file mode 100644 index 0000000..b09e054 --- /dev/null +++ b/Assets/Resources/GUI/png redimensionado/dic_ico_active.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: cf31f6bd78f6bc742a59b246ca8df82c +timeCreated: 1475279502 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/png redimensionado/ellipse_2.png b/Assets/Resources/GUI/png redimensionado/ellipse_2.png new file mode 100644 index 0000000..cbeffb7 Binary files /dev/null and b/Assets/Resources/GUI/png redimensionado/ellipse_2.png differ diff --git a/Assets/Resources/GUI/png redimensionado/ellipse_2.png.meta b/Assets/Resources/GUI/png redimensionado/ellipse_2.png.meta new file mode 100644 index 0000000..c48f74d --- /dev/null +++ b/Assets/Resources/GUI/png redimensionado/ellipse_2.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 89867d74596108d47b5de58c3ae42e24 +timeCreated: 1475279501 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/png redimensionado/ellipse_2_2.png b/Assets/Resources/GUI/png redimensionado/ellipse_2_2.png new file mode 100644 index 0000000..ff9085d Binary files /dev/null and b/Assets/Resources/GUI/png redimensionado/ellipse_2_2.png differ diff --git a/Assets/Resources/GUI/png redimensionado/ellipse_2_2.png.meta b/Assets/Resources/GUI/png redimensionado/ellipse_2_2.png.meta new file mode 100644 index 0000000..deb2997 --- /dev/null +++ b/Assets/Resources/GUI/png redimensionado/ellipse_2_2.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 57e77308f4f729a428c756758aca6e4f +timeCreated: 1475279501 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/png redimensionado/expander.png b/Assets/Resources/GUI/png redimensionado/expander.png new file mode 100644 index 0000000..0703d10 Binary files /dev/null and b/Assets/Resources/GUI/png redimensionado/expander.png differ diff --git a/Assets/Resources/GUI/png redimensionado/expander.png.meta b/Assets/Resources/GUI/png redimensionado/expander.png.meta new file mode 100644 index 0000000..abfebc9 --- /dev/null +++ b/Assets/Resources/GUI/png redimensionado/expander.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: e73e5db51c2eb6940a4bcf2f8d8e9446 +timeCreated: 1475279502 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/png redimensionado/fast.png b/Assets/Resources/GUI/png redimensionado/fast.png new file mode 100644 index 0000000..c393e44 Binary files /dev/null and b/Assets/Resources/GUI/png redimensionado/fast.png differ diff --git a/Assets/Resources/GUI/png redimensionado/fast.png.meta b/Assets/Resources/GUI/png redimensionado/fast.png.meta new file mode 100644 index 0000000..45f724f --- /dev/null +++ b/Assets/Resources/GUI/png redimensionado/fast.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 67cfc298721be484192a6c504f4929d1 +timeCreated: 1475279501 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/png redimensionado/handle.png b/Assets/Resources/GUI/png redimensionado/handle.png new file mode 100644 index 0000000..8698d9f Binary files /dev/null and b/Assets/Resources/GUI/png redimensionado/handle.png differ diff --git a/Assets/Resources/GUI/png redimensionado/handle.png.meta b/Assets/Resources/GUI/png redimensionado/handle.png.meta new file mode 100644 index 0000000..fa49ca4 --- /dev/null +++ b/Assets/Resources/GUI/png redimensionado/handle.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 4771153e1e34bf44ba5af2c255ad7fa7 +timeCreated: 1475279501 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/png redimensionado/info_ico.png b/Assets/Resources/GUI/png redimensionado/info_ico.png new file mode 100644 index 0000000..fc172e9 Binary files /dev/null and b/Assets/Resources/GUI/png redimensionado/info_ico.png differ diff --git a/Assets/Resources/GUI/png redimensionado/info_ico.png.meta b/Assets/Resources/GUI/png redimensionado/info_ico.png.meta new file mode 100644 index 0000000..676c14c --- /dev/null +++ b/Assets/Resources/GUI/png redimensionado/info_ico.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: a3f5acc1883a8ae40830cca924c43d21 +timeCreated: 1475279501 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/png redimensionado/leg_ico.png b/Assets/Resources/GUI/png redimensionado/leg_ico.png new file mode 100644 index 0000000..6ced6e3 Binary files /dev/null and b/Assets/Resources/GUI/png redimensionado/leg_ico.png differ diff --git a/Assets/Resources/GUI/png redimensionado/leg_ico.png.meta b/Assets/Resources/GUI/png redimensionado/leg_ico.png.meta new file mode 100644 index 0000000..882089e --- /dev/null +++ b/Assets/Resources/GUI/png redimensionado/leg_ico.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: ca7492c9ea9b6484fbf645f31c3d76d4 +timeCreated: 1475279502 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/png redimensionado/micro_ico.png b/Assets/Resources/GUI/png redimensionado/micro_ico.png new file mode 100644 index 0000000..0879380 Binary files /dev/null and b/Assets/Resources/GUI/png redimensionado/micro_ico.png differ diff --git a/Assets/Resources/GUI/png redimensionado/micro_ico.png.meta b/Assets/Resources/GUI/png redimensionado/micro_ico.png.meta new file mode 100644 index 0000000..64eeb43 --- /dev/null +++ b/Assets/Resources/GUI/png redimensionado/micro_ico.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 11c644d040eb41847986e722cfa72cab +timeCreated: 1475279501 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/png redimensionado/pause_ico.png b/Assets/Resources/GUI/png redimensionado/pause_ico.png new file mode 100644 index 0000000..8ab00ea Binary files /dev/null and b/Assets/Resources/GUI/png redimensionado/pause_ico.png differ diff --git a/Assets/Resources/GUI/png redimensionado/pause_ico.png.meta b/Assets/Resources/GUI/png redimensionado/pause_ico.png.meta new file mode 100644 index 0000000..03d9704 --- /dev/null +++ b/Assets/Resources/GUI/png redimensionado/pause_ico.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 931803dcd0a89df4fa680d9a999bf366 +timeCreated: 1475279501 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/png redimensionado/regionalismo_ico.png b/Assets/Resources/GUI/png redimensionado/regionalismo_ico.png new file mode 100644 index 0000000..bd55411 Binary files /dev/null and b/Assets/Resources/GUI/png redimensionado/regionalismo_ico.png differ diff --git a/Assets/Resources/GUI/png redimensionado/regionalismo_ico.png.meta b/Assets/Resources/GUI/png redimensionado/regionalismo_ico.png.meta new file mode 100644 index 0000000..02551c9 --- /dev/null +++ b/Assets/Resources/GUI/png redimensionado/regionalismo_ico.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: a1a713e14145ac24d9ae5a41621ec58c +timeCreated: 1475279501 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/png redimensionado/selected.png b/Assets/Resources/GUI/png redimensionado/selected.png new file mode 100644 index 0000000..07ded7f Binary files /dev/null and b/Assets/Resources/GUI/png redimensionado/selected.png differ diff --git a/Assets/Resources/GUI/png redimensionado/selected.png.meta b/Assets/Resources/GUI/png redimensionado/selected.png.meta new file mode 100644 index 0000000..5a06623 --- /dev/null +++ b/Assets/Resources/GUI/png redimensionado/selected.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: b9260a4fe271d1f48849e83036e0691b +timeCreated: 1475279502 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/png redimensionado/slow.png b/Assets/Resources/GUI/png redimensionado/slow.png new file mode 100644 index 0000000..024dcb1 Binary files /dev/null and b/Assets/Resources/GUI/png redimensionado/slow.png differ diff --git a/Assets/Resources/GUI/png redimensionado/slow.png.meta b/Assets/Resources/GUI/png redimensionado/slow.png.meta new file mode 100644 index 0000000..5170a56 --- /dev/null +++ b/Assets/Resources/GUI/png redimensionado/slow.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: af746947514e28d4e8c8e86f7fa05ff5 +timeCreated: 1475279501 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/GUI/png redimensionado/volta_arrow.png b/Assets/Resources/GUI/png redimensionado/volta_arrow.png new file mode 100644 index 0000000..40a4312 Binary files /dev/null and b/Assets/Resources/GUI/png redimensionado/volta_arrow.png differ diff --git a/Assets/Resources/GUI/png redimensionado/volta_arrow.png.meta b/Assets/Resources/GUI/png redimensionado/volta_arrow.png.meta new file mode 100644 index 0000000..9213c8f --- /dev/null +++ b/Assets/Resources/GUI/png redimensionado/volta_arrow.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: b8aa0cdebb92ed64e841684e69182f7b +timeCreated: 1475279501 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index a6294ff..19fc06c 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -461,7 +461,7 @@ RectTransform: - {fileID: 2077558508} m_Father: {fileID: 1475726251} m_RootOrder: 1 - m_AnchorMin: {x: 0, y: 0.9} + m_AnchorMin: {x: 0, y: 0.89} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} @@ -472,13 +472,13 @@ MonoBehaviour: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 98883727} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.9117647, b: 0.9117647, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3158,7 +3158,7 @@ RectTransform: m_Father: {fileID: 1356520163} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -3374,7 +3374,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 554210568} m_HandleRect: {fileID: 554210567} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -6099,7 +6099,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1031720609 RectTransform: m_ObjectHideFlags: 0 @@ -6886,7 +6886,6 @@ GameObject: - 224: {fileID: 1153850832} - 222: {fileID: 1153850834} - 114: {fileID: 1153850833} - - 114: {fileID: 1153850835} m_Layer: 5 m_Name: selector m_TagString: Untagged @@ -6909,8 +6908,8 @@ RectTransform: - {fileID: 1112380079} m_Father: {fileID: 1475726251} m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 0.12} - m_AnchorMax: {x: 1, y: 0.89} + m_AnchorMin: {x: 0.045, y: 0.12} + m_AnchorMax: {x: 0.955, y: 0.88} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -6934,18 +6933,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1153850831} ---- !u!114 &1153850835 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1153850831} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1184210157, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_AllowSwitchOff: 0 --- !u!1 &1157915784 GameObject: m_ObjectHideFlags: 0 @@ -9644,8 +9631,8 @@ RectTransform: - {fileID: 98883728} m_Father: {fileID: 1111183377} m_RootOrder: 0 - m_AnchorMin: {x: 0.045, y: 0} - m_AnchorMax: {x: 0.955, y: 0.99} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -10556,7 +10543,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 8a48cc8d9db18b5428dd3a24a66740b0, type: 3} + m_Sprite: {fileID: 21300000, guid: e39b6cc6ad92d7a4a832afbd1fbf778d, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -11600,7 +11587,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1826236680 RectTransform: m_ObjectHideFlags: 0 @@ -13709,8 +13696,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 98883728} m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 0.2} - m_AnchorMax: {x: 1, y: 0.8} + m_AnchorMin: {x: 0.045, y: 0.2} + m_AnchorMax: {x: 0.955, y: 0.74} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} diff --git a/Assets/Scripts/Player Manager/GenericPlayerManager.cs b/Assets/Scripts/Player Manager/GenericPlayerManager.cs index 9aa4802..3e481ec 100644 --- a/Assets/Scripts/Player Manager/GenericPlayerManager.cs +++ b/Assets/Scripts/Player Manager/GenericPlayerManager.cs @@ -38,9 +38,10 @@ public abstract class GenericPlayerManager : MonoBehaviour { protected float fadeLength = 0.6F; public string gloss = ""; + private string regionPath = ""; - // Referencia para o avatar - private GameObject AVATAR; + // Referencia para o avatar + private GameObject AVATAR; // Referencia para o componente animador do avatar private Animation COMPONENT_ANIMATION; public Text SUBTITLES; @@ -464,8 +465,19 @@ public abstract class GenericPlayerManager : MonoBehaviour { private System.Object LOCKER_LOADING = new System.Object(); - /* Carrega animações e reproduz */ - private IEnumerator loadAndPlay(string gloss) + /*Define o regionalismo*/ + public void setRegion(string path) + { + this.regionPath = String.IsNullOrEmpty(path) ? "" : path; + } + + public void clearRegion() + { + setRegion(""); + } + + /* Carrega animações e reproduz */ + private IEnumerator loadAndPlay(string gloss) { lock (LOCKER_LOADING) { @@ -495,40 +507,46 @@ public abstract class GenericPlayerManager : MonoBehaviour { if ( ! nonexistent && ! loaded) { - // Função loadAssetBundle é definida pela classe filha - WWW www = loadAssetBundle(aniName); - - if (www != null) + WWW www = null; + + // Função loadAssetBundle é definida pela classe filha + if (!this.regionPath.Equals("")) + { + string aniNameReg = regionPath + @"\" + aniName; + www = loadAssetBundle(aniNameReg); + if (www != null) yield return null; + } + + if (this.regionPath.Equals("") || www.error != null) + { + www = loadAssetBundle(aniName); + if (www != null) yield return null; + } + + if (www.error == null) { - yield return www; + AssetBundle bundle = www.assetBundle; - AssetBundle bundle = null; - - if (www.error == null) + if (bundle != null && ! String.IsNullOrEmpty(bundle.mainAsset.name)) { - bundle = www.assetBundle; + AnimationClip aniClip = bundle.mainAsset as AnimationClip; + bundle.Unload(false); - if (bundle != null && ! String.IsNullOrEmpty(bundle.mainAsset.name)) + if (aniClip) { - AnimationClip aniClip = bundle.mainAsset as AnimationClip; - bundle.Unload(false); - - if (aniClip) - { - COMPONENT_ANIMATION.AddClip(aniClip, aniName); + COMPONENT_ANIMATION.AddClip(aniClip, aniName); - loadedAssetBundles.Add(aniName); - loaded = true; + loadedAssetBundles.Add(aniName); + loaded = true; - Debug.Log("Bundle \"" + aniName + "\" loaded!"); - } - else UnityEngine.Debug.Log ("Sinal \"" + aniName + "\" foi não carregado corretamente."); + Debug.Log("Bundle \"" + aniName + "\" loaded!"); } - } - else onConnectionError(gloss, aniName); + else UnityEngine.Debug.Log ("Sinal \"" + aniName + "\" foi não carregado corretamente."); + } } - else onConnectionError(gloss, aniName); - } + else onConnectionError(gloss, aniName); + + } // Reproduz palavra if (loaded) diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index 89ea387..dac7e71 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -44,7 +44,7 @@ public class PlayerManager : GenericPlayerManager { public InputField translateScreenText; public ScreenManager screenManager; private string dictWord = null; - private string regionPath = ""; +// private string regionPath = ""; public static string get_connection_status_message(ERROR_STATUS_MESSAGE msg) { @@ -111,14 +111,14 @@ public class PlayerManager : GenericPlayerManager { base.repeat(); } - public void setRegion(string path) { +/* public void setRegion(string path) { this.regionPath = String.IsNullOrEmpty(path) ? "" : path; } public void clearRegion() { setRegion(""); } - +*/ protected override WWW loadAssetBundle(string aniName) { Debug.Log("Requesting bundle: " + " " + aniName); diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 1277112..057c661 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -39,20 +39,20 @@ GraphicsSettings: m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_ShaderSettings_Tier1: - useCascadedShadowMaps: 0 - standardShaderQuality: 0 - useReflectionProbeBoxProjection: 0 - useReflectionProbeBlending: 0 + useCascadedShadowMaps: 1 + standardShaderQuality: 2 + useReflectionProbeBoxProjection: 1 + useReflectionProbeBlending: 1 m_ShaderSettings_Tier2: - useCascadedShadowMaps: 0 - standardShaderQuality: 1 - useReflectionProbeBoxProjection: 0 - useReflectionProbeBlending: 0 + useCascadedShadowMaps: 1 + standardShaderQuality: 2 + useReflectionProbeBoxProjection: 1 + useReflectionProbeBlending: 1 m_ShaderSettings_Tier3: - useCascadedShadowMaps: 0 - standardShaderQuality: 1 - useReflectionProbeBoxProjection: 0 - useReflectionProbeBlending: 0 + useCascadedShadowMaps: 1 + standardShaderQuality: 2 + useReflectionProbeBoxProjection: 1 + useReflectionProbeBlending: 1 m_BuildTargetShaderSettings: [] m_LightmapStripping: 0 m_FogStripping: 0 -- libgit2 0.21.2