From 84a34deec689fd75835e238d2253320a2e13bb87 Mon Sep 17 00:00:00 2001 From: Geri Date: Sat, 27 Jan 2024 20:17:18 +0100 Subject: [PATCH] feature: Added lives --- Assets/Scenes/Main.unity | 20 +++ Assets/Scripts/Flow.meta | 3 + Assets/Scripts/Flow/Lives.cs | 36 +++++ Assets/Scripts/Flow/Lives.cs.meta | 3 + Assets/Scripts/Messaging/Typer/Message.cs | 20 +-- .../Scripts/Messaging/Typer/MessageManager.cs | 34 +++-- Assets/Scripts/Messaging/Typer/TextTyper.cs | 3 + ...ite-0001.png.meta => AvatarBalon.png.meta} | 2 +- Assets/Sprites/AvatarPerrete.png.meta | 127 ++++++++++++++++++ Assets/Sprites/BotonCreditos.png.meta | 127 ++++++++++++++++++ Assets/Sprites/BotonJugar.png.meta | 127 ++++++++++++++++++ Assets/Sprites/BotonOpciones.png.meta | 127 ++++++++++++++++++ Assets/Sprites/BotonSalir.png.meta | 127 ++++++++++++++++++ Assets/Sprites/Cinta.png.meta | 127 ++++++++++++++++++ Assets/Sprites/Logo.png.meta | 127 ++++++++++++++++++ Assets/Sprites/Sprite-0001.asset | 108 --------------- Assets/Sprites/Sprite-0001.asset.meta | 8 -- Assets/Sprites/Sprite-0001.png | Bin 163 -> 0 bytes Assets/Sprites/emojis.png.meta | 44 ++++++ 19 files changed, 1036 insertions(+), 134 deletions(-) create mode 100644 Assets/Scripts/Flow.meta create mode 100644 Assets/Scripts/Flow/Lives.cs create mode 100644 Assets/Scripts/Flow/Lives.cs.meta rename Assets/Sprites/{Sprite-0001.png.meta => AvatarBalon.png.meta} (98%) create mode 100644 Assets/Sprites/AvatarPerrete.png.meta create mode 100644 Assets/Sprites/BotonCreditos.png.meta create mode 100644 Assets/Sprites/BotonJugar.png.meta create mode 100644 Assets/Sprites/BotonOpciones.png.meta create mode 100644 Assets/Sprites/BotonSalir.png.meta create mode 100644 Assets/Sprites/Cinta.png.meta create mode 100644 Assets/Sprites/Logo.png.meta delete mode 100644 Assets/Sprites/Sprite-0001.asset delete mode 100644 Assets/Sprites/Sprite-0001.asset.meta delete mode 100644 Assets/Sprites/Sprite-0001.png diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index d281819..4aa014a 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -1715,6 +1715,7 @@ GameObject: - component: {fileID: 1637937847} - component: {fileID: 1637937846} - component: {fileID: 1637937845} + - component: {fileID: 1637937849} m_Layer: 5 m_Name: TriesCanvas m_TagString: Untagged @@ -1805,6 +1806,24 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!114 &1637937849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1637937844} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4ac00191cb424148b6fbefc0c595175b, type: 3} + m_Name: + m_EditorClassIdentifier: + lives: + - {fileID: 780374632} + - {fileID: 279922736} + - {fileID: 590262795} + correctLive: {fileID: -773788709396254583, guid: 128ff2869c2580344a74d2dc6b9d9e6a, type: 3} + wrongLive: {fileID: -8337258921713572487, guid: 128ff2869c2580344a74d2dc6b9d9e6a, type: 3} --- !u!1 &1717907689 GameObject: m_ObjectHideFlags: 0 @@ -2076,6 +2095,7 @@ MonoBehaviour: - {fileID: 4900000, guid: bf2ae237b56a65648a26e0fc41a94d8a, type: 3} - {fileID: 4900000, guid: ec37bca099ef3e847b3be147fcfe4d9e, type: 3} sendJokeDelay: 2 + sendJokeLongDelay: 8 initialSendJokeDelay: 4 --- !u!1001 &1825731470 PrefabInstance: diff --git a/Assets/Scripts/Flow.meta b/Assets/Scripts/Flow.meta new file mode 100644 index 0000000..87c6b53 --- /dev/null +++ b/Assets/Scripts/Flow.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0e73f9d340ab4a6596779492ca8fa9f1 +timeCreated: 1706381395 \ No newline at end of file diff --git a/Assets/Scripts/Flow/Lives.cs b/Assets/Scripts/Flow/Lives.cs new file mode 100644 index 0000000..e7ea183 --- /dev/null +++ b/Assets/Scripts/Flow/Lives.cs @@ -0,0 +1,36 @@ +using System; +using UnityEngine; +using UnityEngine.Serialization; +using UnityEngine.UI; + +namespace Flow { + public class Lives : MonoBehaviour { + + [SerializeField] private Image[] lives; + [SerializeField] private Sprite correctLive; + [SerializeField] private Sprite wrongLive; + + public int CurrentLives { private set; get; } + + private void Awake() { + ResetLives(); + } + + public void Wrong() { + CurrentLives--; + + int timesHurt = lives.Length - CurrentLives; + for (int i = 0; i < timesHurt; i++) { + lives[i].sprite = wrongLive; + } + } + + public void ResetLives() { + CurrentLives = lives.Length; + + foreach (Image life in lives) { + life.sprite = correctLive; + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Flow/Lives.cs.meta b/Assets/Scripts/Flow/Lives.cs.meta new file mode 100644 index 0000000..667cb9f --- /dev/null +++ b/Assets/Scripts/Flow/Lives.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4ac00191cb424148b6fbefc0c595175b +timeCreated: 1706381399 \ No newline at end of file diff --git a/Assets/Scripts/Messaging/Typer/Message.cs b/Assets/Scripts/Messaging/Typer/Message.cs index b9bd884..a6bfc89 100644 --- a/Assets/Scripts/Messaging/Typer/Message.cs +++ b/Assets/Scripts/Messaging/Typer/Message.cs @@ -45,7 +45,7 @@ namespace Messaging { } } - public void SetMessageRealText(string text, bool animate, bool isAnswer) { + public Coroutine SetMessageRealText(string text, bool animate, bool isAnswer) { RealText = text; IsAnswer = isAnswer; IsReal = true; @@ -54,17 +54,19 @@ namespace Messaging { SetText(ref answerContainer.RealTypingCoroutine, answerContainer.realMessageText, answerContainer.RealTextTyper, text, animate); - if(string.IsNullOrEmpty(text)) return; + if(string.IsNullOrEmpty(text)) return null; answerContainer.container.SetActive(true); questionContainer.container.SetActive(false); - } else { - SetText(ref questionContainer.RealTypingCoroutine, questionContainer.realMessageText, - questionContainer.RealTextTyper, text, animate); - - if(string.IsNullOrEmpty(text)) return; - questionContainer.container.SetActive(true); - answerContainer.container.SetActive(false); + return answerContainer.RealTypingCoroutine; } + + SetText(ref questionContainer.RealTypingCoroutine, questionContainer.realMessageText, + questionContainer.RealTextTyper, text, animate); + + if(string.IsNullOrEmpty(text)) return null; + questionContainer.container.SetActive(true); + answerContainer.container.SetActive(false); + return questionContainer.RealTypingCoroutine; } private void SetText(ref Coroutine routine, TMP_Text tmpText, TextTyper typer, string text, bool animate) { diff --git a/Assets/Scripts/Messaging/Typer/MessageManager.cs b/Assets/Scripts/Messaging/Typer/MessageManager.cs index 6fc3410..4a10001 100644 --- a/Assets/Scripts/Messaging/Typer/MessageManager.cs +++ b/Assets/Scripts/Messaging/Typer/MessageManager.cs @@ -1,7 +1,9 @@ using System; +using System.Collections; using System.Collections.Generic; using System.Text.RegularExpressions; using System.Threading.Tasks; +using Flow; using UnityEngine; using Random = UnityEngine.Random; @@ -13,16 +15,20 @@ namespace Messaging { [SerializeField] private TextAsset[] jokes; [SerializeField, Min(0)] private float sendJokeDelay = 2f; + [SerializeField, Min(0)] private float sendJokeLongDelay = 8f; [SerializeField, Min(0)] private float initialSendJokeDelay = 4f; private List _jokesBag; private MessageData.MessageData _currentJoke; private int _currentJokeIndex; + + private Lives _lives; private void Awake() { _messages = messageStructureGenerator.GenerateMessages(); _jokesBag = new List(jokes); + _lives = FindObjectOfType(); } private void Start() { @@ -41,32 +47,44 @@ namespace Messaging { _currentJokeIndex--; _currentJokeIndex = Mathf.Max(_currentJokeIndex, 0); if (message == _currentJoke.AnswerMessage.Key) { - ModifyRealMessageText(_currentJoke.QuestionMessage.Value, _currentJokeIndex, false); - ModifyRealMessageText(_currentJoke.AnswerMessage.Value, _messages.Length - 1, true); - SendRandomJoke(sendJokeDelay); + StartCoroutine(ShowRealTexts()); + if(_currentJokeIndex == 0) + SendRandomJoke(sendJokeLongDelay); + else + SendRandomJoke(sendJokeDelay); } else { - //TODO: Add lives support + _lives.Wrong(); + if (_lives.CurrentLives == 0) { + StartCoroutine(ShowRealTexts()); + SendRandomJoke(sendJokeLongDelay); + _lives.ResetLives(); + } } } else { _currentJokeIndex = _messages.Length - 1; } } + IEnumerator ShowRealTexts() { + yield return ModifyRealMessageText(_currentJoke.QuestionMessage.Value, _currentJokeIndex, false); + yield return ModifyRealMessageText(_currentJoke.AnswerMessage.Value, _messages.Length - 1, true); + } + private void ModifyMessageText(string message, int index, bool isAnswer) { ModifyPreviousMessage(index); _messages[index].SetMessageText(message, true, isAnswer); } - private void ModifyRealMessageText(string message, int index, bool isAnswer) { - _messages[index].SetMessageRealText(message, true, isAnswer); + private Coroutine ModifyRealMessageText(string message, int index, bool isAnswer) { + return _messages[index].SetMessageRealText(message, true, isAnswer); } - private void ModifyPreviousMessage(int index) { + private Coroutine ModifyPreviousMessage(int index) { ModifyPreviousMessage(_messages[index].Text, _messages[index].RealText, index - 1, _messages[index].IsAnswer, _messages[index].IsReal); _messages[index].SetMessageText("", false, _messages[index].IsAnswer); - _messages[index].SetMessageRealText("", false, _messages[index].IsAnswer); + return _messages[index].SetMessageRealText("", false, _messages[index].IsAnswer); } private MessageData.MessageData GetRandomJoke() { diff --git a/Assets/Scripts/Messaging/Typer/TextTyper.cs b/Assets/Scripts/Messaging/Typer/TextTyper.cs index f54ea43..04023f7 100644 --- a/Assets/Scripts/Messaging/Typer/TextTyper.cs +++ b/Assets/Scripts/Messaging/Typer/TextTyper.cs @@ -24,6 +24,9 @@ namespace Messaging.Typer { if (ShouldShowNextCharacter(timeOfLastCharacter)) { if (_textBox.maxVisibleCharacters <= _textBox.textInfo.characterCount) { _textBox.maxVisibleCharacters++; + if (_textBox.text[_textBox.maxVisibleCharacters - 1] == ' ') { + _textBox.maxVisibleCharacters++; + } timeOfLastCharacter = Time.unscaledTime; if (_textBox.maxVisibleCharacters == _textBox.textInfo.characterCount) { onFinish?.Invoke(); diff --git a/Assets/Sprites/Sprite-0001.png.meta b/Assets/Sprites/AvatarBalon.png.meta similarity index 98% rename from Assets/Sprites/Sprite-0001.png.meta rename to Assets/Sprites/AvatarBalon.png.meta index efdd382..91924b1 100644 --- a/Assets/Sprites/Sprite-0001.png.meta +++ b/Assets/Sprites/AvatarBalon.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 801ac9074fdefb740bd8d86392c3d0d5 +guid: 81cf7a32db45a594aabf77d8a7e65353 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Sprites/AvatarPerrete.png.meta b/Assets/Sprites/AvatarPerrete.png.meta new file mode 100644 index 0000000..4c2cc53 --- /dev/null +++ b/Assets/Sprites/AvatarPerrete.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: a28ebfaf2bca1ca408938b7eeb907e21 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/BotonCreditos.png.meta b/Assets/Sprites/BotonCreditos.png.meta new file mode 100644 index 0000000..5057903 --- /dev/null +++ b/Assets/Sprites/BotonCreditos.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 31d83dd289c3c774d9dde67771866842 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/BotonJugar.png.meta b/Assets/Sprites/BotonJugar.png.meta new file mode 100644 index 0000000..6b54070 --- /dev/null +++ b/Assets/Sprites/BotonJugar.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 81c507f81646aa34ab7cd19e62add084 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/BotonOpciones.png.meta b/Assets/Sprites/BotonOpciones.png.meta new file mode 100644 index 0000000..884cd92 --- /dev/null +++ b/Assets/Sprites/BotonOpciones.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: f64fb7450d107bf4aa355bde22080605 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/BotonSalir.png.meta b/Assets/Sprites/BotonSalir.png.meta new file mode 100644 index 0000000..ad983dd --- /dev/null +++ b/Assets/Sprites/BotonSalir.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: e47d256192fa0ca4a95bd201cc19ee02 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Cinta.png.meta b/Assets/Sprites/Cinta.png.meta new file mode 100644 index 0000000..36626d3 --- /dev/null +++ b/Assets/Sprites/Cinta.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: e2b6a4bf16ed2fd4f9ecf43c3a3d1fc8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Logo.png.meta b/Assets/Sprites/Logo.png.meta new file mode 100644 index 0000000..5371f0b --- /dev/null +++ b/Assets/Sprites/Logo.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 77be0709c05c16142ad2922bcf1fc861 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Sprite-0001.asset b/Assets/Sprites/Sprite-0001.asset deleted file mode 100644 index 0c6d4ee..0000000 --- a/Assets/Sprites/Sprite-0001.asset +++ /dev/null @@ -1,108 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 84a92b25f83d49b9bc132d206b370281, type: 3} - m_Name: Sprite-0001 - m_EditorClassIdentifier: - hashCode: -1579524987 - material: {fileID: 8949633185332001125} - materialHashCode: 0 - m_Version: 1.1.0 - m_FaceInfo: - m_FaceIndex: 0 - m_FamilyName: - m_StyleName: - m_PointSize: 0 - m_Scale: 0 - m_UnitsPerEM: 0 - m_LineHeight: 0 - m_AscentLine: 0 - m_CapLine: 0 - m_MeanLine: 0 - m_Baseline: 0 - m_DescentLine: 0 - m_SuperscriptOffset: 0 - m_SuperscriptSize: 0 - m_SubscriptOffset: 0 - m_SubscriptSize: 0 - m_UnderlineOffset: 0 - m_UnderlineThickness: 0 - m_StrikethroughOffset: 0 - m_StrikethroughThickness: 0 - m_TabWidth: 0 - spriteSheet: {fileID: 2800000, guid: 801ac9074fdefb740bd8d86392c3d0d5, type: 3} - m_SpriteCharacterTable: - - m_ElementType: 2 - m_Unicode: 65534 - m_GlyphIndex: 0 - m_Scale: 1 - m_Name: Sprite-0001 - m_HashCode: -1579524987 - m_SpriteGlyphTable: - - m_Index: 0 - m_Metrics: - m_Width: 16 - m_Height: 16 - m_HorizontalBearingX: 0 - m_HorizontalBearingY: 16 - m_HorizontalAdvance: 16 - m_GlyphRect: - m_X: 0 - m_Y: 0 - m_Width: 16 - m_Height: 16 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - sprite: {fileID: 21300000, guid: 801ac9074fdefb740bd8d86392c3d0d5, type: 3} - spriteInfoList: [] - fallbackSpriteAssets: [] ---- !u!21 &8949633185332001125 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: TextMeshPro/Sprite - m_Shader: {fileID: 4800000, guid: cf81c85f95fe47e1a27f6ae460cf182c, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 2800000, guid: 801ac9074fdefb740bd8d86392c3d0d5, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _CullMode: 0 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} - - _Color: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Sprites/Sprite-0001.asset.meta b/Assets/Sprites/Sprite-0001.asset.meta deleted file mode 100644 index 94b33ad..0000000 --- a/Assets/Sprites/Sprite-0001.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c6efd181f7c7e0e4a948f2794e650a40 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/Sprite-0001.png b/Assets/Sprites/Sprite-0001.png deleted file mode 100644 index 7eff69b52cc2eef6bb01fc92a6a99771f4488abf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Vm)0PLo9li z2D|eyDDW&g_P;(dUyV;IBY)ckM}q^4b>DkzkSuCHSmPU>j~<9imcwuY}1PM zU-z>u7haPfb)hrM@!|qT2UXt34m+ZLp7!t)erbQg?bN$TCNB;Zsl0h~IchG@A_h-a KKbLh*2~7ZCi8)6A diff --git a/Assets/Sprites/emojis.png.meta b/Assets/Sprites/emojis.png.meta index 7f086f3..9d62c16 100644 --- a/Assets/Sprites/emojis.png.meta +++ b/Assets/Sprites/emojis.png.meta @@ -802,6 +802,48 @@ TextureImporter: indices: edges: [] weights: [] + - serializedVersion: 2 + name: emojis_33 + rect: + serializedVersion: 2 + x: 64 + y: 238 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9450f3b5f25e13947920a7237f12f4b7 + internalID: -2107887754 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: emojis_34 + rect: + serializedVersion: 2 + x: 80 + y: 238 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 031efb48f2ec71e4fba1c987e8000fb1 + internalID: -113662094 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -840,6 +882,8 @@ TextureImporter: emojis_30: -1840223752 emojis_31: -1413055195 emojis_32: 796189935 + emojis_33: -2107887754 + emojis_34: -113662094 emojis_4: -720792206 emojis_5: 518185219 emojis_6: -579113010