Merge branch 'Release' into Power_Ups

Videojuegos_Proyecto/Assets/MainMenu/Scripts/SeleccionNivel.cs

@@ -30,6 +30,7 @@ public class SeleccionNivel : MonoBehaviour
     public void SeleccionarNivel(int numeroNivel)
     {
         Coleccionables.niActual = numeroNivel;
+        Coleccionables.Modificado();
         SceneManager.LoadScene("SampleScene"); // SceneManager.LoadScene("Nivel" + numeroNivel);
         
     }

Videojuegos_Proyecto/Assets/Player/Prefabs/DisparoBlanca.prefab

@@ -15,7 +15,7 @@ GameObject:
   - component: {fileID: 3665294836788846838}
   m_Layer: 0
   m_Name: DisparoBlanca
-  m_TagString: Untagged
+  m_TagString: BalaFlauta
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -131,5 +131,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5826fc580708fb9428ba9526b71e3b33, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  prefabColeccionable: {fileID: 6914436123365519657, guid: bb9f2d39e14ac4c4493c44a6cc1ddc3b,
+    type: 3}
   velocidadDisparoFlauta: 6
   duracionDisparoFlauta: 3

Videojuegos_Proyecto/Assets/Player/Prefabs/DisparosCorcheas.prefab

@@ -15,7 +15,7 @@ GameObject:
   - component: {fileID: 6213653337795431838}
   m_Layer: 0
   m_Name: DisparoCorchea2
-  m_TagString: Untagged
+  m_TagString: BalaGuitarra
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -131,6 +131,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9e842bc08877b954da64c1162f355a16, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  prefabColeccionable: {fileID: 6914436123365519657, guid: bb9f2d39e14ac4c4493c44a6cc1ddc3b,
+    type: 3}
 --- !u!1 &6213653338870642002
 GameObject:
   m_ObjectHideFlags: 0
@@ -246,7 +248,7 @@ GameObject:
   - component: {fileID: 3589760484591723536}
   m_Layer: 0
   m_Name: DisparoCorchea1
-  m_TagString: Untagged
+  m_TagString: BalaGuitarra
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -362,6 +364,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9e842bc08877b954da64c1162f355a16, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  prefabColeccionable: {fileID: 6914436123365519657, guid: bb9f2d39e14ac4c4493c44a6cc1ddc3b,
+    type: 3}
 --- !u!1 &8566419871933135904
 GameObject:
   m_ObjectHideFlags: 0
@@ -377,7 +381,7 @@ GameObject:
   - component: {fileID: 1662186839793251387}
   m_Layer: 0
   m_Name: DisparoCorchea0
-  m_TagString: Untagged
+  m_TagString: BalaGuitarra
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -493,3 +497,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9e842bc08877b954da64c1162f355a16, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  prefabColeccionable: {fileID: 6914436123365519657, guid: bb9f2d39e14ac4c4493c44a6cc1ddc3b,
+    type: 3}

Videojuegos_Proyecto/Assets/Player/Scripts/BalaFlauta.cs

@@ -4,6 +4,7 @@ using UnityEngine;
 
 public class BalaFlauta : MonoBehaviour
 {
+    public GameObject prefabColeccionable;
 
     public float velocidadDisparoFlauta = 6;
     public float duracionDisparoFlauta = 3;
@@ -31,13 +32,13 @@ public class BalaFlauta : MonoBehaviour
     
     private void OnTriggerEnter2D(Collider2D collision)
     {
-        //Para cuando entre la bala en un enemigo.
-
         //Que se destruyan al chocar con el suelo o una pared
         if (collision.gameObject.tag == "Suelo")
         {
             Destroy(this.gameObject);
         }
+        
+
     }
 
 }

Videojuegos_Proyecto/Assets/Player/Scripts/BalaGuitarra.cs

@@ -4,6 +4,7 @@ using UnityEngine;
 
 public class BalaGuitarra : MonoBehaviour
 {
+
     // Start is called before the first frame update
     void Start()
     {
@@ -18,13 +19,12 @@ public class BalaGuitarra : MonoBehaviour
 
     private void OnTriggerEnter2D(Collider2D collision)
     {
-        //Para cuando entre la bala en un enemigo.
-
         //Que se destruyan al chocar con el suelo o una pared
         if (collision.gameObject.tag == "Suelo")
         {
             Destroy(this.gameObject);
         }
+        
     }
 
 }

Videojuegos_Proyecto/Assets/Player/Scripts/Player2D.cs

@@ -168,17 +168,7 @@ public class Player2D : MonoBehaviour
 
         animator.SetTrigger("GolpeandoMelee");
         
-        Collider2D[] enemigosGolpeados;
-        if (!spriteRenderer.flipX) {
-            enemigosGolpeados = Physics2D.OverlapCircleAll(spawnDisparosDerecha.transform.position,0.5f,layersEnemigos);
-        }
-        else
-        {
-            enemigosGolpeados = Physics2D.OverlapCircleAll(spawnDisparosIzquierda.transform.position, 0.5f, layersEnemigos);
-        }
-        foreach (Collider2D enemigo in enemigosGolpeados) {
-            Debug.Log("Golpe a "+ enemigo.name); //Sustituir por llamar a la funcion del enemigo para que le quite vida o lo destruya
-        }
+
         timeSiguienteAtaque = Time.time + 1f / ratioAtaqueMelee;
     }
 
@@ -209,8 +199,8 @@ public class Player2D : MonoBehaviour
             Coleccionables.Modificado();
             Destroy(collision.gameObject);
 
-            //Quitar este Debug.Log cuando tengamos el nivel actual
-            Debug.Log(Coleccionables.cConseguidos[Coleccionables.niActual] + "/" + Coleccionables.cTotales[Coleccionables.niActual]);
+            //Quitar este Debug.Log cuando tengamos el HUD
+            Debug.Log("Coleccionables: "+Coleccionables.cConseguidos[Coleccionables.niActual] + "/" + Coleccionables.cTotales[Coleccionables.niActual]);
         }
     }
 }

Videojuegos_Proyecto/Assets/Prefabs/EnemigoEjemplo.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3326548381514800793
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3326548381514800795}
+  - component: {fileID: 3326548381514800792}
+  - component: {fileID: 3326548381514800794}
+  - component: {fileID: 3326548381514800797}
+  - component: {fileID: 4435491010459611782}
+  m_Layer: 8
+  m_Name: EnemigoEjemplo
+  m_TagString: Enemigo
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3326548381514800795
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3326548381514800793}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -10.025, y: -2.108, z: 0}
+  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!212 &3326548381514800792
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3326548381514800793}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 86ce912717672b8429c58e6960c12e25, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1.28, y: 1.28}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!61 &3326548381514800794
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3326548381514800793}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0.06306815, y: 0.00000017881393}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0.5, y: 0.5}
+    oldSize: {x: 1.28, y: 1.28}
+    newSize: {x: 1.28, y: 1.28}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 1.1034093, y: 0.7418183}
+  m_EdgeRadius: 0
+--- !u!50 &3326548381514800797
+Rigidbody2D:
+  serializedVersion: 4
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3326548381514800793}
+  m_BodyType: 0
+  m_Simulated: 1
+  m_UseFullKinematicContacts: 0
+  m_UseAutoMass: 0
+  m_Mass: 1
+  m_LinearDrag: 0
+  m_AngularDrag: 0.05
+  m_GravityScale: 1
+  m_Material: {fileID: 0}
+  m_Interpolate: 0
+  m_SleepingMode: 1
+  m_CollisionDetection: 0
+  m_Constraints: 0
+--- !u!114 &4435491010459611782
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3326548381514800793}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 82ace38098eedee4bb60e1b360991384, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  prefabColeccionable: {fileID: 6914436123365519657, guid: bb9f2d39e14ac4c4493c44a6cc1ddc3b,
+    type: 3}
+  speed: 0.8

Videojuegos_Proyecto/Assets/Prefabs/EnemigoEjemplo.prefab.meta

+fileFormatVersion: 2
+guid: 4cad856fb8f87054e8cb7d66b4d1e74e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Videojuegos_Proyecto/Assets/Prefabs/GameManager.prefab

@@ -10,6 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 7736364748447018736}
   - component: {fileID: 3174322665456641310}
+  - component: {fileID: 1646803205624574402}
   m_Layer: 0
   m_Name: GameManager
   m_TagString: Untagged
@@ -43,10 +44,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 94ed2c62992ea584eb669871b1668a3c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  inicializado: 0
   prefabColeccionable: {fileID: 6914436123365519657, guid: bb9f2d39e14ac4c4493c44a6cc1ddc3b,
     type: 3}
   NO_TOCAR_LAS_VARIABLES_DESDE_AQUI: 1
   numeroNiveles: 1
+  nivelActual: 0
   coleccTotales: 00000000
   colecConseguidos: 00000000
   enemigosTotales: 00000000
@@ -59,3 +62,16 @@ MonoBehaviour:
   - {x: 0, y: 0, z: 0}
   - {x: 0, y: 0, z: 0}
   - {x: 0, y: 0, z: 0}
+--- !u!114 &1646803205624574402
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7736364748447018738}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1907c97001aad5943a7c511192d2d99c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  enemigo: {fileID: 0}

Videojuegos_Proyecto/Assets/Prefabs/PlayerV2.prefab

@@ -13,9 +13,10 @@ GameObject:
   - component: {fileID: 5415114670227481225}
   - component: {fileID: 5415114670227481230}
   - component: {fileID: 5415114670227481224}
+  - component: {fileID: 9185189218782277443}
   - component: {fileID: 5415114670227481231}
   m_Layer: 0
-  m_Name: PlayerV2 1
+  m_Name: PlayerV2
   m_TagString: Player
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -152,6 +153,18 @@ Animator:
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!114 &9185189218782277443
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5415114670227481229}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fb387e14ec85d764aa2bdac5ed1eb3cb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &5415114670227481231
 MonoBehaviour:
   m_ObjectHideFlags: 0

Videojuegos_Proyecto/Assets/Scripts/Coleccionables.cs

 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 
 public class Coleccionables : MonoBehaviour
 {
@@ -75,6 +76,7 @@ public class Coleccionables : MonoBehaviour
     private void Start()
     {
 
+        if (niActual == 0 && SceneManager.GetActiveScene().name != "SeleccionNivel") { 
             for (int i = 0; i < pColecNivel1.Length; i++)
             {
                 if (pColecNivel1[i] != new Vector3(0, 0, 0))
@@ -83,6 +85,8 @@ public class Coleccionables : MonoBehaviour
                     Instantiate(prefabColeccionable, pColecNivel1[i], Quaternion.identity);
                 }
             }
+        }
+
         Modificado();
     }
 
@@ -130,3 +134,24 @@ public class Coleccionables : MonoBehaviour
     }
 
 }
+
+
+/**
+ *NOTAS PARA LOS DEMAS COMPIS DE EQUIPO:
+ *  - Hay que indicar a "nivelJugandoseAhora" el nivel actual
+ *  - Los coleccionables lleverán la etiqueta: "coleccionable"
+ *  - Los enemigos llevarán la capa (layer) "Enemigo"
+ *  - En el script del enemigo, cada vez que se derrote a uno, este tendrá un condicional que preguntará si es el último, en caso afirmativo, instanciara
+ *    en su posicion un prefab del coleccionable. A su vez también mira que no se haya conseguido el extra antes, es decir, si hay 5 enemigos en total y
+ *    en el array de enemigos derrotados aparece que han sido derrotados 5 significa que ya se derrotaron los cinco cuando se jugó al nivel anteriormente.
+ *    Para evitar lios dejo aqui abajo el condicional que hay que poner para que solo se tenga que copiar y pegar donde indico.
+ *    ESTE CONDICIONAL ESTÁ EN LA FUNCIÓN DONDE MUERE O SE DERROTA AL ENEMIGO QUE SEA
+        if (Coleccionables.eDerrotados[Coleccionables.niActual] != Coleccionables.eTotales[Coleccionables.niActual])
+        {
+            if (Coleccionables.eDerrotados[Coleccionables.niActual] == Coleccionables.eTotales[Coleccionables.niActual] - 1)
+            {
+                //AQUI SE INSTANCIA EL PREFAB DEL COLECCIONABLE
+            }
+            Coleccionables.eDerrotados[Coleccionables.niActual]++;
+        }
+ **/

Videojuegos_Proyecto/Assets/Scripts/CrearEnemigos.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class CrearEnemigos : MonoBehaviour
+{
+
+    public GameObject enemigo;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+
+        if (SceneManager.GetActiveScene().name != "SeleccionNivel") { 
+            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);
+            //Instantiate(enemigo, new Vector3(54, 2.5f, 0), Quaternion.identity);
+            //Instantiate(enemigo, new Vector3(67, -1.5f, 0), Quaternion.identity);
+        }
+
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Videojuegos_Proyecto/Assets/Scripts/CrearEnemigos.cs.meta

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

Videojuegos_Proyecto/Assets/Scripts/Enemigo1Move.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Enemigo1Move : MonoBehaviour
+{
+    public GameObject prefabColeccionable;
+    private int vida = 1;
+
+    // Transforms to act as start and end markers for the journey.
+    private Vector3 startMarker;
+    private Vector3 endMarker;
+
+    // Movement speed in units per second.
+    public float speed = 1.0F;
+
+    private float _timePassed;
+
+    void Start()
+    {
+        startMarker = this.transform.position;
+        endMarker = startMarker + new Vector3(3, 0, 0);
+        _timePassed = 0;
+    }
+
+    // Move to the target end position.
+    void Update()
+    {
+        _timePassed += speed*Time.deltaTime;
+        // Set our position as a fraction of the distance between the markers.
+        transform.position = Vector3.Lerp(startMarker, endMarker, Mathf.PingPong(_timePassed, 1));
+    }
+
+    private void OnTriggerEnter2D(Collider2D collision)
+    {
+        if (collision.tag == "BalaGuitarra")
+        {
+            vida--;
+
+            if(vida == 0) { //Como lo ponga menor o igual a 0 puede detectar como que has matado a dos enemigos en vez de solo a uno si disparas muy cerca. Por eso mejor ==
+                Destroy(collision.gameObject);
+
+                //Aqui se cuenta cuantos enemigos quedan para entregar el coleccionable que te dan por derrotar a todos los enemigos
+                if (Coleccionables.eDerrotados[Coleccionables.niActual] != Coleccionables.eTotales[Coleccionables.niActual])
+                {
+                    if (Coleccionables.eDerrotados[Coleccionables.niActual] == Coleccionables.eTotales[Coleccionables.niActual] - 1)
+                    {
+                        //AQUI SE INSTANCIA EL PREFAB DEL COLECCIONABLE
+                        Instantiate(prefabColeccionable, collision.transform.position, Quaternion.identity);
+                    }
+                    Coleccionables.eDerrotados[Coleccionables.niActual]++;
+                }
+
+                Destroy(this.gameObject);
+            }
+        }
+
+        if (collision.tag == "BalaFlauta")
+        {
+            vida--;
+
+            if (vida == 0)
+            { 
+                Destroy(collision.gameObject);
+
+                //Aqui se cuenta cuantos enemigos quedan para entregar el coleccionable que te dan por derrotar a todos los enemigos
+                if (Coleccionables.eDerrotados[Coleccionables.niActual] != Coleccionables.eTotales[Coleccionables.niActual])
+                {
+                    if (Coleccionables.eDerrotados[Coleccionables.niActual] == Coleccionables.eTotales[Coleccionables.niActual] - 1)
+                    {
+                        //AQUI SE INSTANCIA EL PREFAB DEL COLECCIONABLE
+                        Instantiate(prefabColeccionable, collision.transform.position, Quaternion.identity);
+                    }
+                    Coleccionables.eDerrotados[Coleccionables.niActual]++;
+                }
+
+                Destroy(this.gameObject);
+            }
+        }
+
+    }
+}

Videojuegos_Proyecto/Assets/Scripts/Enemigo1Move.cs.meta

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

Videojuegos_Proyecto/Assets/Scripts/Jugador.cs

+using System.Collections;
+using System.Collections.Generic;
+using System;
+using UnityEngine;
+
+public class Jugador : MonoBehaviour
+{
+
+    private int vidas;
+    private float tInvulnerable;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        vidas = 3;
+        tInvulnerable = 0;
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        tInvulnerable -= Time.deltaTime;
+    }
+
+    private void OnTriggerEnter2D(Collider2D collision)
+    {
+
+        if (collision.tag == "Enemigo" && tInvulnerable<=0)
+        {
+            Dañado();
+        }
+}
+
+    void Dañado()
+    {
+        vidas--;
+        tInvulnerable = 1.5f;
+        Debug.Log("Vida actual: "+vidas+"/3");
+    }
+}

Videojuegos_Proyecto/Assets/Scripts/Jugador.cs.meta

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

Videojuegos_Proyecto/Assets/Scripts/ZonaFinal.cs

@@ -30,7 +30,7 @@ public class ZonaFinal : MonoBehaviour
 
     private void OnTriggerEnter2D(Collider2D collision)
     {
-        
+        if(collision.gameObject.tag == "Player") { 
             GuardarYCargar.Guardar(colecto, "slotColeccionables");
 
             //Si el jugador entra aqui significa que se ha pasado el nivel. Parar el tiempo de juego, 
@@ -52,6 +52,7 @@ public class ZonaFinal : MonoBehaviour
             }
             GuardarYCargar.Guardar(colecto, "slotColeccionables");
         }
+    }
 
     //Se abre al darle al boton siguiente desde el canvas "canvasColecionableDesbloqueados" o sino se han consguido todos los coleccionables
     public void AbrirCanvasVictoria() {

Videojuegos_Proyecto/Library/CurrentLayout.dwlt

@@ -92,9 +92,15 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 379
+<<<<<<< HEAD
     height: 573
   m_MinSize: {x: 202, y: 222}
   m_MaxSize: {x: 4002, y: 4022}
+=======
+    height: 605
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+>>>>>>> origin/Release
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
@@ -116,9 +122,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}
@@ -149,7 +155,7 @@ MonoBehaviour:
     y: 0
     width: 1920
     height: 997
-  m_MinSize: {x: 950, y: 300}
+  m_MinSize: {x: 950, y: 544}
   m_MaxSize: {x: 10000, y: 10000}
 --- !u!114 &7
 MonoBehaviour:
@@ -239,9 +245,15 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 1531
+<<<<<<< HEAD
     height: 573
   m_MinSize: {x: 406, y: 222}
   m_MaxSize: {x: 8006, y: 4022}
+=======
+    height: 605
+  m_MinSize: {x: 404, y: 222}
+  m_MaxSize: {x: 8004, y: 4022}
+>>>>>>> origin/Release
   vertical: 0
   controlID: 15
 --- !u!114 &11
@@ -262,7 +274,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}
@@ -293,10 +305,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 379
-    y: 73
-    width: 1150
-    height: 554
+    x: 468
+    y: 181
+    width: 973
+    height: 501
   m_ViewDataDictionary: {fileID: 0}
 --- !u!114 &13
 MonoBehaviour:
@@ -320,9 +332,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: 
@@ -342,14 +354,20 @@ MonoBehaviour:
   m_LastFolders:
   - Assets/Scenes
   m_LastFoldersGridSize: -1
-  m_LastProjectPath: C:\Users\JC\Desktop\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}
+<<<<<<< HEAD
     m_SelectedIDs: f02b0000
     m_LastClickedID: 11248
     m_ExpandedIDs: 00000000222b000000ca9a3b
+=======
+    m_SelectedIDs: 962b0000
+    m_LastClickedID: 11158
+    m_ExpandedIDs: 00000000c82a00001a34000000ca9a3b
+>>>>>>> origin/Release
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -365,7 +383,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 5}
+      m_ClientGUIView: {fileID: 0}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -377,7 +395,11 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
+<<<<<<< HEAD
     m_ExpandedIDs: 00000000222b000070340000
+=======
+    m_ExpandedIDs: 00000000c82a00001a340000
+>>>>>>> origin/Release
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -492,14 +514,20 @@ MonoBehaviour:
     x: 0
     y: 73
     width: 379
-    height: 554
+    height: 586
   m_ViewDataDictionary: {fileID: 0}
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
+<<<<<<< HEAD
       m_SelectedIDs: 94330000
       m_LastClickedID: 0
       m_ExpandedIDs: e6f0ffff32f1ffff72faffff
+=======
+      m_SelectedIDs: 3e330000
+      m_LastClickedID: 0
+      m_ExpandedIDs: 862dffff1c3cffffd04dffffb84effff3858ffff0259ffff485affffdc77ffff0a94ffff5ea1ffffdcd4fffffce6ffff28e7fffff0f1ffff3afaffff
+>>>>>>> origin/Release
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -515,14 +543,14 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 0}
+        m_ClientGUIView: {fileID: 4}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
     m_LockTracker:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
-  m_WindowGUID: 882b1ffbccde250418ab8e4c9d2d3ed7
+  m_WindowGUID: e4f845058af2fed45a9fd11aeb1bc7f9
 --- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -547,10 +575,10 @@ MonoBehaviour:
     x: 379
     y: 73
     width: 1150
-    height: 554
+    height: 586
   m_ViewDataDictionary: {fileID: 0}
   m_ShowContextualTools: 0
-  m_WindowGUID: 9da1557899ac30346918b300a279c884
+  m_WindowGUID: 43dad88c062228f459455f7a9fa529fd
   m_Gizmos: 1
   m_SceneIsLit: 1
   m_SceneLighting: 1
@@ -559,9 +587,15 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
+<<<<<<< HEAD
     m_Target: {x: 451.576, y: 141.83812, z: -62.875}
     speed: 2
     m_Value: {x: 451.576, y: 141.83812, z: -62.875}
+=======
+    m_Target: {x: 2.6275835, y: -0.29340863, z: -0.9394531}
+    speed: 2
+    m_Value: {x: 2.6275835, y: -0.29340863, z: -0.9394531}
+>>>>>>> origin/Release
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -594,9 +628,15 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
+<<<<<<< HEAD
     m_Target: 482.1205
     speed: 2
     m_Value: 482.1205
+=======
+    m_Target: 11.060756
+    speed: 2
+    m_Value: 10.5844555
+>>>>>>> origin/Release
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -645,7 +685,7 @@ MonoBehaviour:
     x: 379
     y: 73
     width: 1150
-    height: 554
+    height: 586
   m_ViewDataDictionary: {fileID: 0}
   m_VSyncEnabled: 0
   m_MaximizeOnPlay: 0
@@ -660,8 +700,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 +720,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 +730,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 +764,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/StateCache/Hierarchy/a6872e-38c9ae1c49230e24a8.json

+{"m_ExpandedPrefabGameObjectFileIDs":[5415114670227481229],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file

Videojuegos_Proyecto/Library/StateCache/Hierarchy/a6872e-4cad856fb8f87054e8.json

+{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file

Videojuegos_Proyecto/Library/StateCache/Hierarchy/a6872e-mainStage.json

-{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
+{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-3012,-1236],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file

Videojuegos_Proyecto/Library/StateCache/Hierarchy/e4f845-1f95e6a67b369a549b.json

+{"m_ExpandedPrefabGameObjectFileIDs":[6213653338870642002],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file

Videojuegos_Proyecto/Library/StateCache/Hierarchy/e4f845-38c9ae1c49230e24a8.json

+{"m_ExpandedPrefabGameObjectFileIDs":[5415114670227481229],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file

Videojuegos_Proyecto/Library/StateCache/Hierarchy/e4f845-4cad856fb8f87054e8.json

+{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":3326548381514800793,"m_LastClickedInstanceID":0}
\ No newline at end of file

Videojuegos_Proyecto/Library/StateCache/Hierarchy/e4f845-4eada546b3029f24ea.json

+{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":9101462949979880529,"m_LastClickedInstanceID":0}
\ No newline at end of file

Videojuegos_Proyecto/Library/StateCache/Hierarchy/e4f845-c299a511f2a249142a.json

-{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":7736364748447018738,"m_LastClickedInstanceID":0}
\ No newline at end of file
+{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file

Videojuegos_Proyecto/Library/StateCache/SceneView/2d69cc-38c9ae1c49230e24a8.json

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

Videojuegos_Proyecto/Library/StateCache/SceneView/2d69cc-4cad856fb8f87054e8.json

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

Videojuegos_Proyecto/Library/StateCache/SceneView/2d69cc-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":-1.695264458656311,"y":-0.24087099730968476,"z":-0.708984375},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":10.626546859741211,"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":28.342342376708986,"y":4.5864763259887699,"z":-130.97265625},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":22.36540412902832,"orthographic":true}
\ No newline at end of file

Videojuegos_Proyecto/Library/StateCache/SceneView/43dad8-1f95e6a67b369a549b.json

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

Videojuegos_Proyecto/Library/StateCache/SceneView/43dad8-38c9ae1c49230e24a8.json

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

Videojuegos_Proyecto/Library/StateCache/SceneView/43dad8-4cad856fb8f87054e8.json

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

Videojuegos_Proyecto/Library/StateCache/SceneView/43dad8-4eada546b3029f24ea.json

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

Videojuegos_Proyecto/Library/StateCache/SceneView/43dad8-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":604.6395874023438,"y":262.1821594238281,"z":-77.875},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":674.8079223632813,"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":578.6107177734375,"y":285.7994689941406,"z":-120.5},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":610.6950073242188,"orthographic":true}
->>>>>>> origin/Release
+{"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":2.6275835037231447,"y":-0.2934086322784424,"z":-0.939453125},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":11.060755729675293,"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/Library/shadercompiler-UnityShaderCompiler.exe1.log

 Base path: C:/Program Files/Unity/Editor/Data
 Cmd: initializeCompiler
+Cmd: compileSnippet
+  api=4 type=1 insize=1302 outsize=218 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH 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=1596 outsize=1894 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH 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
 Cmd: initializeCompiler
+Cmd: compileSnippet
+  api=4 type=0 insize=1302 outsize=1414 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH 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.exe3.log

-Base path: C:/Program Files/Unity/Hub/Editor/2019.1.11f1/Editor/Data
+Base path: C:/Program Files/Unity/Editor/Data
 Cmd: initializeCompiler
+Cmd: compileSnippet
+  api=4 type=1 insize=1596 outsize=6814 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH 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/ProjectSettings/TagManager.asset

@@ -9,6 +9,9 @@ TagManager:
   - PU_Velocidad
   - PU_Invulnerabilidad
   - PU_Vida
+  - Enemigo
+  - BalaGuitarra
+  - BalaFlauta
   layers:
   - Default
   - TransparentFX

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

-cf044b143629c2f39a7a81daf38510379507cd27
+e3e7ce3c9141ed3e2564c1fa58246d1c2aef5990