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

Videojuegos_Proyecto/Assets/MainMenu/Scripts/MainMenu.cs

@@ -24,7 +24,7 @@ public class MainMenu : MonoBehaviour
     }
 
     public void ExtrasScreen() {
-        //Cargar la escena de coleccionables
+        SceneManager.LoadScene("MenuExtras");
     }
 
     public void CreditsScene() {

Videojuegos_Proyecto/Assets/MainMenu/Scripts/MenuExtras.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using TMPro;
+using UnityEngine.UI;
+using UnityEngine.SceneManagement;
+
+public class MenuExtras : MonoBehaviour
+{
+    public GameObject AS;
+
+    public Coleccionables gameManager;
+
+    public TextMeshProUGUI textNivel1;
+
+    public TextMeshProUGUI textInfoNivel1;
+    public TextMeshProUGUI textNumColecNivel1;
+
+    public GameObject SitioImagenPartituraNivel1;
+    public Button botonReproducirNivel1;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        GuardarYCargar.Cargar(gameManager, "slotColeccionables");
+        Coleccionables.CargarDatos();
+
+        //Para el nivel 1
+        if (Coleccionables.cConseguidos[0] < Coleccionables.cTotales[0])
+        {
+            //Aun no se ha desbloqueado la partitura
+            textInfoNivel1.enabled = true;
+            textNumColecNivel1.enabled = true;
+            textNumColecNivel1.text = Coleccionables.cConseguidos[0] + "/" + Coleccionables.cTotales[0];
+
+            SitioImagenPartituraNivel1.SetActive(false);
+            botonReproducirNivel1.gameObject.SetActive(false);
+        }
+        else {
+            //Ya se ha desbloqueado la partitura
+            textInfoNivel1.enabled = false;
+            textNumColecNivel1.enabled = false;
+
+            SitioImagenPartituraNivel1.SetActive(true);
+            botonReproducirNivel1.enabled = true;
+        }
+
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    public void VolverAlMenuAnterior()
+    {
+        SceneManager.LoadScene("MenuInicial");
+    }
+
+    public void ReproducirCancion(int nivel) {
+
+        if (nivel == 1) {
+            AS.GetComponent<AudioSource>().Play();
+        }
+
+    }
+
+}

Videojuegos_Proyecto/Assets/MainMenu/Scripts/MenuExtras.cs.meta

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

Videojuegos_Proyecto/Assets/Prefabs/GameManager.prefab

@@ -74,4 +74,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1907c97001aad5943a7c511192d2d99c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  enemigo: {fileID: 0}
+  enemigo: {fileID: 3326548381514800793, guid: 4cad856fb8f87054e8cb7d66b4d1e74e, type: 3}

Videojuegos_Proyecto/Assets/Scenes/MenuExtras.unity.meta

+fileFormatVersion: 2
+guid: 3dfab5202609ad94c944cde7669b8bd2
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Videojuegos_Proyecto/Assets/Scenes/MenuInicial.unity

@@ -1454,7 +1454,18 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1521503615}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 572894596}
+        m_MethodName: ExtrasScreen
+        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
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
 --- !u!114 &1521503615

Videojuegos_Proyecto/Assets/Scripts/Coleccionables.cs

@@ -76,7 +76,7 @@ public class Coleccionables : MonoBehaviour
     private void Start()
     {
 
-        if (niActual == 0 && SceneManager.GetActiveScene().name != "SeleccionNivel") { 
+        if (niActual == 0 && SceneManager.GetActiveScene().name != "SeleccionNivel" && SceneManager.GetActiveScene().name != "MenuExtras") { 
             for (int i = 0; i < pColecNivel1.Length; i++)
             {
                 if (pColecNivel1[i] != new Vector3(0, 0, 0))

Videojuegos_Proyecto/Assets/Scripts/CrearEnemigos.cs

@@ -12,7 +12,7 @@ public class CrearEnemigos : MonoBehaviour
     void Start()
     {
 
-        if (SceneManager.GetActiveScene().name != "SeleccionNivel") { 
+        if (SceneManager.GetActiveScene().name != "SeleccionNivel" && SceneManager.GetActiveScene().name != "MenuExtras") { 
             Instantiate(enemigo, new Vector3(13, -1.5f, 0), Quaternion.identity);
             //Instantiate(enemigo, new Vector3(20, 0.5f, 0), Quaternion.identity);
             //Instantiate(enemigo, new Vector3(43, 0.5f, 0), Quaternion.identity);

Videojuegos_Proyecto/Assets/himno-a-la-alegria-instrumental.mp3.meta

+fileFormatVersion: 2
+guid: 446fa550884091d4fa3b6f010b11c93f
+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/Library/CurrentLayout.dwlt

@@ -21,7 +21,7 @@ MonoBehaviour:
   m_ShowMode: 4
   m_Title: 
   m_RootView: {fileID: 6}
-  m_MinSize: {x: 950, y: 300}
+  m_MinSize: {x: 950, y: 544}
   m_MaxSize: {x: 10000, y: 10000}
 --- !u!114 &2
 MonoBehaviour:
@@ -44,10 +44,10 @@ MonoBehaviour:
     y: 30
     width: 1920
     height: 947
-  m_MinSize: {x: 679, y: 494}
-  m_MaxSize: {x: 14002, y: 14044}
+  m_MinSize: {x: 683, y: 494}
+  m_MaxSize: {x: 14004, y: 14044}
   vertical: 0
-  controlID: 99
+  controlID: 31
 --- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -67,8 +67,8 @@ MonoBehaviour:
     y: 0
     width: 389
     height: 947
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 277, y: 72}
+  m_MaxSize: {x: 4002, y: 4022}
   m_ActualView: {fileID: 14}
   m_Panes:
   - {fileID: 14}
@@ -92,7 +92,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 379
-    height: 573
+    height: 605
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 15}
@@ -116,9 +116,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 573
+    y: 605
     width: 1531
-    height: 374
+    height: 342
   m_MinSize: {x: 232, y: 272}
   m_MaxSize: {x: 10002, y: 10022}
   m_ActualView: {fileID: 13}
@@ -215,10 +215,10 @@ MonoBehaviour:
     y: 0
     width: 1531
     height: 947
-  m_MinSize: {x: 404, y: 494}
+  m_MinSize: {x: 406, y: 494}
   m_MaxSize: {x: 10002, y: 14044}
   vertical: 1
-  controlID: 34
+  controlID: 32
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -239,11 +239,11 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 1531
-    height: 573
-  m_MinSize: {x: 404, y: 222}
-  m_MaxSize: {x: 8004, y: 4022}
+    height: 605
+  m_MinSize: {x: 406, y: 222}
+  m_MaxSize: {x: 8006, y: 4022}
   vertical: 0
-  controlID: 35
+  controlID: 33
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -262,7 +262,7 @@ MonoBehaviour:
     x: 379
     y: 0
     width: 1152
-    height: 573
+    height: 605
   m_MinSize: {x: 204, y: 222}
   m_MaxSize: {x: 4004, y: 4022}
   m_ActualView: {fileID: 16}
@@ -320,9 +320,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 646
+    y: 678
     width: 1531
-    height: 355
+    height: 323
   m_ViewDataDictionary: {fileID: 0}
   m_SearchFilter:
     m_NameFilter: 
@@ -336,20 +336,20 @@ MonoBehaviour:
     m_ShowAllHits: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Prefabs
+    - Assets
   m_ViewMode: 1
   m_StartGridSize: 64
   m_LastFolders:
-  - Assets/Prefabs
+  - Assets
   m_LastFoldersGridSize: -1
-  m_LastProjectPath: C:\Users\alvmo\Documents\NetBeansProjects\DesarrolloDeVideojuegos_Proyecto\Videojuegos_Proyecto
+  m_LastProjectPath: C:\Users\Colme\Documents\UnityProjects\ProyectoVideojuegos\Videojuegos_Proyecto
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: f4360000
-    m_LastClickedID: 14068
-    m_ExpandedIDs: 00000000502c00001835000000ca9a3b
+    m_SelectedIDs: f62a0000
+    m_LastClickedID: 10998
+    m_ExpandedIDs: 00000000f62a00002234000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -377,7 +377,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000502c000018350000
+    m_ExpandedIDs: 00000000f62a0000023300002234000026340000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -405,7 +405,7 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: c6230000382b000000000000
+    m_ExpandedInstanceIDs: c62300009a350000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -431,7 +431,7 @@ MonoBehaviour:
     m_NewAssetIndexInList: -1
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 64
-  m_DirectoriesAreaWidth: 222
+  m_DirectoriesAreaWidth: 186
 --- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -492,37 +492,37 @@ MonoBehaviour:
     x: 0
     y: 73
     width: 379
-    height: 554
+    height: 586
   m_ViewDataDictionary: {fileID: 0}
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 48ddffffc2ddffff36deffff68deffff9adeffffc4e6ffffd4f9ffff82faffff
+      m_ExpandedIDs: a4c9ffffaad2ffff50d3ffff38faffffea4f0000ee4f0000fa4f0000385000004a500000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: 
-        m_OriginalName: 
+        m_Name: LimiteCaida (3)
+        m_OriginalName: LimiteCaida (3)
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 0
+        m_UserData: -13824
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 11
+        m_OriginalEventType: 0
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 3}
+        m_ClientGUIView: {fileID: 4}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
     m_LockTracker:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
-  m_WindowGUID: cf3b61c3a385de7479efe14818e50265
+  m_WindowGUID: e4f845058af2fed45a9fd11aeb1bc7f9
 --- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -547,10 +547,10 @@ MonoBehaviour:
     x: 379
     y: 73
     width: 1150
-    height: 554
+    height: 586
   m_ViewDataDictionary: {fileID: 0}
   m_ShowContextualTools: 0
-  m_WindowGUID: 4ba86f2f34ca3b44b989fe737b3c2e65
+  m_WindowGUID: 43dad88c062228f459455f7a9fa529fd
   m_Gizmos: 1
   m_SceneIsLit: 1
   m_SceneLighting: 1
@@ -559,9 +559,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 17.940483, y: 1.6945136, z: -163.5933}
+    m_Target: {x: 561.2166, y: 345.9716, z: -107.875}
     speed: 2
-    m_Value: {x: 17.185574, y: 1.5686953, z: -163.45775}
+    m_Value: {x: 561.2166, y: 345.9716, z: -107.875}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -594,9 +594,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 31.498034
+    m_Target: 768.7896
     speed: 2
-    m_Value: 30.141659
+    m_Value: 768.7896
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -645,7 +645,7 @@ MonoBehaviour:
     x: 379
     y: 73
     width: 1150
-    height: 554
+    height: 586
   m_ViewDataDictionary: {fileID: 0}
   m_VSyncEnabled: 0
   m_MaximizeOnPlay: 0
@@ -660,8 +660,8 @@ MonoBehaviour:
     vZoomLockedByDefault: 0
     m_HBaseRangeMin: -575
     m_HBaseRangeMax: 575
-    m_VBaseRangeMin: -268.5
-    m_VBaseRangeMax: 268.5
+    m_VBaseRangeMin: -284.5
+    m_VBaseRangeMax: 284.5
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -680,9 +680,9 @@ MonoBehaviour:
       x: 0
       y: 17
       width: 1150
-      height: 537
+      height: 569
     m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 575, y: 268.5}
+    m_Translation: {x: 575, y: 284.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
@@ -690,14 +690,14 @@ MonoBehaviour:
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
       x: -575
-      y: -268.5
+      y: -284.5
       width: 1150
-      height: 537
+      height: 569
     m_MinimalGUI: 1
   m_defaultScale: 1
   m_TargetTexture: {fileID: 0}
   m_CurrentColorSpace: 0
-  m_LastWindowPixelSize: {x: 1150, y: 554}
+  m_LastWindowPixelSize: {x: 1150, y: 586}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -724,7 +724,7 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 646
+    y: 678
     width: 1531
-    height: 355
+    height: 323
   m_ViewDataDictionary: {fileID: 0}

Videojuegos_Proyecto/Library/LastSceneManagerSetup.txt

 sceneSetups:
-- path: Assets/Scenes/SampleScene.unity
+- path: Assets/Scenes/MenuExtras.unity
   isLoaded: 1
   isActive: 1
   isSubScene: 0

Videojuegos_Proyecto/Library/StateCache/SceneView/43dad8-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":18.764812469482423,"y":-2.7877025604248049,"z":-0.078125},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":21.010000228881837,"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":561.2166137695313,"y":345.9715881347656,"z":-107.875},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":768.7896118164063,"orthographic":true}
\ No newline at end of file

Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe0.log

-Base path: C:/Program Files/Unity/Editor/Data
+Base path: C:/Program Files/Unity/Hub/Editor/2019.1.11f1/Editor/Data
 Cmd: initializeCompiler

Videojuegos_Proyecto/ProjectSettings/EditorBuildSettings.asset

@@ -14,4 +14,7 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/SampleScene.unity
     guid: 2cda990e2423bbf4892e6590ba056729
+  - enabled: 1
+    path: Assets/Scenes/MenuExtras.unity
+    guid: 3dfab5202609ad94c944cde7669b8bd2
   m_configObjects: {}

Videojuegos_Proyecto/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache

-ffeba46d040eb84d2da74aeed6850bddc816cc90
+9bb7645d24da14589dcb039782a424259830b31e