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

Videojuegos_Proyecto/Assets/MainMenu/Scripts/MainMenu.cs

@@ -8,6 +8,7 @@ public class MainMenu : MonoBehaviour
 {
 {
 
 
     public void NewGame() {
     public void NewGame() {
+        Time.timeScale = 1;
         Coleccionables.iniciali = false;
         Coleccionables.iniciali = false;
         Coleccionables.niActual = 0;
         Coleccionables.niActual = 0;
         Coleccionables.Modificado();
         Coleccionables.Modificado();
@@ -30,4 +31,9 @@ public class MainMenu : MonoBehaviour
     public void CreditsScene() {
     public void CreditsScene() {
         //Cargar pantalla creditos
         //Cargar pantalla creditos
     }
     }
+
+    public void MainMenuScreen() {
+        Time.timeScale = 1;
+        SceneManager.LoadScene("MenuInicial");
+    }
 }
 }

Videojuegos_Proyecto/Assets/Player/Scripts/Player2D.cs

 using System.Collections;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine;
+using UnityEngine.UI;
+using TMPro;
 
 
 public class Player2D : MonoBehaviour
 public class Player2D : MonoBehaviour
 {
 {
@@ -27,6 +29,8 @@ public class Player2D : MonoBehaviour
     public ParticleSystem efectoInvulnerabilidad;
     public ParticleSystem efectoInvulnerabilidad;
     public ParticleSystem efectoAtaque;
     public ParticleSystem efectoAtaque;
 
 
+    public TextMeshProUGUI nColeccionablesCanvas;
+
     // Start is called before the first frame update
     // Start is called before the first frame update
     void Start()
     void Start()
     {
     {
@@ -56,6 +60,7 @@ public class Player2D : MonoBehaviour
         {
         {
             if (Input.GetKeyDown(KeyCode.K)) { AtaqueMelee(); }
             if (Input.GetKeyDown(KeyCode.K)) { AtaqueMelee(); }
         }
         }
+        nColeccionablesCanvas.text=Coleccionables.cConseguidos[Coleccionables.niActual] + "/" + Coleccionables.cTotales[Coleccionables.niActual];
     }
     }
     
     
 
 
@@ -242,4 +247,6 @@ public class Player2D : MonoBehaviour
     {
     {
         efectoAtaque.Stop();
         efectoAtaque.Stop();
     }
     }
+
+
 }
 }

Videojuegos_Proyecto/Assets/Scripts/Jugador.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System;
 using System;
 using UnityEngine;
 using UnityEngine;
+using UnityEngine.UI;
 
 
 public class Jugador : MonoBehaviour
 public class Jugador : MonoBehaviour
 {
 {
@@ -11,12 +12,19 @@ public class Jugador : MonoBehaviour
 
 
     public bool powerUpInvulnerable;
     public bool powerUpInvulnerable;
 
 
+    public Image corazon1, corazon2, corazon3;
+    public Sprite corazonLleno;
+    public Sprite corazonVacio;
+
+    public Canvas canvasMuerte;
+
     // Start is called before the first frame update
     // Start is called before the first frame update
     void Start()
     void Start()
     {
     {
         vidas = 3;
         vidas = 3;
         tInvulnerable = 0;
         tInvulnerable = 0;
         powerUpInvulnerable = false;
         powerUpInvulnerable = false;
+        canvasMuerte.gameObject.SetActive(false);
     }
     }
 
 
     // Update is called once per frame
     // Update is called once per frame
@@ -27,6 +35,24 @@ public class Jugador : MonoBehaviour
         {
         {
             tInvulnerable -= Time.deltaTime;
             tInvulnerable -= Time.deltaTime;
         }
         }
+
+        if (vidas <= 0)
+        {
+            corazon1.sprite = corazon2.sprite = corazon3.sprite = corazonVacio;
+        }
+        else if (vidas == 1)
+        {
+            corazon1.sprite = corazonLleno;
+            corazon2.sprite = corazon3.sprite = corazonVacio;
+        }
+        else if (vidas == 2)
+        {
+            corazon1.sprite = corazon2.sprite = corazonLleno;
+            corazon3.sprite = corazonVacio;
+        }
+        else if (vidas == 3) {
+            corazon1.sprite = corazon2.sprite = corazon3.sprite = corazonLleno;
+        }
     }
     }
 
 
     private void OnTriggerEnter2D(Collider2D collision)
     private void OnTriggerEnter2D(Collider2D collision)
@@ -59,6 +85,7 @@ public class Jugador : MonoBehaviour
         else
         else
         {
         {
             //Si las vidas se reducen a cero, el jugador muere
             //Si las vidas se reducen a cero, el jugador muere
+            vidas--;
             Muerte();
             Muerte();
         }
         }
     }
     }
@@ -66,6 +93,9 @@ public class Jugador : MonoBehaviour
     public void Muerte()
     public void Muerte()
     {
     {
         //El jugador muere
         //El jugador muere
+        Time.timeScale = 0;
+        canvasMuerte.gameObject.SetActive(true);
         Debug.Log("Muerte");
         Debug.Log("Muerte");
+        
     }
     }
 }
 }

Videojuegos_Proyecto/Library/CurrentLayout.dwlt

@@ -44,10 +44,17 @@ MonoBehaviour:
     y: 30
     y: 30
     width: 1920
     width: 1920
     height: 947
     height: 947
+<<<<<<< HEAD
+  m_MinSize: {x: 681, y: 494}
+  m_MaxSize: {x: 14004, y: 14044}
+  vertical: 0
+  controlID: 116
+=======
   m_MinSize: {x: 683, y: 494}
   m_MinSize: {x: 683, y: 494}
   m_MaxSize: {x: 14004, y: 14044}
   m_MaxSize: {x: 14004, y: 14044}
   vertical: 0
   vertical: 0
   controlID: 31
   controlID: 31
+>>>>>>> origin/Release
 --- !u!114 &3
 --- !u!114 &3
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
@@ -215,10 +222,14 @@ MonoBehaviour:
     y: 0
     y: 0
     width: 1531
     width: 1531
     height: 947
     height: 947
-  m_MinSize: {x: 406, y: 494}
+  m_MinSize: {x: 404, y: 494}
   m_MaxSize: {x: 10002, y: 14044}
   m_MaxSize: {x: 10002, y: 14044}
   vertical: 1
   vertical: 1
+<<<<<<< HEAD
+  controlID: 117
+=======
   controlID: 32
   controlID: 32
+>>>>>>> origin/Release
 --- !u!114 &10
 --- !u!114 &10
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
@@ -239,11 +250,19 @@ MonoBehaviour:
     x: 0
     x: 0
     y: 0
     y: 0
     width: 1531
     width: 1531
+<<<<<<< HEAD
+    height: 573
+  m_MinSize: {x: 404, y: 222}
+  m_MaxSize: {x: 8004, y: 4022}
+  vertical: 0
+  controlID: 118
+=======
     height: 605
     height: 605
   m_MinSize: {x: 406, y: 222}
   m_MinSize: {x: 406, y: 222}
   m_MaxSize: {x: 8006, y: 4022}
   m_MaxSize: {x: 8006, y: 4022}
   vertical: 0
   vertical: 0
   controlID: 33
   controlID: 33
+>>>>>>> origin/Release
 --- !u!114 &11
 --- !u!114 &11
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
@@ -336,20 +355,34 @@ MonoBehaviour:
     m_ShowAllHits: 0
     m_ShowAllHits: 0
     m_SearchArea: 1
     m_SearchArea: 1
     m_Folders:
     m_Folders:
+<<<<<<< HEAD
+    - Assets/MainMenu/Scripts
+  m_ViewMode: 1
+  m_StartGridSize: 64
+  m_LastFolders:
+  - Assets/MainMenu/Scripts
+=======
     - Assets
     - Assets
   m_ViewMode: 1
   m_ViewMode: 1
   m_StartGridSize: 64
   m_StartGridSize: 64
   m_LastFolders:
   m_LastFolders:
   - Assets
   - Assets
+>>>>>>> origin/Release
   m_LastFoldersGridSize: -1
   m_LastFoldersGridSize: -1
   m_LastProjectPath: C:\Users\Colme\Documents\UnityProjects\ProyectoVideojuegos\Videojuegos_Proyecto
   m_LastProjectPath: C:\Users\Colme\Documents\UnityProjects\ProyectoVideojuegos\Videojuegos_Proyecto
   m_LockTracker:
   m_LockTracker:
     m_IsLocked: 0
     m_IsLocked: 0
   m_FolderTreeState:
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
     scrollPos: {x: 0, y: 0}
+<<<<<<< HEAD
+    m_SelectedIDs: c2340000
+    m_LastClickedID: 13506
+    m_ExpandedIDs: 000000003a2a0000503200000833000000ca9a3b
+=======
     m_SelectedIDs: f62a0000
     m_SelectedIDs: f62a0000
     m_LastClickedID: 10998
     m_LastClickedID: 10998
     m_ExpandedIDs: 00000000f62a00002234000000ca9a3b
     m_ExpandedIDs: 00000000f62a00002234000000ca9a3b
+>>>>>>> origin/Release
     m_RenameOverlay:
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_UserAcceptedRename: 0
       m_Name: 
       m_Name: 
@@ -365,7 +398,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 0}
+      m_ClientGUIView: {fileID: 5}
     m_SearchString: 
     m_SearchString: 
     m_CreateAssetUtility:
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_EndAction: {fileID: 0}
@@ -377,7 +410,11 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_SelectedIDs: 
     m_LastClickedID: 0
     m_LastClickedID: 0
+<<<<<<< HEAD
+    m_ExpandedIDs: 000000003a2a0000083300009a330000
+=======
     m_ExpandedIDs: 00000000f62a0000023300002234000026340000
     m_ExpandedIDs: 00000000f62a0000023300002234000026340000
+>>>>>>> origin/Release
     m_RenameOverlay:
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_UserAcceptedRename: 0
       m_Name: 
       m_Name: 
@@ -405,7 +442,11 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
     m_HadKeyboardFocusLastEvent: 1
+<<<<<<< HEAD
+    m_ExpandedInstanceIDs: c6230000382b000000000000982a0000
+=======
     m_ExpandedInstanceIDs: c62300009a350000
     m_ExpandedInstanceIDs: c62300009a350000
+>>>>>>> origin/Release
     m_RenameOverlay:
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_UserAcceptedRename: 0
       m_Name: 
       m_Name: 
@@ -499,7 +540,11 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_SelectedIDs: 
       m_LastClickedID: 0
       m_LastClickedID: 0
+<<<<<<< HEAD
+      m_ExpandedIDs: 38ddffff04deffff74fbffff6a3d0000aa3d0000526a00007a6a0000
+=======
       m_ExpandedIDs: a4c9ffffaad2ffff50d3ffff38faffffea4f0000ee4f0000fa4f0000385000004a500000
       m_ExpandedIDs: a4c9ffffaad2ffff50d3ffff38faffffea4f0000ee4f0000fa4f0000385000004a500000
+>>>>>>> origin/Release
       m_RenameOverlay:
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_UserAcceptedRename: 0
         m_Name: LimiteCaida (3)
         m_Name: LimiteCaida (3)
@@ -559,9 +604,15 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_AudioPlay: 0
   m_Position:
   m_Position:
+<<<<<<< HEAD
+    m_Target: {x: 23.56093, y: 0.9978786, z: -1191.5251}
+    speed: 2
+    m_Value: {x: 23.367008, y: 0.9777405, z: -1191.4423}
+=======
     m_Target: {x: 561.2166, y: 345.9716, z: -107.875}
     m_Target: {x: 561.2166, y: 345.9716, z: -107.875}
     speed: 2
     speed: 2
     m_Value: {x: 561.2166, y: 345.9716, z: -107.875}
     m_Value: {x: 561.2166, y: 345.9716, z: -107.875}
+>>>>>>> origin/Release
   m_RenderMode: 0
   m_RenderMode: 0
   m_CameraMode:
   m_CameraMode:
     drawMode: 0
     drawMode: 0
@@ -594,9 +645,15 @@ MonoBehaviour:
     speed: 2
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
   m_Size:
+<<<<<<< HEAD
+    m_Target: 19.232332
+    speed: 2
+    m_Value: 18.404146
+=======
     m_Target: 768.7896
     m_Target: 768.7896
     speed: 2
     speed: 2
     m_Value: 768.7896
     m_Value: 768.7896
+>>>>>>> origin/Release
   m_Ortho:
   m_Ortho:
     m_Target: 1
     m_Target: 1
     speed: 2
     speed: 2

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

+<<<<<<< HEAD
+{"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":23.560930252075197,"y":0.9978786110877991,"z":-1191.525146484375},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":19.232332229614259,"orthographic":true}
+=======
 {"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}
 {"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}
+>>>>>>> origin/Release

Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe1.log

 Base path: C:/Program Files/Unity/Editor/Data
 Base path: C:/Program Files/Unity/Editor/Data
 Cmd: initializeCompiler
 Cmd: initializeCompiler
-Cmd: compileSnippet
-  api=4 type=0 insize=1152 outsize=2770 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH PROCEDURAL_INSTANCING_ON _ALPHABLEND_ON pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
-Cmd: compileSnippet
-  api=4 type=1 insize=1396 outsize=422 kw=UNITY_PASS_FORWARDBASE _ALPHABLEND_ON pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
-Cmd: compileSnippet
-  api=4 type=0 insize=934 outsize=818 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1

Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe2.log

 Base path: C:/Program Files/Unity/Editor/Data
 Base path: C:/Program Files/Unity/Editor/Data
 Cmd: initializeCompiler
 Cmd: initializeCompiler
-Cmd: compileSnippet
-  api=4 type=1 insize=1152 outsize=638 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH PROCEDURAL_INSTANCING_ON _ALPHABLEND_ON pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
-Cmd: compileSnippet
-  api=4 type=1 insize=934 outsize=282 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1