Merge remote-tracking branch 'origin/Release' into Diseño-menu-extras

Videojuegos_Proyecto/Assets/Music.meta

+fileFormatVersion: 2
+guid: 340bc2dd96a3a13408f02ea9d9f6a36b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Videojuegos_Proyecto/Assets/Music/MusicTales_MenuInicial.wav.meta

+fileFormatVersion: 2
+guid: fe3f44e0bbc4be943802896e36ceaec1
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Videojuegos_Proyecto/Assets/Prefabs/Musica.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2114081506731414285
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2114081506731414287}
+  - component: {fileID: 2114081506731414284}
+  - component: {fileID: -3729884049664289227}
+  m_Layer: 0
+  m_Name: Musica
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2114081506731414287
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2114081506731414285}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -2.8107114, y: -1.2284359, z: -161.03223}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!82 &2114081506731414284
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2114081506731414285}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 8300000, guid: fe3f44e0bbc4be943802896e36ceaec1, type: 3}
+  m_PlayOnAwake: 1
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+--- !u!114 &-3729884049664289227
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2114081506731414285}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bc252f7a1dcca424d99046696f2f5335, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

Videojuegos_Proyecto/Assets/Prefabs/Musica.prefab.meta

+fileFormatVersion: 2
+guid: 8e30a5e6158f5374184178db3778780b
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Videojuegos_Proyecto/Assets/Scenes/MenuInicial.unity

@@ -277,6 +277,75 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 20336598}
   m_CullTransparentMesh: 0
+--- !u!1001 &380371351
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2114081506731414285, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_Name
+      value: Musica
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -2.8107114
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.2284359
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -161.03223
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8e30a5e6158f5374184178db3778780b, type: 3}
 --- !u!1 &395722973
 GameObject:
   m_ObjectHideFlags: 0

Videojuegos_Proyecto/Assets/Scenes/SeleccionNivel.unity

@@ -629,6 +629,75 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 687002374}
   m_CullTransparentMesh: 0
+--- !u!1001 &779997739
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2114081506731414285, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_Name
+      value: Musica
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -2.8107114
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.2284359
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -161.03223
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8e30a5e6158f5374184178db3778780b, type: 3}
 --- !u!1 &868349782
 GameObject:
   m_ObjectHideFlags: 0

Videojuegos_Proyecto/Assets/Scripts/Musica.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Musica : MonoBehaviour
+{
+    public static Musica musica;
+
+    private void Awake()
+    {
+        if (musica == null)
+        {
+            musica = this;
+            DontDestroyOnLoad(gameObject);
+        }else if (musica != null)
+        {
+            Destroy(gameObject);
+        }
+    }
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Videojuegos_Proyecto/Assets/Scripts/Musica.cs.meta

+fileFormatVersion: 2
+guid: bc252f7a1dcca424d99046696f2f5335
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Videojuegos_Proyecto/Library/StateCache/SceneView/4ba86f-mainStage.json

-{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-8.045736312866211,"y":1.2080817222595215,"z":-161.0326690673828},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":7.729910373687744,"orthographic":true}
\ No newline at end of file
+{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":17.94048309326172,"y":1.6945135593414307,"z":-163.5933074951172},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":31.49803352355957,"orthographic":true}
\ No newline at end of file