Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit f510b065 by Juan Carlos
Options

Merge branch 'Power_Ups' into Release

parents 1c46009c f864c3a6
Expand all
Inline Side-by-side
Showing with 855 additions and 133 deletions
Videojuegos_Proyecto/Assembly-CSharp.csproj
......@@ -62,32 +62,34 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\MainMenu\Scripts\LoadMenu.cs" />
<Compile Include="Assets\MainMenu\Scripts\MainMenu.cs" />
<Compile Include="Assets\MainMenu\Scripts\SeleccionNivel.cs" />
<Compile Include="Assets\Player\Scripts\BalaFlauta.cs" />
<Compile Include="Assets\Player\Scripts\BalaGuitarra.cs" />
<Compile Include="Assets\Player\Scripts\BalasGuitarra.cs" />
<Compile Include="Assets\Player\Scripts\Player2D.cs" />
<Compile Include="Assets\Scripts\ScriptColeccionables.cs" />
<Compile Include="Assets\Scripts\Coleccionables.cs" />
<Compile Include="Assets\Scripts\GuardarYCargar.cs" />
<Compile Include="Assets\Scripts\PowerUp.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" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_Bitmap-Custom-Atlas.shader" />
<None Include="Assets\TextMesh Pro\Resources\LineBreaking Following Characters.txt" />
<None Include="Assets\TextMesh Pro\Sprites\EmojiOne Attribution.txt" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF-Mobile Masking.shader" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_Bitmap-Mobile.shader" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF Overlay.shader" />
<None Include="Assets\TextMesh Pro\Fonts\LiberationSans - OFL.txt" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMPro_Surface.cginc" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF-Mobile Overlay.shader" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_Bitmap.shader" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMPro.cginc" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF.shader" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF-Mobile.shader" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_Sprite.shader" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface.shader" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface-Mobile.shader" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\LineBreaking Leading Characters.txt" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMPro_Properties.cginc" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_Bitmap-Custom-Atlas.shader" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\LineBreaking Following Characters.txt" />
<None Include="Assets\MainMenu\TextMesh Pro\Sprites\EmojiOne Attribution.txt" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_SDF-Mobile Masking.shader" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_Bitmap-Mobile.shader" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_SDF Overlay.shader" />
<None Include="Assets\MainMenu\TextMesh Pro\Fonts\LiberationSans - OFL.txt" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMPro_Surface.cginc" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_SDF-Mobile Overlay.shader" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_Bitmap.shader" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMPro.cginc" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_SDF.shader" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_SDF-Mobile.shader" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_Sprite.shader" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface.shader" />
<Reference Include="Unity.Timeline.Editor">
<HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
</Reference>
......
Videojuegos_Proyecto/Assets/MainMenu/Scripts/MainMenu.cs
......@@ -2,10 +2,16 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class MainMenu : MonoBehaviour
{
public void PlayGame() {
public void NewGame() {
Coleccionables.iniciali = false;
Coleccionables.niActual = 0;
Coleccionables.Modificado();
SceneManager.LoadScene("SampleScene");
}
......@@ -14,7 +20,7 @@ public class MainMenu : MonoBehaviour
}
public void LoadGame() {
SceneManager.LoadScene("LoadScene");
SceneManager.LoadScene("SeleccionNivel");
}
public void ExtrasScreen() {
......
Videojuegos_Proyecto/Assets/MainMenu/Scripts/LoadMenu.cs → Videojuegos_Proyecto/Assets/MainMenu/Scripts/SeleccionNivel.cs
......@@ -2,21 +2,36 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class LoadMenu : MonoBehaviour
public class SeleccionNivel : MonoBehaviour
{
public void BackMainMenu()
public Text infoColeccLVL1;
public Coleccionables GameManager;
private void Start()
{
SceneManager.LoadScene("MenuInicial");
GuardarYCargar.Cargar(GameManager, "slotColeccionables");
Coleccionables.CargarDatos();
}
public void LoadSavedState1()
void Update()
{
//Cargar partida 1
//Coloco los coleccionables conseguidos en cada nivel
infoColeccLVL1.text = Coleccionables.cConseguidos[Coleccionables.niActual] + "/" + Coleccionables.cTotales[Coleccionables.niActual];
}
public void LoadSaveState2()
public void BackMainMenu()
{
//Cargar partida 2
SceneManager.LoadScene("MenuInicial");
}
public void SeleccionarNivel(int numeroNivel)
{
Coleccionables.niActual = numeroNivel;
SceneManager.LoadScene("SampleScene"); // SceneManager.LoadScene("Nivel" + numeroNivel);
}
}
Videojuegos_Proyecto/Assets/Player/Scripts/Player2D.cs
......@@ -22,7 +22,6 @@ public class Player2D : MonoBehaviour
private int instrumentoUsandose = 0; /* 0 = flauta, 1 = guitarra */
// Start is called before the first frame update
void Start()
{
......@@ -202,11 +201,16 @@ public class Player2D : MonoBehaviour
private void OnTriggerEnter2D(Collider2D collision)
{
if (collision.tag == "Coleccionable") {
ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].colecConseguidos++;
Coleccionables.cConseguidos[Coleccionables.niActual]++;
for (int i = 0; i < Coleccionables.pColecNivel1.Length; i++) {
if (Coleccionables.pColecNivel1[i] == collision.transform.position) { Coleccionables.pColecNivel1[i] = new Vector3(0, 0, 0); }
}
Coleccionables.Modificado();
Destroy(collision.gameObject);
Debug.Log(ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].colecConseguidos+"/"+
ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].coleccionables);
//Quitar este Debug.Log cuando tengamos el nivel actual
Debug.Log(Coleccionables.cConseguidos[Coleccionables.niActual] + "/" + Coleccionables.cTotales[Coleccionables.niActual]);
}
}
}
Videojuegos_Proyecto/Assets/Prefabs/GameManager.prefab
......@@ -9,7 +9,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 7736364748447018736}
- component: {fileID: 7736364748447018739}
- component: {fileID: 3174322665456641310}
m_Layer: 0
m_Name: GameManager
m_TagString: Untagged
......@@ -31,7 +31,7 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7736364748447018739
--- !u!114 &3174322665456641310
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......@@ -40,7 +40,22 @@ MonoBehaviour:
m_GameObject: {fileID: 7736364748447018738}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b22fee4fbe849e841b45124da9aad35b, type: 3}
m_Script: {fileID: 11500000, guid: 94ed2c62992ea584eb669871b1668a3c, type: 3}
m_Name:
m_EditorClassIdentifier:
numeroDeNiveles: 1
prefabColeccionable: {fileID: 6914436123365519657, guid: bb9f2d39e14ac4c4493c44a6cc1ddc3b,
type: 3}
NO_TOCAR_LAS_VARIABLES_DESDE_AQUI: 1
numeroNiveles: 1
coleccTotales: 00000000
colecConseguidos: 00000000
enemigosTotales: 00000000
enemigosDerrotados: 00000000
ventanaMostrada: 00
nombreImagenPartitura:
-
posicionesColecNivel1:
- {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 0}
Videojuegos_Proyecto/Assets/Prefabs/Invulnerabilidad.prefab 0 → 100644
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2321382452776497405
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2321382452776497401}
- component: {fileID: 2321382452776497402}
- component: {fileID: 2321382452776497403}
- component: {fileID: 2321382452776497404}
m_Layer: 0
m_Name: Invulnerabilidad
m_TagString: PU_Invulnerabilidad
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2321382452776497401
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2321382452776497405}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.96, y: 1.93, 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 &2321382452776497402
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2321382452776497405}
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: -8446839620434878363, 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.7, y: 0.7}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &2321382452776497403
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2321382452776497405}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -0.00000011920929, y: -0.0025794506}
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.7, y: 0.7}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.5039489, y: 0.43687892}
m_EdgeRadius: 0
--- !u!114 &2321382452776497404
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2321382452776497405}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3}
m_Name:
m_EditorClassIdentifier:
Videojuegos_Proyecto/Assets/Prefabs/Invulnerabilidad.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: 642ab671e3040d74096e03fcf1c4e181
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Prefabs/Velocidad.prefab 0 → 100644
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4353308154281813176
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4353308154281813180}
- component: {fileID: 4353308154281813181}
- component: {fileID: 4353308154281813178}
- component: {fileID: 4353308154281813179}
m_Layer: 0
m_Name: Velocidad
m_TagString: PU_Velocidad
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4353308154281813180
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4353308154281813176}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -5.04, y: 2.07, 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 &4353308154281813181
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4353308154281813176}
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: 3046710074408030006, 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.7, y: 0.7}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &4353308154281813178
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4353308154281813176}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -0.020636797, y: -0.09802562}
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.7, y: 0.7}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.54522276, y: 0.5039488}
m_EdgeRadius: 0
--- !u!114 &4353308154281813179
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4353308154281813176}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3}
m_Name:
m_EditorClassIdentifier:
Videojuegos_Proyecto/Assets/Prefabs/Velocidad.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: 8c9a12bd8973bfb47aa954f2fb6efa0a
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Prefabs/Vida.prefab 0 → 100644
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3974070068712710307
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3974070068712710303}
- component: {fileID: 3974070068712710302}
- component: {fileID: 3974070068712710305}
- component: {fileID: 3974070068712710304}
m_Layer: 0
m_Name: Vida
m_TagString: PU_Vida
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3974070068712710303
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3974070068712710307}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2.77, y: 1.96, 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 &3974070068712710302
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3974070068712710307}
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: -1500066791758496074, 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.7, y: 0.7}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &3974070068712710305
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3974070068712710307}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -0.002579689, y: -0.00000017881393}
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.7, y: 0.7}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.4987893, y: 0.44203794}
m_EdgeRadius: 0
--- !u!114 &3974070068712710304
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3974070068712710307}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3}
m_Name:
m_EditorClassIdentifier:
Videojuegos_Proyecto/Assets/Prefabs/Vida.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: 98edecaf87d755341a1c2ecc22082995
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Prefabs/ZonaFinal.prefab
......@@ -10,8 +10,8 @@ GameObject:
m_Component:
- component: {fileID: 5557318670751642272}
- component: {fileID: 5557318670751642273}
- component: {fileID: 5557318670751642275}
- component: {fileID: 5557318670751642274}
- component: {fileID: 5557318670751642275}
m_Layer: 0
m_Name: ZonaFinal
m_TagString: Untagged
......@@ -82,22 +82,6 @@ SpriteRenderer:
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
......@@ -124,3 +108,19 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 0.7, y: 0.7}
m_EdgeRadius: 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}
Videojuegos_Proyecto/Assets/Scenes/MenuInicial.unity
......@@ -2028,7 +2028,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 572894596}
m_MethodName: PlayGame
m_MethodName: NewGame
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
......
Videojuegos_Proyecto/Assets/Scripts/Coleccionables.cs 0 → 100644
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Coleccionables : MonoBehaviour
{
//VACIAR LA MEMORIA PARA EL EJECUTABLE DEL JUEGO: edit -> "Clear All PlayerPrefs"
public bool inicializado = false; //NO TOCAR
public GameObject prefabColeccionable;
public bool NO_TOCAR_LAS_VARIABLES_DESDE_AQUI = true;
public int numeroNiveles = 1;
public int nivelActual = 0; //El primer nivel es el 0, aunque dentro del juego y en la escena se llamara nivel 1. Podria haber otra variable que indique hasta que nivel se ha desbloqueado.
//Cambiar tamaño de los siguientes arrays a igual que el numeroNiveles
public int[] coleccTotales = new int[1];
public int[] colecConseguidos = new int[1];
public int[] enemigosTotales = new int[1];
public int[] enemigosDerrotados = new int[1];
public bool[] ventanaMostrada = new bool[1];
public string[] nombreImagenPartitura = new string[1];
public Vector3[] posicionesColecNivel1 = new Vector3[4]; //Si posicionesColecNivel1[i] = (0, 0, 0) ese coleccionable ya ha sido recogido
//Estas son las variables con las que trabajarán los demás scripts:
public static bool iniciali = false;
public static int niActual;
public static int[] cTotales;
public static int[] cConseguidos;
public static int[] eTotales;
public static int[] eDerrotados;
public static bool[] vMostrada;
public static string[] nIPartitura;
public static Vector3[] pColecNivel1; //Si posicionesColecNivel1[i] = (0, 0, 0) ese coleccionable ya ha sido recogido
private static bool modificado = false; //Cada vez que modificas un dato de este script fuera tienes que llamar a su funcion
private static bool cargarDatos = false; //Cada vez que uses la funcion de GuardarYCargar.Cargar(); hay que usar esta despues.
// Start is called before the first frame update
void Awake()
{
if (!iniciali) {
inicializado = true;//NO TOCAR
iniciali = true;
for (int i = 0; i < numeroNiveles; i++) {
colecConseguidos[i] = 0;
enemigosDerrotados[i] = 0;
ventanaMostrada[i] = false;
}
//Habria que para cada nivel completar estas variables de cada array
// TOCAR AQUI{
enemigosTotales[0] = 2;
nombreImagenPartitura[0] = "Partitura-completa-1";
coleccTotales[0] = 5; //El ultimo coleccionable se consigue al derrotar a todos los enemigos, asi que aqui abajo hay el numero de coleccTotales - 1 de coleccionables
posicionesColecNivel1[0] = new Vector3(-5.48f, 0.01f, 0);
posicionesColecNivel1[1] = new Vector3(-3.08f, 0.01f, 0);
posicionesColecNivel1[2] = new Vector3(-1.78f, -1.78f, 0);
posicionesColecNivel1[3] = new Vector3( 1.48f, -1.78f, 0);
// }
niActual = nivelActual;
cTotales = coleccTotales;
cConseguidos = colecConseguidos;
eTotales = enemigosTotales;
eDerrotados = enemigosDerrotados;
vMostrada = ventanaMostrada;
nIPartitura = nombreImagenPartitura;
pColecNivel1 = posicionesColecNivel1;
}
}
private void Start()
{
for (int i = 0; i < pColecNivel1.Length; i++)
{
if (pColecNivel1[i] != new Vector3(0, 0, 0))
{
Instantiate(prefabColeccionable, pColecNivel1[i], Quaternion.identity);
}
}
Modificado();
}
// Update is called once per frame
void Update()
{
if (cargarDatos) {
niActual = nivelActual;
cTotales = coleccTotales;
cConseguidos = colecConseguidos;
eTotales = enemigosTotales;
eDerrotados = enemigosDerrotados;
vMostrada = ventanaMostrada;
nIPartitura = nombreImagenPartitura;
pColecNivel1 = posicionesColecNivel1;
iniciali = inicializado;
cargarDatos = false;
}
if (modificado) {
nivelActual = niActual;
coleccTotales = cTotales;
colecConseguidos = cConseguidos;
enemigosTotales = eTotales;
enemigosDerrotados = eDerrotados;
ventanaMostrada = vMostrada;
posicionesColecNivel1 = pColecNivel1;
inicializado = iniciali;
modificado = false;
}
}
//Si no se llama a esta función no se guardaran los datos correctamente
public static void Modificado() {
modificado = true;
}
public static void CargarDatos() {
cargarDatos = true;
}
}
Videojuegos_Proyecto/Assets/Scripts/ScriptColeccionables.cs.meta → Videojuegos_Proyecto/Assets/Scripts/Coleccionables.cs.meta
fileFormatVersion: 2
guid: b22fee4fbe849e841b45124da9aad35b
guid: 94ed2c62992ea584eb669871b1668a3c
MonoImporter:
externalObjects: {}
serializedVersion: 2
......
Videojuegos_Proyecto/Assets/Scripts/GuardarYCargar.cs 0 → 100644
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class GuardarYCargar : MonoBehaviour
{
public static void Guardar(MonoBehaviour script, string nombreSlot) {
string queGuarda = JsonUtility.ToJson(script);
//Debug.Log(queGuarda);
PlayerPrefs.SetString(nombreSlot, queGuarda);
}
public static void Cargar(MonoBehaviour script, string nombreSlot) {
JsonUtility.FromJsonOverwrite(PlayerPrefs.GetString(nombreSlot), script);
}
}
Videojuegos_Proyecto/Assets/Scripts/GuardarYCargar.cs.meta 0 → 100644
fileFormatVersion: 2
guid: eda6befa83a98db43b23d081ac612973
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Scripts/PowerUp.cs 0 → 100644
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class PowerUp : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
private void OnTriggerEnter2D(Collider2D other)
{
if (other.CompareTag("Player")) {
if (this.CompareTag("PU_Velocidad")) {
Debug.Log("El jugador ha chocado con el power up de velocidad");
other.GetComponent<Player2D>().velocidadAlAndar = 6.0f;
StartCoroutine(CogerVelocidad(other));
}
if (this.CompareTag("PU_Invulnerabilidad")) {
Debug.Log("El jugador ha chocado con el power up de invulnerabilidad");
Destroy(gameObject);
}
if (this.CompareTag("PU_Vida")) {
Debug.Log("El jugador ha chocado con el power up de vida");
//other.GetComponent<Player2D>;
Destroy(gameObject);
}
}
}
void DesactivarObjeto() {
GetComponent<SpriteRenderer>().enabled = false;
GetComponent<BoxCollider2D>().enabled = false;
}
IEnumerator CogerVelocidad(Collider2D player) {
DesactivarObjeto();
yield return new WaitForSeconds(5.0f);
player.GetComponent<Player2D>().velocidadAlAndar = 3.0f;
Destroy(gameObject);
}
IEnumerator CogerInvulnerabilidad(Collider2D player)
{
DesactivarObjeto();
yield return new WaitForSeconds(5.0f);
Destroy(gameObject);
}
void CogerVida(Collider2D player)
{
Destroy(gameObject);
}
}
Videojuegos_Proyecto/Assets/Scripts/PowerUp.cs.meta 0 → 100644
fileFormatVersion: 2
guid: d17f5df61c8d24f4aa460b500b46a5ac
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Scripts/ScriptColeccionables.cs deleted 100644 → 0
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class ScriptColeccionables : 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 (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++;
}
**/
//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
......@@ -20,6 +20,7 @@ public class ZonaFinal : MonoBehaviour
public GameObject SitioImagenPartitura;
public Canvas canvasVictoria;
public Text infoColeccionables;
public Coleccionables colecto;
private void Start()
{
......@@ -29,45 +30,54 @@ public class ZonaFinal : MonoBehaviour
private void OnTriggerEnter2D(Collider2D collision)
{
GuardarYCargar.Guardar(colecto, "slotColeccionables");
//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)
if (!Coleccionables.vMostrada[Coleccionables.niActual] &&
Coleccionables.cConseguidos[Coleccionables.niActual] == Coleccionables.cTotales[Coleccionables.niActual])
{
canvasColecionableDesbloqueados.gameObject.SetActive(true);
Sprite imagenPartitura = Resources.Load<Sprite>(ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].rutaImagenPartitura);
Sprite imagenPartitura = Resources.Load<Sprite>(Coleccionables.nIPartitura[Coleccionables.niActual]);
SitioImagenPartitura.GetComponent<Image>().sprite = imagenPartitura;
Coleccionables.vMostrada[Coleccionables.niActual] = true;
Coleccionables.Modificado();
}
else {
AbrirCanvasVictoria();
}
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() {
canvasColecionableDesbloqueados.gameObject.SetActive(false);
canvasVictoria.gameObject.SetActive(true);
infoColeccionables.text = ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].colecConseguidos + "/" +
ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].coleccionables + " coleccionables encontrados";
infoColeccionables.text = Coleccionables.cConseguidos[Coleccionables.niActual] + "/" + Coleccionables.cTotales[Coleccionables.niActual] +" coleccionables encontrados";
if (ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].enemigosDerrotados !=
ScriptColeccionables.variablesPorNivel[ScriptColeccionables.nivelJugandoseAhora].enemigos) {
if (Coleccionables.eDerrotados[Coleccionables.niActual] != Coleccionables.eTotales[Coleccionables.niActual]) {
//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;
Coleccionables.eDerrotados[Coleccionables.niActual] = 0;
}
}
public void VolverALaSeleccionDeNivel() {
Time.timeScale = 1;
SceneManager.LoadScene("MenuInicial");//CAMBIAR PARA QUE VAYA A LA SELECCION DE NIVEL
SceneManager.LoadScene("SeleccionNivel");//CAMBIAR PARA QUE VAYA A LA SELECCION DE NIVEL
}
public void ReiniciarNivel() {
if (Coleccionables.eDerrotados[Coleccionables.niActual] != Coleccionables.eTotales[Coleccionables.niActual])
{
//Este if hay que hacerlo siempre que se vaya a aumentar el contador de enemigo derrotado, para evitar que se den coleccionables extras
Coleccionables.eDerrotados[Coleccionables.niActual] = 0;
}
Time.timeScale = 1;
SceneManager.LoadScene(SceneManager.GetActiveScene().name);
}
......
Videojuegos_Proyecto/Assets/Sprites/PowerUps.meta 0 → 100644
fileFormatVersion: 2
guid: d344f8beb905eef4f9e03de1de88342f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Sprites/PowerUps/Invincible.png.meta 0 → 100644
fileFormatVersion: 2
guid: 64b323039f7dc22428fb7e08664ab46e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 3
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 4
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline:
- - {x: 0, y: 2}
- {x: -1.7320509, y: 0.99999994}
- {x: -1.7320508, y: -1.0000001}
- {x: 0.00000017484555, y: -2}
- {x: 1.7320509, y: -0.9999998}
- {x: 1.7320509, y: 0.9999998}
physicsShape:
- - {x: 0, y: 2}
- {x: -1.7320509, y: 0.99999994}
- {x: -1.7320508, y: -1.0000001}
- {x: 0.00000017484555, y: -2}
- {x: 1.7320509, y: -0.9999998}
- {x: 1.7320509, y: 0.9999998}
bones: []
spriteID: 02af9a0245567c940b7adbdbce1a493f
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Library/PlayerDataCache/Win64/Data/resources.assets.resS 0 → 100644
This diff could not be displayed because it is too large.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment