Merge branch '17-comprobacion-del-logro-recogidas-todas-las-notas' into Release

Videojuegos_Proyecto/Assembly-CSharp.csproj

@@ -68,6 +68,7 @@
     <Compile Include="Assets\Player\Scripts\BalasGuitarra.cs" />
     <Compile Include="Assets\Player\Scripts\Player2D.cs" />
     <Compile Include="Assets\Scripts\ScriptColeccionables.cs" />
+    <Compile Include="Assets\Scripts\ZonaFinal.cs" />
     <None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface-Mobile.shader" />
     <None Include="Assets\TextMesh Pro\Resources\LineBreaking Leading Characters.txt" />
     <None Include="Assets\TextMesh Pro\Resources\Shaders\TMPro_Properties.cginc" />

Videojuegos_Proyecto/Assets/Player/Scripts/Player2D.cs

@@ -46,9 +46,7 @@ public class Player2D : MonoBehaviour
         if (Input.GetKeyDown(KeyCode.L)) { CambiarInstrumento(); }
 
         if (Time.time >= timeSiguienteAtaque) {
-            if (Input.GetKeyDown(KeyCode.J)) {
-                Disparar();
-            }
+            if (Input.GetKeyDown(KeyCode.J)) { Disparar(); }
         }
         if (Time.time >= timeSiguienteAtaque)
         {
@@ -201,4 +199,14 @@ public class Player2D : MonoBehaviour
         }
     }
 
+    private void OnTriggerEnter2D(Collider2D collision)
+    {
+        if (collision.tag == "Coleccionable") {
+            ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].colecConseguidos++;
+            Destroy(collision.gameObject);
+
+            Debug.Log(ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].colecConseguidos+"/"+
+                ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].coleccionables);
+        }
+    }
 }

Videojuegos_Proyecto/Assets/Prefabs/ColeccionableTrozoPartitura.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6914436123365519657
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6914436123365519660}
+  - component: {fileID: 6914436123365519659}
+  - component: {fileID: 6914436123365519658}
+  m_Layer: 0
+  m_Name: ColeccionableTrozoPartitura
+  m_TagString: Coleccionable
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6914436123365519660
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6914436123365519657}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -3.72, y: 0.36, 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 &6914436123365519659
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6914436123365519657}
+  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: e9aa5391aec7a334ea457e001519f57f, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 12, y: 10.4}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!61 &6914436123365519658
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6914436123365519657}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: -0.019123793, y: -0.009561062}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0.5, y: 0.5}
+    oldSize: {x: 2.4, y: 2.08}
+    newSize: {x: 12, y: 10.4}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 1.2525811, y: 0.5692301}
+  m_EdgeRadius: 0

Videojuegos_Proyecto/Assets/Prefabs/ColeccionableTrozoPartitura.prefab.meta

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

Videojuegos_Proyecto/Assets/Prefabs/GameManager.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &7736364748447018738
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7736364748447018736}
+  - component: {fileID: 7736364748447018739}
+  m_Layer: 0
+  m_Name: GameManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7736364748447018736
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7736364748447018738}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -14.6, y: -0.04816645, z: -0.7089844}
+  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!114 &7736364748447018739
+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: b22fee4fbe849e841b45124da9aad35b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  numeroDeNiveles: 1

Videojuegos_Proyecto/Assets/Prefabs/GameManager.prefab.meta

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

Videojuegos_Proyecto/Assets/Prefabs/ZonaFinal.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5557318670751642286
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5557318670751642272}
+  - component: {fileID: 5557318670751642273}
+  - component: {fileID: 5557318670751642275}
+  - component: {fileID: 5557318670751642274}
+  m_Layer: 0
+  m_Name: ZonaFinal
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5557318670751642272
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5557318670751642286}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 4.14, y: -2.15, 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 &5557318670751642273
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5557318670751642286}
+  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: 2
+  m_Sprite: {fileID: 3861127509544982450, guid: 05935f63555950743bc5b132fe4a28b0,
+    type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 0.42, y: 0.42}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &5557318670751642275
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5557318670751642286}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0f8ca31431db16249976751d55646b7b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  canvasColecionableDesbloqueados: {fileID: 0}
+  SitioImagenPartitura: {fileID: 0}
+  canvasVictoria: {fileID: 0}
+  infoColeccionables: {fileID: 0}
+--- !u!61 &5557318670751642274
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5557318670751642286}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0.5, y: 0.5}
+    oldSize: {x: 0.7, y: 0.7}
+    newSize: {x: 0.42, y: 0.42}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 0.7, y: 0.7}
+  m_EdgeRadius: 0

Videojuegos_Proyecto/Assets/Prefabs/ZonaFinal.prefab.meta

+fileFormatVersion: 2
+guid: 1c5aa891e36cd44419d73b6cb11aa315
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Videojuegos_Proyecto/Assets/Scripts/ScriptColeccionables.cs

@@ -4,15 +4,64 @@ using UnityEngine;
 
 public class ScriptColeccionables : MonoBehaviour
 {
-    // Start is called before the first frame update
-    void Start()
+    /**
+     *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 (ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].enemigosDerrotados !=
+               ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].enemigos)
             {
-        
+                if (ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].enemigosDerrotados ==
+                ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].enemigos-1)
+                {
+                    //AQUI SE INSTANCIA EL PREFAB DEL COLECCIONABLE
                 }
+                ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].enemigosDerrotados++;
+            }
+     **/
+
         
-    // Update is called once per frame
-    void Update()
+    //Forma de guardar los colecciobales que ya se han conseguido¿¿??
+
+    public struct VariablesNivel
     {
 
+        public int enemigos; //El numero de enemigos a derrotar en el nivel para conseguir el coleccionable que se consigue por derrotar a todos los enemigos
+        public int enemigosDerrotados; //Al superar el nivel, si no se han derrotado todos los enemigos este debe volver a 0
+        public int coleccionables; //El numero de coleccionables que hay que conseguir para obtener una canción.
+        public int colecConseguidos; //Este valor debe mantenerse
+        public bool ventanaMostrada; //Te indica si ya se ha mostrado la ventana de que has conseguido la partitura de este nivel
+        public string rutaImagenPartitura; //Te indica donde está la imagen asociada a la partitura de este nivel
+
+        public VariablesNivel(int enemigosPorNivel_, int coleccionablesPorNivel_, string ruta)
+        {
+            enemigos = enemigosPorNivel_;
+            enemigosDerrotados = 0;
+            coleccionables = coleccionablesPorNivel_;
+            colecConseguidos = 0;
+            ventanaMostrada = false;
+            rutaImagenPartitura = ruta;
+        }
     }
+
+    public int numeroDeNiveles = 1;
+    public static int nivelJugandoseAhora; //Es necesario indicar al script el nivel en el que nos encontramos o coger de donde sea el nivel actual
+    public static VariablesNivel[] variablesPorNivel;
+
+    
+    void Start()
+    {
+        nivelJugandoseAhora = 0;
+        variablesPorNivel = new VariablesNivel[numeroDeNiveles];
+        //Hay que poner manualmente la cantidad de enemigos a derrotar, el numero de colecionables colocados y la ruta de la imagen
+        variablesPorNivel[0] = new VariablesNivel(3, 4, "Partitura-completa-1");
+    }
+    
+
 }

Videojuegos_Proyecto/Assets/Scripts/ZonaFinal.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using UnityEngine.UI;
+
+public class ZonaFinal : MonoBehaviour
+{
+    /*Abre ventanita de que te has pasado el nivel, indicando los coleccionables conseguidos, con varias opciones:
+    * - Volver a Selección del nivel
+    * - Reiniciar Nivel
+    * 
+    * Si se han coseguido todos los coleccionables tiene que salir antes de la ventana anterior otra diciendo que
+    * partitura has conseguido y un boton de continuar que te lleva a la ventana anterior. Esta ventana solo puede 
+    * salir una vez por nivel.
+    * 
+    * */
+
+    public Canvas canvasColecionableDesbloqueados;
+    public GameObject SitioImagenPartitura;
+    public Canvas canvasVictoria;
+    public Text infoColeccionables;
+
+    private void Start()
+    {
+        canvasColecionableDesbloqueados.gameObject.SetActive(false);
+        canvasVictoria.gameObject.SetActive(false);
+    }
+
+    private void OnTriggerEnter2D(Collider2D collision)
+    {
+        //Si el jugador entra aqui significa que se ha pasado el nivel. Parar el tiempo de juego, 
+        //entonces mirar el tema de los coleccionables.
+
+        Time.timeScale = 0;
+
+        if (ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].colecConseguidos ==
+            ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].coleccionables)
+        {
+            canvasColecionableDesbloqueados.gameObject.SetActive(true);
+            Sprite imagenPartitura = Resources.Load<Sprite>(ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].rutaImagenPartitura);
+            SitioImagenPartitura.GetComponent<Image>().sprite = imagenPartitura;
+        }
+        else {
+            AbrirCanvasVictoria();
+        }
+
+    }
+
+    //Se abre al darle al boton siguiente desde el canvas "canvasColecionableDesbloqueados" o sino se han consguido todos los coleccionables
+    public void AbrirCanvasVictoria() {
+        canvasColecionableDesbloqueados.gameObject.SetActive(false);
+        canvasVictoria.gameObject.SetActive(true);
+        infoColeccionables.text = ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].colecConseguidos + "/" + 
+            ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].coleccionables + " coleccionables encontrados";
+
+        if (ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].enemigosDerrotados !=
+            ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].enemigos) {
+            //Este if hay que hacerlo siempre que se vaya a aumentar el contador de enemigo derrotado, para evitar que se den coleccionables extras
+            ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].enemigosDerrotados = 0;
+        }
+
+    }
+
+    public void VolverALaSeleccionDeNivel() {
+        Time.timeScale = 1;
+        SceneManager.LoadScene("MenuInicial");//CAMBIAR PARA QUE VAYA A LA SELECCION DE NIVEL
+    }
+
+    public void ReiniciarNivel() {
+        Time.timeScale = 1;
+        SceneManager.LoadScene(SceneManager.GetActiveScene().name);
+    }
+
+}

Videojuegos_Proyecto/Assets/Scripts/ZonaFinal.cs.meta

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

Videojuegos_Proyecto/Assets/Sprites/ColeccionablesSprites/Resources.meta

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

Videojuegos_Proyecto/Assets/Sprites/ColeccionablesSprites/TrozoPartitura.png.meta

@@ -45,7 +45,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 500
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -69,6 +69,50 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

Videojuegos_Proyecto/Assets/Sprites/sprites.png.meta

@@ -2617,7 +2617,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1
@@ -2631,7 +2631,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 30
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -2666,6 +2666,39 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
   spriteSheet:
     serializedVersion: 2
     sprites:

Videojuegos_Proyecto/Library/CurrentLayout.dwlt

@@ -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: 13
+  controlID: 101
 --- !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}
@@ -93,8 +93,8 @@ MonoBehaviour:
     y: 0
     width: 379
     height: 573
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 202, y: 222}
+  m_MaxSize: {x: 4002, y: 4022}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
@@ -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: 14
+  controlID: 102
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -240,10 +240,10 @@ MonoBehaviour:
     y: 0
     width: 1531
     height: 573
-  m_MinSize: {x: 404, y: 222}
-  m_MaxSize: {x: 8004, y: 4022}
+  m_MinSize: {x: 406, y: 222}
+  m_MaxSize: {x: 8006, y: 4022}
   vertical: 0
-  controlID: 15
+  controlID: 103
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -336,20 +336,20 @@ MonoBehaviour:
     m_ShowAllHits: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets
+    - Assets/Prefabs
   m_ViewMode: 1
   m_StartGridSize: 64
   m_LastFolders:
-  - Assets
+  - Assets/Prefabs
   m_LastFoldersGridSize: -1
   m_LastProjectPath: C:\Users\Colme\Documents\UnityProjects\ProyectoVideojuegos\Videojuegos_Proyecto
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 202b0000
-    m_LastClickedID: 11040
-    m_ExpandedIDs: 00000000202b0000ac2b00001a3300003034000000ca9a3b
+    m_SelectedIDs: c8340000
+    m_LastClickedID: 13512
+    m_ExpandedIDs: 000000003e2a0000ce2a00006433000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -377,7 +377,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000202b000030340000
+    m_ExpandedIDs: 000000003e2a000064330000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -405,7 +405,7 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: c6230000
+    m_ExpandedInstanceIDs: c62300001c330000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -421,7 +421,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 0}
+      m_ClientGUIView: {fileID: 5}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -497,9 +497,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 46340000
-      m_LastClickedID: 0
-      m_ExpandedIDs: 64faffff303d0000463d0000
+      m_SelectedIDs: c8420000
+      m_LastClickedID: 17096
+      m_ExpandedIDs: 0a0affff0c0affff5c38ffff62ccffff14e9ffff72f1ffff8cfbffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -515,7 +515,7 @@ 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
@@ -559,9 +559,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 538.78955, y: 228.31664, z: -114.5}
+    m_Target: {x: -1.6952645, y: -0.240871, z: -0.7089844}
     speed: 2
-    m_Value: {x: 538.78955, y: 228.31664, z: -114.5}
+    m_Value: {x: -1.6952645, y: -0.240871, z: -0.7089844}
   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: 662.36664
+    m_Target: 10.626547
     speed: 2
-    m_Value: 662.36664
+    m_Value: 10.168944
   m_Ortho:
     m_Target: 1
     speed: 2

Videojuegos_Proyecto/Library/LastSceneManagerSetup.txt

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

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":538.78955078125,"y":228.31663513183595,"z":-114.5},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":662.3666381835938,"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":-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

Videojuegos_Proyecto/ProjectSettings/TagManager.asset

@@ -5,6 +5,7 @@ TagManager:
   serializedVersion: 2
   tags:
   - Suelo
+  - Coleccionable
   layers:
   - Default
   - TransparentFX

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

-99fefbf6b8dd0db6e9c8146f2eee55ccbbacaed6
+9d3bad81763c0d5782afaa591d84860948c0d647