Last touches

This commit is contained in:
Gerard Gascón 2024-01-28 14:38:07 +01:00
parent 796014c2fd
commit ba4f2ed823
7 changed files with 309 additions and 3 deletions

Binary file not shown.

View file

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: 008c3733e8c61db46a14c3ed247ba10b
AudioImporter:
externalObjects: {}
serializedVersion: 7
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 0.7
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View file

@ -24,6 +24,15 @@ MonoBehaviour:
pitchVariance: 0 pitchVariance: 0
loop: 1 loop: 1
source: {fileID: 0} source: {fileID: 0}
- name: Menu
clip: {fileID: 8300000, guid: 008c3733e8c61db46a14c3ed247ba10b, type: 3}
type: 0
volume: 1
volumeVariance: 0
pitch: 1
pitchVariance: 0
loop: 1
source: {fileID: 0}
- name: 3fallos - name: 3fallos
clip: {fileID: 8300000, guid: 9e416ecd3b54c2147bd3e0634798ec7d, type: 3} clip: {fileID: 8300000, guid: 9e416ecd3b54c2147bd3e0634798ec7d, type: 3}
type: 1 type: 1

View file

@ -202,7 +202,7 @@ Canvas:
m_OverridePixelPerfect: 0 m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0 m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0 m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 0 m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0 m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingOrder: 5 m_SortingOrder: 5
@ -255,6 +255,7 @@ MonoBehaviour:
canvasGroup: {fileID: 19625097} canvasGroup: {fileID: 19625097}
winBackground: {fileID: 1957919960} winBackground: {fileID: 1957919960}
winText: {fileID: 1331759576} winText: {fileID: 1331759576}
backToMenuButton: {fileID: 835021564}
--- !u!1 &23275625 --- !u!1 &23275625
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -5524,6 +5525,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 1957919960} - {fileID: 1957919960}
- {fileID: 1331759576} - {fileID: 1331759576}
- {fileID: 835021564}
m_Father: {fileID: 19625096} m_Father: {fileID: 19625096}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0} m_AnchorMin: {x: 0.5, y: 0}
@ -6477,6 +6479,138 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 5783143251392024687, guid: 5430324ec74b5f04581d090658d90b3e, type: 3} m_CorrespondingSourceObject: {fileID: 5783143251392024687, guid: 5430324ec74b5f04581d090658d90b3e, type: 3}
m_PrefabInstance: {fileID: 804374705} m_PrefabInstance: {fileID: 804374705}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &835021563
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 835021564}
- component: {fileID: 835021567}
- component: {fileID: 835021566}
- component: {fileID: 835021565}
m_Layer: 5
m_Name: BackToMenu
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &835021564
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 835021563}
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: 361312882}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 5.9999886, y: -70.5}
m_SizeDelta: {x: 72, y: 11}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &835021565
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 835021563}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
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: 835021566}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 19625098}
m_TargetAssemblyTypeName: Flow.WinScreen, Assembly-CSharp
m_MethodName: LoadMenu
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 &835021566
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 835021563}
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: 73abcdf449ce51e479bf40385149227c, 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 &835021567
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 835021563}
m_CullTransparentMesh: 1
--- !u!1 &843204719 --- !u!1 &843204719
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View file

@ -6,10 +6,12 @@ using UnityEngine.SceneManagement;
namespace Flow { namespace Flow {
public class MainMenu : MonoBehaviour { public class MainMenu : MonoBehaviour {
private void Start() { private void Start() {
AudioManager.instance.Play("Musica"); AudioManager.instance.Play("Menu");
} }
public void LoadGame() { public void LoadGame() {
AudioManager.instance.FadeOut("Menu", 1f);
AudioManager.instance.FadeIn("Musica", 1f);
SceneManager.LoadScene(sceneBuildIndex: 1); SceneManager.LoadScene(sceneBuildIndex: 1);
} }

View file

@ -1,6 +1,8 @@
using System; using System;
using Audio;
using DG.Tweening; using DG.Tweening;
using UnityEngine; using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.Serialization; using UnityEngine.Serialization;
namespace Flow { namespace Flow {
@ -9,8 +11,15 @@ namespace Flow {
[SerializeField] private RectTransform winBackground; [SerializeField] private RectTransform winBackground;
[SerializeField] private RectTransform winText; [SerializeField] private RectTransform winText;
[SerializeField] private RectTransform backToMenuButton;
private bool _hasWon; private bool _hasWon;
public void LoadMenu() {
AudioManager.instance.FadeOut("Musica", 1f);
AudioManager.instance.FadeIn("Menu", 1f);
SceneManager.LoadScene(sceneBuildIndex: 0);
}
public void Win() { public void Win() {
_hasWon = true; _hasWon = true;
@ -20,13 +29,15 @@ namespace Flow {
winBackground.localScale = new Vector3(0, 0, 1); winBackground.localScale = new Vector3(0, 0, 1);
winText.localScale = new Vector3(0, 0, 1); winText.localScale = new Vector3(0, 0, 1);
backToMenuButton.localScale = new Vector3(0, 0, 1);
winBackground.DOScale(1f, .25f).SetDelay(.5f).SetEase(Ease.OutBack); winBackground.DOScale(1f, .25f).SetDelay(.5f).SetEase(Ease.OutBack);
winText.DOScale(1f, .25f).SetDelay(.55f).SetEase(Ease.OutBack); winText.DOScale(1f, .25f).SetDelay(.55f).SetEase(Ease.OutBack);
backToMenuButton.DOScale(1f, .25f).SetDelay(.6f).SetEase(Ease.OutBack);
} }
private void Update() { private void Update() {
if (_hasWon && Input.anyKeyDown) { if (_hasWon && Input.anyKeyDown) {
Application.Quit(); //Application.Quit();
} }
} }
} }

View file

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