Build settings and animations

This commit is contained in:
Gerard Gascón 2024-01-28 13:54:44 +01:00
parent 38c0bcaef4
commit b95544d7cb
19 changed files with 1904 additions and 129 deletions

8
Assets/Animations.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 610cb8dd744c78b46b605d240c9cea8b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-1171986804776966914
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 6362454745651076803}
m_Position: {x: 200, y: 0, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 6362454745651076803}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Canvas
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -1171986804776966914}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &6362454745651076803
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: MainMenu
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: cd468df21656cc943a13b1e332ad54e1, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 58010a507f87f0843bc8717fe792f090
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cd468df21656cc943a13b1e332ad54e1
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View file

@ -66,7 +66,7 @@ MonoBehaviour:
volume: 1 volume: 1
volumeVariance: 0 volumeVariance: 0
pitch: 1 pitch: 1
pitchVariance: 0 pitchVariance: 0.1
loop: 0 loop: 0
source: {fileID: 0} source: {fileID: 0}
- name: hover - name: hover
@ -75,7 +75,7 @@ MonoBehaviour:
volume: 1 volume: 1
volumeVariance: 0 volumeVariance: 0
pitch: 1 pitch: 1
pitchVariance: 0 pitchVariance: 0.1
loop: 0 loop: 0
source: {fileID: 0} source: {fileID: 0}
- name: recibir_mensaje - name: recibir_mensaje

View file

@ -4162,6 +4162,51 @@ RectTransform:
m_AnchoredPosition: {x: 16, y: -212} m_AnchoredPosition: {x: 16, y: -212}
m_SizeDelta: {x: 258, y: 32} m_SizeDelta: {x: 258, y: 32}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!1 &2094642250
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2094642252}
- component: {fileID: 2094642251}
m_Layer: 0
m_Name: AudioManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &2094642251
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2094642250}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b824c4cae81b29e41acd7881949b2789, type: 3}
m_Name:
m_EditorClassIdentifier:
soundList: {fileID: 11400000, guid: 946b525ec69fbe845a7440de624fd8a9, type: 2}
--- !u!4 &2094642252
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2094642250}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 885.44244, y: 269.9818, z: -6.3779187}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2129526353 --- !u!1001 &2129526353
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -4423,3 +4468,4 @@ SceneRoots:
- {fileID: 1352489080} - {fileID: 1352489080}
- {fileID: 1198578939} - {fileID: 1198578939}
- {fileID: 19625096} - {fileID: 19625096}
- {fileID: 2094642252}

View file

@ -135,6 +135,7 @@ GameObject:
- component: {fileID: 179030658} - component: {fileID: 179030658}
- component: {fileID: 179030657} - component: {fileID: 179030657}
- component: {fileID: 179030656} - component: {fileID: 179030656}
- component: {fileID: 179030659}
m_Layer: 5 m_Layer: 5
m_Name: PlayButton m_Name: PlayButton
m_TagString: Untagged m_TagString: Untagged
@ -158,7 +159,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 196, y: -113} m_AnchoredPosition: {x: 196, y: -133}
m_SizeDelta: {x: 89, y: 16} m_SizeDelta: {x: 89, y: 16}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!114 &179030656 --- !u!114 &179030656
@ -255,126 +256,18 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 179030654} m_GameObject: {fileID: 179030654}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &528200377 --- !u!114 &179030659
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 528200378}
- component: {fileID: 528200381}
- component: {fileID: 528200380}
- component: {fileID: 528200379}
m_Layer: 5
m_Name: CreditsButton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &528200378
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 528200377}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1303338551}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 188, y: -140}
m_SizeDelta: {x: 104, y: 16}
m_Pivot: {x: 0, y: 1}
--- !u!114 &528200379
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 528200377} m_GameObject: {fileID: 179030654}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Script: {fileID: 11500000, guid: 7c108da9c1667e843b2c2776e187057e, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 0
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 528200380}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &528200380
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 528200377}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 31d83dd289c3c774d9dde67771866842, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &528200381
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 528200377}
m_CullTransparentMesh: 1
--- !u!1 &664457098 --- !u!1 &664457098
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -450,6 +343,51 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 664457098} m_GameObject: {fileID: 664457098}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &704469944
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 704469946}
- component: {fileID: 704469945}
m_Layer: 0
m_Name: AudioManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &704469945
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 704469944}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b824c4cae81b29e41acd7881949b2789, type: 3}
m_Name:
m_EditorClassIdentifier:
soundList: {fileID: 11400000, guid: 946b525ec69fbe845a7440de624fd8a9, type: 2}
--- !u!4 &704469946
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 704469944}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 885.44244, y: 269.9818, z: -6.3779187}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &915136367 --- !u!1 &915136367
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -557,7 +495,6 @@ RectTransform:
- {fileID: 664457099} - {fileID: 664457099}
- {fileID: 915136368} - {fileID: 915136368}
- {fileID: 179030655} - {fileID: 179030655}
- {fileID: 528200378}
- {fileID: 1696153758} - {fileID: 1696153758}
m_Father: {fileID: 1769819444} m_Father: {fileID: 1769819444}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -670,6 +607,7 @@ GameObject:
- component: {fileID: 1696153761} - component: {fileID: 1696153761}
- component: {fileID: 1696153760} - component: {fileID: 1696153760}
- component: {fileID: 1696153759} - component: {fileID: 1696153759}
- component: {fileID: 1696153762}
m_Layer: 5 m_Layer: 5
m_Name: QuitButton m_Name: QuitButton
m_TagString: Untagged m_TagString: Untagged
@ -739,7 +677,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1696153760} m_TargetGraphic: {fileID: 1696153760}
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls:
- m_Target: {fileID: 1769819445}
m_TargetAssemblyTypeName: Flow.MainMenu, Assembly-CSharp
m_MethodName: QuitGame
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1696153760 --- !u!114 &1696153760
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -778,6 +728,18 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1696153757} m_GameObject: {fileID: 1696153757}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!114 &1696153762
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1696153757}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7c108da9c1667e843b2c2776e187057e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1769819440 --- !u!1 &1769819440
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -791,6 +753,7 @@ GameObject:
- component: {fileID: 1769819442} - component: {fileID: 1769819442}
- component: {fileID: 1769819441} - component: {fileID: 1769819441}
- component: {fileID: 1769819445} - component: {fileID: 1769819445}
- component: {fileID: 1769819446}
m_Layer: 5 m_Layer: 5
m_Name: Canvas m_Name: Canvas
m_TagString: Untagged m_TagString: Untagged
@ -893,6 +856,27 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7398bc374b9e57e4fb95861c2fb07f2b, type: 3} m_Script: {fileID: 11500000, guid: 7398bc374b9e57e4fb95861c2fb07f2b, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!95 &1769819446
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1769819440}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 58010a507f87f0843bc8717fe792f090, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &1795360675 --- !u!1 &1795360675
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1043,3 +1027,4 @@ SceneRoots:
- {fileID: 1560325475} - {fileID: 1560325475}
- {fileID: 1769819444} - {fileID: 1769819444}
- {fileID: 1938195252} - {fileID: 1938195252}
- {fileID: 704469946}

View file

@ -1,10 +1,20 @@
using System;
using Audio;
using UnityEngine; using UnityEngine;
using UnityEngine.SceneManagement; using UnityEngine.SceneManagement;
namespace Flow { namespace Flow {
public class MainMenu : MonoBehaviour { public class MainMenu : MonoBehaviour {
private void Start() {
AudioManager.instance.Play("Musica");
}
public void LoadGame() { public void LoadGame() {
SceneManager.LoadScene(sceneBuildIndex: 1); SceneManager.LoadScene(sceneBuildIndex: 1);
} }
public void QuitGame() {
Application.Quit();
}
} }
} }

View file

@ -1,4 +1,5 @@
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Audio;
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
@ -24,6 +25,7 @@ namespace Messaging.Composer {
private readonly Regex _removeRegex = new(@"<([a-z]+)(?![^>]*\/>)[^>]*>(?!.*<([a-z]+)(?![^>]*\/>)[^>]*>)"); private readonly Regex _removeRegex = new(@"<([a-z]+)(?![^>]*\/>)[^>]*>(?!.*<([a-z]+)(?![^>]*\/>)[^>]*>)");
public void WriteEmoji(string emoji) { public void WriteEmoji(string emoji) {
AudioManager.instance.PlayOneShot("click");
if (GetRemainingIcons() <= 0) return; if (GetRemainingIcons() <= 0) return;
_iconsWritten++; _iconsWritten++;
@ -34,6 +36,7 @@ namespace Messaging.Composer {
private int GetRemainingIcons() => _numberIcons - _iconsWritten; private int GetRemainingIcons() => _numberIcons - _iconsWritten;
public void RemoveEmoji() { public void RemoveEmoji() {
AudioManager.instance.PlayOneShot("borrar");
string newText = _removeRegex.Replace(fieldText.text, ""); string newText = _removeRegex.Replace(fieldText.text, "");
if (newText != fieldText.text) { if (newText != fieldText.text) {
_iconsWritten--; _iconsWritten--;

View file

@ -4,6 +4,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using Audio;
using Flow; using Flow;
using Messaging.Composer; using Messaging.Composer;
using UnityEngine; using UnityEngine;
@ -50,6 +51,7 @@ namespace Messaging {
_sendButton.Unlock(); _sendButton.Unlock();
_currentJoke = GetRandomJoke(); _currentJoke = GetRandomJoke();
AudioManager.instance.PlayOneShot("recibir_mensaje");
CreateMessage(_currentJoke.QuestionMessage.Key, false); CreateMessage(_currentJoke.QuestionMessage.Key, false);
_emojiButtonManager.SetButtonImages(GenerateButtonOptions()); _emojiButtonManager.SetButtonImages(GenerateButtonOptions());
} }
@ -61,6 +63,7 @@ namespace Messaging {
_sendButton.Unlock(); _sendButton.Unlock();
_currentJoke = GetRandomJoke(); _currentJoke = GetRandomJoke();
AudioManager.instance.PlayOneShot("recibir_mensaje");
CreateMessage(_currentJoke.QuestionMessage.Key, false); CreateMessage(_currentJoke.QuestionMessage.Key, false);
_emojiButtonManager.SetButtonImages(GenerateButtonOptions()); _emojiButtonManager.SetButtonImages(GenerateButtonOptions());
} }
@ -72,23 +75,24 @@ namespace Messaging {
_currentJokeIndex = Mathf.Max(_currentJokeIndex, 0); _currentJokeIndex = Mathf.Max(_currentJokeIndex, 0);
if (message == _currentJoke.AnswerMessage.Key) { if (message == _currentJoke.AnswerMessage.Key) {
_sendButton.Lock(); _sendButton.Lock();
bool isCorrect = _currentJokeIndex != 0;
if (isCorrect) { AudioManager.instance.Play("correcto");
if (FindObjectOfType<ProgressBar>().AddProgress()) if (FindObjectOfType<ProgressBar>().AddProgress())
return; return;
}
Coroutine routine = StartCoroutine(ShowRealTexts(isCorrect)); Coroutine routine = StartCoroutine(ShowRealTexts(true));
StartCoroutine(SendRandomJoke(routine, sendJokeDelay)); StartCoroutine(SendRandomJoke(routine, sendJokeDelay));
_lives.ResetLives(); _lives.ResetLives();
} else { } else {
_lives.Wrong(); _lives.Wrong();
if (_lives.CurrentLives == 0) { if (_lives.CurrentLives == 0) {
AudioManager.instance.Play("3fallos");
_sendButton.Lock(); _sendButton.Lock();
Coroutine routine = StartCoroutine(ShowRealTexts(false)); Coroutine routine = StartCoroutine(ShowRealTexts(false));
StartCoroutine(SendRandomJoke(routine, initialSendJokeDelay)); StartCoroutine(SendRandomJoke(routine, initialSendJokeDelay));
_lives.ResetLives(); _lives.ResetLives();
} else {
AudioManager.instance.Play("zumbido");
} }
} }
} else { } else {

View file

@ -1,5 +1,6 @@
using System; using System;
using System.Collections; using System.Collections;
using Audio;
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
@ -23,6 +24,7 @@ namespace Messaging.Typer {
while (true) { while (true) {
if (ShouldShowNextCharacter(timeOfLastCharacter)) { if (ShouldShowNextCharacter(timeOfLastCharacter)) {
if (_textBox.maxVisibleCharacters <= _textBox.textInfo.characterCount) { if (_textBox.maxVisibleCharacters <= _textBox.textInfo.characterCount) {
AudioManager.instance.PlayOneShot("escribir");
_textBox.maxVisibleCharacters++; _textBox.maxVisibleCharacters++;
if (_textBox.text[_textBox.maxVisibleCharacters - 1] == ' ') { if (_textBox.text[_textBox.maxVisibleCharacters - 1] == ' ') {
_textBox.maxVisibleCharacters++; _textBox.maxVisibleCharacters++;

View file

@ -0,0 +1,13 @@
using Audio;
using UnityEngine;
using UnityEngine.EventSystems;
public class HoverClickSound : MonoBehaviour, IPointerEnterHandler, IPointerClickHandler {
public void OnPointerEnter(PointerEventData eventData) {
AudioManager.instance.PlayOneShot("hover");
}
public void OnPointerClick(PointerEventData eventData) {
AudioManager.instance.PlayOneShot("click");
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 7c108da9c1667e843b2c2776e187057e
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View file

@ -0,0 +1,127 @@
fileFormatVersion: 2
guid: e8481257bfaf2a24d98f393cf06f6e21
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: 0
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: 0
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:

BIN
Assets/Sprites/icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

View file

@ -0,0 +1,127 @@
fileFormatVersion: 2
guid: 03bddab7402707040b494cd7877d116f
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:

View file

@ -12,17 +12,17 @@ PlayerSettings:
targetDevice: 2 targetDevice: 2
useOnDemandResources: 0 useOnDemandResources: 0
accelerometerFrequency: 60 accelerometerFrequency: 60
companyName: DefaultCompany companyName: Cutreconos
productName: MalagaJam productName: Emojiji
defaultCursor: {fileID: 0} defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0} cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} m_SplashScreenBackgroundColor: {r: 0.21960784, g: 0.21960784, b: 0.21960784, a: 1}
m_ShowUnitySplashScreen: 1 m_ShowUnitySplashScreen: 1
m_ShowUnitySplashLogo: 1 m_ShowUnitySplashLogo: 1
m_SplashScreenOverlayOpacity: 1 m_SplashScreenOverlayOpacity: 1
m_SplashScreenAnimation: 1 m_SplashScreenAnimation: 0
m_SplashScreenLogoStyle: 1 m_SplashScreenLogoStyle: 1
m_SplashScreenDrawMode: 0 m_SplashScreenDrawMode: 1
m_SplashScreenBackgroundAnimationZoom: 1 m_SplashScreenBackgroundAnimationZoom: 1
m_SplashScreenLogoAnimationZoom: 1 m_SplashScreenLogoAnimationZoom: 1
m_SplashScreenBackgroundLandscapeAspect: 1 m_SplashScreenBackgroundLandscapeAspect: 1
@ -39,7 +39,11 @@ PlayerSettings:
y: 0 y: 0
width: 1 width: 1
height: 1 height: 1
m_SplashScreenLogos: [] m_SplashScreenLogos:
- logo: {fileID: 10404, guid: 0000000000000000f000000000000000, type: 0}
duration: 2
- logo: {fileID: 21300000, guid: e8481257bfaf2a24d98f393cf06f6e21, type: 3}
duration: 4
m_VirtualRealitySplashScreen: {fileID: 0} m_VirtualRealitySplashScreen: {fileID: 0}
m_HolographicTrackingLossScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0}
defaultScreenWidth: 1920 defaultScreenWidth: 1920
@ -277,7 +281,14 @@ PlayerSettings:
AndroidMinifyDebug: 0 AndroidMinifyDebug: 0
AndroidValidateAppBundleSize: 1 AndroidValidateAppBundleSize: 1
AndroidAppBundleSizeToValidate: 150 AndroidAppBundleSizeToValidate: 150
m_BuildTargetIcons: [] m_BuildTargetIcons:
- m_BuildTarget:
m_Icons:
- serializedVersion: 2
m_Icon: {fileID: 2800000, guid: 03bddab7402707040b494cd7877d116f, type: 3}
m_Width: 128
m_Height: 128
m_Kind: 0
m_BuildTargetPlatformIcons: [] m_BuildTargetPlatformIcons: []
m_BuildTargetBatching: [] m_BuildTargetBatching: []
m_BuildTargetShaderSettings: [] m_BuildTargetShaderSettings: []