diff --git a/MenuJapa/Assembly-CSharp.csproj b/MenuJapa/Assembly-CSharp.csproj index 80734b8d5c3c54253ee7c67cc77d5779009f5e6e..90b48a7a11616d1297b7da501ba502d2311e043d 100644 --- a/MenuJapa/Assembly-CSharp.csproj +++ b/MenuJapa/Assembly-CSharp.csproj @@ -47,6 +47,7 @@ </ItemGroup> <ItemGroup> <Compile Include="Assets\Scripts\SairJogo.cs" /> + <Compile Include="Assets\Scripts\config.cs" /> <Compile Include="Assets\Scripts\helpScript.cs" /> <Compile Include="Assets\Scripts\ilha.cs" /> <Compile Include="Assets\Scripts\levelManager.cs" /> @@ -54,9 +55,6 @@ <Compile Include="Assets\Scripts\onda.cs" /> <Compile Include="Assets\Scripts\texture2D.cs" /> <None Include="Assets\Fonts\SIL Open Font License.txt" /> - <Reference Include="UnityEngine.Advertisements"> - <HintPath>/opt/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/UnityEngine.Advertisements.dll</HintPath> - </Reference> <Reference Include="UnityEngine.UI"> <HintPath>/opt/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath> </Reference> @@ -72,9 +70,6 @@ <Reference Include="UnityEngine.HoloLens"> <HintPath>/opt/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath> </Reference> - <Reference Include="UnityEngine.Purchasing"> - <HintPath>/opt/Unity/Editor/Data/UnityExtensions/Unity/UnityPurchasing/UnityEngine.Purchasing.dll</HintPath> - </Reference> <Reference Include="UnityEngine.VR"> <HintPath>/opt/Unity/Editor/Data/UnityExtensions/Unity/UnityVR/RuntimeEditor/UnityEngine.VR.dll</HintPath> </Reference> diff --git a/MenuJapa/Assets/Images/configPlaca.png b/MenuJapa/Assets/Images/configPlaca.png new file mode 100644 index 0000000000000000000000000000000000000000..9294935bca357c66ce3bf9e3645c3900b0c25585 Binary files /dev/null and b/MenuJapa/Assets/Images/configPlaca.png differ diff --git a/MenuJapa/Assets/Images/configPlaca.png.meta b/MenuJapa/Assets/Images/configPlaca.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..052a3a8c6c0b1bc1fe4f6d7c8d59f1ece6d13b86 --- /dev/null +++ b/MenuJapa/Assets/Images/configPlaca.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: dce31918804a549f59df0858fe79021f +timeCreated: 1510316001 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/MenuJapa/Assets/Images/icon.png b/MenuJapa/Assets/Images/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c17e368993e2eee44c8c6134f2585287e289eef6 Binary files /dev/null and b/MenuJapa/Assets/Images/icon.png differ diff --git a/MenuJapa/Assets/Images/icon.png.meta b/MenuJapa/Assets/Images/icon.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..97ef5d2bc58d325f56c686fe4cbc745d1e96b5dc --- /dev/null +++ b/MenuJapa/Assets/Images/icon.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 9b82c6c959b0e4ff99fa45fc6ff2e74b +timeCreated: 1510321770 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/MenuJapa/Assets/Images/logop.png b/MenuJapa/Assets/Images/logop.png new file mode 100644 index 0000000000000000000000000000000000000000..3b44cd3f7e584dccd47887ddb9fbe014915e50f1 Binary files /dev/null and b/MenuJapa/Assets/Images/logop.png differ diff --git a/MenuJapa/Assets/Images/logop.png.meta b/MenuJapa/Assets/Images/logop.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..31a6a5ddd83f273b7e92c9dec37a4be043f2e262 --- /dev/null +++ b/MenuJapa/Assets/Images/logop.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: b3f92fb25723142d485d307880e60c7f +timeCreated: 1510160750 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/MenuJapa/Assets/MainMenu.unity b/MenuJapa/Assets/MainMenu.unity index 20fc37684eb12895669aaae5a25a6ccebd4f175b..293690dfcf9e0af157970a1abdc7cf862e031a3f 100644 Binary files a/MenuJapa/Assets/MainMenu.unity and b/MenuJapa/Assets/MainMenu.unity differ diff --git a/MenuJapa/Assets/Scripts/config.cs b/MenuJapa/Assets/Scripts/config.cs new file mode 100644 index 0000000000000000000000000000000000000000..03b5bddbe188013d6c3fe4421d3689e39c969028 --- /dev/null +++ b/MenuJapa/Assets/Scripts/config.cs @@ -0,0 +1,46 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class config : MonoBehaviour { + + private GameObject canv; + [SerializeField] private Text[] texts; + // Use this for initialization + void Start () { + // pegando a referência das placas iniciais para fazer o controle de sumir/aparecer + canv = GameObject.Find("Canvas"); + // Dificuldade 1 = fácil, 2 = médio, 3 = difícil + // Se não existe Dificuldade ainda, nós a definiremos aqui e botaremos como padrão a dificuldade como fácil + if (PlayerPrefs.GetInt("dificuldade") != 1 && PlayerPrefs.GetInt("dificuldade") != 2 && PlayerPrefs.GetInt("dificuldade") != 3) + { + PlayerPrefs.SetInt("dificuldade", 1); + } + // temos que mudar a cor inicial da dificuldade para amarelo, para a pessoa saber em que dificuldade estamos + texts[PlayerPrefs.GetInt("dificuldade")-1].color = new Color(0.9F, 0.79F, 0.31F, 1.0F); // amarelo + // sumimos com a placa de config + gameObject.SetActive(false); + } + + // no click de voltar, fazemos com que o canvas apareça e com que essa placa suma + public void Click () { + canv.SetActive(true); + gameObject.SetActive(false); + } + + // no click de abrir configurações, fazemos com que essa placa apareça e que o canvas com as placas sumam + public void OpenConfig () + { + gameObject.SetActive(true); + canv.SetActive(false); +} + + // quando clicamos para mudar a dificuldade, fazemos com que a cor do botão anterior fique branca, com que a clicada fique amarela e mudamos a playerpref de dificuldade + public void ChangeDiff (int dif) + { + texts[PlayerPrefs.GetInt("dificuldade")-1].color = new Color (1, 1, 1, 1); + texts[dif-1].color = new Color (0.9F, 0.79F, 0.31F, 1.0F); + PlayerPrefs.SetInt("dificuldade", dif); + } +} diff --git a/MenuJapa/Assets/Scripts/config.cs.meta b/MenuJapa/Assets/Scripts/config.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..3a884605d654e523b4590dd0d9fae94e9cf11e4c --- /dev/null +++ b/MenuJapa/Assets/Scripts/config.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 1588552c1362d44c88517a9df7c8a026 +timeCreated: 1510317615 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MenuJapa/ProjectSettings/ProjectSettings.asset b/MenuJapa/ProjectSettings/ProjectSettings.asset index 7a6e2359c62ea98b429028e163c72ef5ad6c8214..9086928476a7d7f95a2fb9aac50777560e4d25d2 100644 Binary files a/MenuJapa/ProjectSettings/ProjectSettings.asset and b/MenuJapa/ProjectSettings/ProjectSettings.asset differ