Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit c5c6d1bf by Juan Carlos
Options

Merge 'Power_Ups' into Release

parents f510b065 944a28b7
Expand all
Inline Side-by-side
Showing with 819 additions and 114 deletions
Videojuegos_Proyecto/Assembly-CSharp.csproj
...@@ -2,8 +2,11 @@ ...@@ -2,8 +2,11 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<<<<<<< HEAD
<CscToolPath>C:\Program Files\Unity\Editor\Data\Tools\RoslynScripts</CscToolPath> <CscToolPath>C:\Program Files\Unity\Editor\Data\Tools\RoslynScripts</CscToolPath>
<CscToolExe>unity_csc.bat</CscToolExe> <CscToolExe>unity_csc.bat</CscToolExe>
=======
>>>>>>> origin/Release
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
...@@ -54,6 +57,9 @@ ...@@ -54,6 +57,9 @@
<UnityVersion>2019.1.11f1</UnityVersion> <UnityVersion>2019.1.11f1</UnityVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Analyzer Include="C:\Program Files (x86)\Microsoft Visual Studio Tools for Unity\16.0\Analyzers\Microsoft.Unity.Analyzers.dll" />
</ItemGroup>
<ItemGroup>
<Reference Include="UnityEngine"> <Reference Include="UnityEngine">
<HintPath>C:\Program Files\Unity\Editor\Data\Managed/UnityEngine/UnityEngine.dll</HintPath> <HintPath>C:\Program Files\Unity\Editor\Data\Managed/UnityEngine/UnityEngine.dll</HintPath>
</Reference> </Reference>
...@@ -69,7 +75,10 @@ ...@@ -69,7 +75,10 @@
<Compile Include="Assets\Player\Scripts\BalasGuitarra.cs" /> <Compile Include="Assets\Player\Scripts\BalasGuitarra.cs" />
<Compile Include="Assets\Player\Scripts\Player2D.cs" /> <Compile Include="Assets\Player\Scripts\Player2D.cs" />
<Compile Include="Assets\Scripts\Coleccionables.cs" /> <Compile Include="Assets\Scripts\Coleccionables.cs" />
<Compile Include="Assets\Scripts\CrearEnemigos.cs" />
<Compile Include="Assets\Scripts\Enemigo1Move.cs" />
<Compile Include="Assets\Scripts\GuardarYCargar.cs" /> <Compile Include="Assets\Scripts\GuardarYCargar.cs" />
<Compile Include="Assets\Scripts\Jugador.cs" />
<Compile Include="Assets\Scripts\PowerUp.cs" /> <Compile Include="Assets\Scripts\PowerUp.cs" />
<Compile Include="Assets\Scripts\ZonaFinal.cs" /> <Compile Include="Assets\Scripts\ZonaFinal.cs" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface-Mobile.shader" /> <None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface-Mobile.shader" />
...@@ -91,6 +100,7 @@ ...@@ -91,6 +100,7 @@
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_Sprite.shader" /> <None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_Sprite.shader" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface.shader" /> <None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface.shader" />
<Reference Include="Unity.Timeline.Editor"> <Reference Include="Unity.Timeline.Editor">
<<<<<<< HEAD
<HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath> <HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Cinemachine"> <Reference Include="Cinemachine">
...@@ -113,6 +123,30 @@ ...@@ -113,6 +123,30 @@
</Reference> </Reference>
<Reference Include="Unity.Analytics.DataPrivacy"> <Reference Include="Unity.Analytics.DataPrivacy">
<HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll</HintPath> <HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll</HintPath>
=======
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
</Reference>
<Reference Include="Cinemachine">
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Cinemachine.dll</HintPath>
</Reference>
<Reference Include="Unity.TextMeshPro.Editor">
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
</Reference>
<Reference Include="Unity.Timeline">
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
</Reference>
<Reference Include="Unity.CollabProxy.Editor">
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll</HintPath>
</Reference>
<Reference Include="com.unity.cinemachine.editor">
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/com.unity.cinemachine.editor.dll</HintPath>
</Reference>
<Reference Include="Unity.TextMeshPro">
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
</Reference>
<Reference Include="Unity.Analytics.DataPrivacy">
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll</HintPath>
>>>>>>> origin/Release
</Reference> </Reference>
<Reference Include="UnityEngine.AIModule"> <Reference Include="UnityEngine.AIModule">
<HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll</HintPath> <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll</HintPath>
...@@ -298,6 +332,7 @@ ...@@ -298,6 +332,7 @@
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath> <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Analytics.Editor"> <Reference Include="Unity.Analytics.Editor">
<<<<<<< HEAD
<HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Editor.dll</HintPath> <HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Analytics.StandardEvents"> <Reference Include="Unity.Analytics.StandardEvents">
...@@ -305,6 +340,15 @@ ...@@ -305,6 +340,15 @@
</Reference> </Reference>
<Reference Include="Unity.Analytics.Tracker"> <Reference Include="Unity.Analytics.Tracker">
<HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Tracker.dll</HintPath> <HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Tracker.dll</HintPath>
=======
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Editor.dll</HintPath>
</Reference>
<Reference Include="Unity.Analytics.StandardEvents">
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.StandardEvents.dll</HintPath>
</Reference>
<Reference Include="Unity.Analytics.Tracker">
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Tracker.dll</HintPath>
>>>>>>> origin/Release
</Reference> </Reference>
<Reference Include="netstandard"> <Reference Include="netstandard">
<HintPath>C:/Program Files/Unity/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll</HintPath> <HintPath>C:/Program Files/Unity/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll</HintPath>
......
Videojuegos_Proyecto/Assets/Effects.meta 0 → 100644
fileFormatVersion: 2
guid: f6d872c6bac611044b248b80ead2ebe6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Effects/PickInvulnerability.prefab 0 → 100644
This diff could not be displayed because it is too large.
Videojuegos_Proyecto/Assets/Effects/PickInvulnerability.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: 537a38f03ae37734e8fe833077f59531
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Effects/PickLife.prefab 0 → 100644
This diff could not be displayed because it is too large.
Videojuegos_Proyecto/Assets/Effects/PickLife.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: be8437e4aefd8004ebc5d004b4ac4798
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Effects/PickVelocity.prefab 0 → 100644
This diff could not be displayed because it is too large.
Videojuegos_Proyecto/Assets/Effects/PickVelocity.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: 47e6ce82743488e40a8b3bb0615e28d9
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/MainMenu/Scripts/SeleccionNivel.cs
...@@ -30,6 +30,7 @@ public class SeleccionNivel : MonoBehaviour ...@@ -30,6 +30,7 @@ public class SeleccionNivel : MonoBehaviour
public void SeleccionarNivel(int numeroNivel) public void SeleccionarNivel(int numeroNivel)
{ {
Coleccionables.niActual = numeroNivel; Coleccionables.niActual = numeroNivel;
Coleccionables.Modificado();
SceneManager.LoadScene("SampleScene"); // SceneManager.LoadScene("Nivel" + numeroNivel); SceneManager.LoadScene("SampleScene"); // SceneManager.LoadScene("Nivel" + numeroNivel);
} }
......
Videojuegos_Proyecto/Assets/Player/Prefabs/DisparoBlanca.prefab
...@@ -15,7 +15,7 @@ GameObject: ...@@ -15,7 +15,7 @@ GameObject:
- component: {fileID: 3665294836788846838} - component: {fileID: 3665294836788846838}
m_Layer: 0 m_Layer: 0
m_Name: DisparoBlanca m_Name: DisparoBlanca
m_TagString: Untagged m_TagString: BalaFlauta
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
...@@ -131,5 +131,7 @@ MonoBehaviour: ...@@ -131,5 +131,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5826fc580708fb9428ba9526b71e3b33, type: 3} m_Script: {fileID: 11500000, guid: 5826fc580708fb9428ba9526b71e3b33, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
prefabColeccionable: {fileID: 6914436123365519657, guid: bb9f2d39e14ac4c4493c44a6cc1ddc3b,
type: 3}
velocidadDisparoFlauta: 6 velocidadDisparoFlauta: 6
duracionDisparoFlauta: 3 duracionDisparoFlauta: 3
Videojuegos_Proyecto/Assets/Player/Prefabs/DisparosCorcheas.prefab
...@@ -15,7 +15,7 @@ GameObject: ...@@ -15,7 +15,7 @@ GameObject:
- component: {fileID: 6213653337795431838} - component: {fileID: 6213653337795431838}
m_Layer: 0 m_Layer: 0
m_Name: DisparoCorchea2 m_Name: DisparoCorchea2
m_TagString: Untagged m_TagString: BalaGuitarra
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
...@@ -131,6 +131,8 @@ MonoBehaviour: ...@@ -131,6 +131,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9e842bc08877b954da64c1162f355a16, type: 3} m_Script: {fileID: 11500000, guid: 9e842bc08877b954da64c1162f355a16, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
prefabColeccionable: {fileID: 6914436123365519657, guid: bb9f2d39e14ac4c4493c44a6cc1ddc3b,
type: 3}
--- !u!1 &6213653338870642002 --- !u!1 &6213653338870642002
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -246,7 +248,7 @@ GameObject: ...@@ -246,7 +248,7 @@ GameObject:
- component: {fileID: 3589760484591723536} - component: {fileID: 3589760484591723536}
m_Layer: 0 m_Layer: 0
m_Name: DisparoCorchea1 m_Name: DisparoCorchea1
m_TagString: Untagged m_TagString: BalaGuitarra
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
...@@ -362,6 +364,8 @@ MonoBehaviour: ...@@ -362,6 +364,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9e842bc08877b954da64c1162f355a16, type: 3} m_Script: {fileID: 11500000, guid: 9e842bc08877b954da64c1162f355a16, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
prefabColeccionable: {fileID: 6914436123365519657, guid: bb9f2d39e14ac4c4493c44a6cc1ddc3b,
type: 3}
--- !u!1 &8566419871933135904 --- !u!1 &8566419871933135904
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -377,7 +381,7 @@ GameObject: ...@@ -377,7 +381,7 @@ GameObject:
- component: {fileID: 1662186839793251387} - component: {fileID: 1662186839793251387}
m_Layer: 0 m_Layer: 0
m_Name: DisparoCorchea0 m_Name: DisparoCorchea0
m_TagString: Untagged m_TagString: BalaGuitarra
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
...@@ -493,3 +497,5 @@ MonoBehaviour: ...@@ -493,3 +497,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9e842bc08877b954da64c1162f355a16, type: 3} m_Script: {fileID: 11500000, guid: 9e842bc08877b954da64c1162f355a16, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
prefabColeccionable: {fileID: 6914436123365519657, guid: bb9f2d39e14ac4c4493c44a6cc1ddc3b,
type: 3}
Videojuegos_Proyecto/Assets/Player/Scripts/BalaFlauta.cs
...@@ -4,6 +4,7 @@ using UnityEngine; ...@@ -4,6 +4,7 @@ using UnityEngine;
public class BalaFlauta : MonoBehaviour public class BalaFlauta : MonoBehaviour
{ {
public GameObject prefabColeccionable;
public float velocidadDisparoFlauta = 6; public float velocidadDisparoFlauta = 6;
public float duracionDisparoFlauta = 3; public float duracionDisparoFlauta = 3;
...@@ -31,13 +32,13 @@ public class BalaFlauta : MonoBehaviour ...@@ -31,13 +32,13 @@ public class BalaFlauta : MonoBehaviour
private void OnTriggerEnter2D(Collider2D collision) private void OnTriggerEnter2D(Collider2D collision)
{ {
//Para cuando entre la bala en un enemigo.
//Que se destruyan al chocar con el suelo o una pared //Que se destruyan al chocar con el suelo o una pared
if (collision.gameObject.tag == "Suelo") if (collision.gameObject.tag == "Suelo")
{ {
Destroy(this.gameObject); Destroy(this.gameObject);
} }
} }
} }
Videojuegos_Proyecto/Assets/Player/Scripts/BalaGuitarra.cs
...@@ -4,6 +4,7 @@ using UnityEngine; ...@@ -4,6 +4,7 @@ using UnityEngine;
public class BalaGuitarra : MonoBehaviour public class BalaGuitarra : MonoBehaviour
{ {
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
...@@ -18,13 +19,12 @@ public class BalaGuitarra : MonoBehaviour ...@@ -18,13 +19,12 @@ public class BalaGuitarra : MonoBehaviour
private void OnTriggerEnter2D(Collider2D collision) private void OnTriggerEnter2D(Collider2D collision)
{ {
//Para cuando entre la bala en un enemigo.
//Que se destruyan al chocar con el suelo o una pared //Que se destruyan al chocar con el suelo o una pared
if (collision.gameObject.tag == "Suelo") if (collision.gameObject.tag == "Suelo")
{ {
Destroy(this.gameObject); Destroy(this.gameObject);
} }
} }
} }
Videojuegos_Proyecto/Assets/Player/Scripts/Player2D.cs
...@@ -22,6 +22,10 @@ public class Player2D : MonoBehaviour ...@@ -22,6 +22,10 @@ public class Player2D : MonoBehaviour
private int instrumentoUsandose = 0; /* 0 = flauta, 1 = guitarra */ private int instrumentoUsandose = 0; /* 0 = flauta, 1 = guitarra */
public ParticleSystem efectoVida;
public ParticleSystem efectoVelocidad;
public ParticleSystem efectoInvulnerabilidad;
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
...@@ -168,17 +172,7 @@ public class Player2D : MonoBehaviour ...@@ -168,17 +172,7 @@ public class Player2D : MonoBehaviour
animator.SetTrigger("GolpeandoMelee"); 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; timeSiguienteAtaque = Time.time + 1f / ratioAtaqueMelee;
} }
...@@ -209,8 +203,32 @@ public class Player2D : MonoBehaviour ...@@ -209,8 +203,32 @@ public class Player2D : MonoBehaviour
Coleccionables.Modificado(); Coleccionables.Modificado();
Destroy(collision.gameObject); Destroy(collision.gameObject);
//Quitar este Debug.Log cuando tengamos el nivel actual //Quitar este Debug.Log cuando tengamos el HUD
Debug.Log(Coleccionables.cConseguidos[Coleccionables.niActual] + "/" + Coleccionables.cTotales[Coleccionables.niActual]); Debug.Log("Coleccionables: "+Coleccionables.cConseguidos[Coleccionables.niActual] + "/" + Coleccionables.cTotales[Coleccionables.niActual]);
} }
} }
public void EmpezarAnimacionVida() {
efectoVida.Play();
}
public void EmpezarAnimacionVelocidad()
{
efectoVelocidad.Play();
}
public void AcabarAnimacionVelocidad()
{
efectoVelocidad.Stop();
}
public void EmpezarAnimacionInvulnerabilidad()
{
efectoInvulnerabilidad.Play();
}
public void AcabarAnimacionInvulnerabilidad()
{
efectoInvulnerabilidad.Stop();
}
} }
Videojuegos_Proyecto/Assets/Prefabs/EnemigoEjemplo.prefab 0 → 100644
%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 0 → 100644
fileFormatVersion: 2
guid: 4cad856fb8f87054e8cb7d66b4d1e74e
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Prefabs/GameManager.prefab
...@@ -10,6 +10,7 @@ GameObject: ...@@ -10,6 +10,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 7736364748447018736} - component: {fileID: 7736364748447018736}
- component: {fileID: 3174322665456641310} - component: {fileID: 3174322665456641310}
- component: {fileID: 1646803205624574402}
m_Layer: 0 m_Layer: 0
m_Name: GameManager m_Name: GameManager
m_TagString: Untagged m_TagString: Untagged
...@@ -43,10 +44,12 @@ MonoBehaviour: ...@@ -43,10 +44,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 94ed2c62992ea584eb669871b1668a3c, type: 3} m_Script: {fileID: 11500000, guid: 94ed2c62992ea584eb669871b1668a3c, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
inicializado: 0
prefabColeccionable: {fileID: 6914436123365519657, guid: bb9f2d39e14ac4c4493c44a6cc1ddc3b, prefabColeccionable: {fileID: 6914436123365519657, guid: bb9f2d39e14ac4c4493c44a6cc1ddc3b,
type: 3} type: 3}
NO_TOCAR_LAS_VARIABLES_DESDE_AQUI: 1 NO_TOCAR_LAS_VARIABLES_DESDE_AQUI: 1
numeroNiveles: 1 numeroNiveles: 1
nivelActual: 0
coleccTotales: 00000000 coleccTotales: 00000000
colecConseguidos: 00000000 colecConseguidos: 00000000
enemigosTotales: 00000000 enemigosTotales: 00000000
...@@ -59,3 +62,16 @@ MonoBehaviour: ...@@ -59,3 +62,16 @@ MonoBehaviour:
- {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 0} - {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/Invulnerabilidad.prefab
...@@ -120,3 +120,6 @@ MonoBehaviour: ...@@ -120,3 +120,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3} m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
efectoCogerVida: {fileID: 2346756237646661404, guid: be8437e4aefd8004ebc5d004b4ac4798,
type: 3}
player: {fileID: 0}
Videojuegos_Proyecto/Assets/Prefabs/LimiteCaida.prefab 0 → 100644
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5764835571609392104
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 694183434271897141}
- component: {fileID: 473257042043114732}
m_Layer: 0
m_Name: LimiteCaida
m_TagString: Caida
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &694183434271897141
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5764835571609392104}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 8, y: -6, 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!61 &473257042043114732
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5764835571609392104}
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, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 15, y: 1}
m_EdgeRadius: 0
Videojuegos_Proyecto/Assets/Prefabs/LimiteCaida.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: 3f846f2b1ae2eab4c8681ee81bf96ca2
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Prefabs/PlayerV2.prefab
...@@ -13,9 +13,10 @@ GameObject: ...@@ -13,9 +13,10 @@ GameObject:
- component: {fileID: 5415114670227481225} - component: {fileID: 5415114670227481225}
- component: {fileID: 5415114670227481230} - component: {fileID: 5415114670227481230}
- component: {fileID: 5415114670227481224} - component: {fileID: 5415114670227481224}
- component: {fileID: 9185189218782277443}
- component: {fileID: 5415114670227481231} - component: {fileID: 5415114670227481231}
m_Layer: 0 m_Layer: 0
m_Name: PlayerV2 1 m_Name: PlayerV2
m_TagString: Player m_TagString: Player
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
...@@ -152,6 +153,18 @@ Animator: ...@@ -152,6 +153,18 @@ Animator:
m_HasTransformHierarchy: 1 m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1 m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0 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 --- !u!114 &5415114670227481231
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
Videojuegos_Proyecto/Assets/Prefabs/Velocidad.prefab
...@@ -120,3 +120,6 @@ MonoBehaviour: ...@@ -120,3 +120,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3} m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
efectoCogerVida: {fileID: 2346756237646661404, guid: be8437e4aefd8004ebc5d004b4ac4798,
type: 3}
player: {fileID: 0}
Videojuegos_Proyecto/Assets/Prefabs/Vida.prefab
...@@ -120,3 +120,6 @@ MonoBehaviour: ...@@ -120,3 +120,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3} m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
efectoCogerVida: {fileID: 2346756237646661404, guid: be8437e4aefd8004ebc5d004b4ac4798,
type: 3}
player: {fileID: 0}
Videojuegos_Proyecto/Assets/Scripts/Coleccionables.cs
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.SceneManagement;
public class Coleccionables : MonoBehaviour public class Coleccionables : MonoBehaviour
{ {
...@@ -74,15 +75,18 @@ public class Coleccionables : MonoBehaviour ...@@ -74,15 +75,18 @@ public class Coleccionables : MonoBehaviour
private void Start() private void Start()
{ {
for (int i = 0; i < pColecNivel1.Length; i++) if (niActual == 0 && SceneManager.GetActiveScene().name != "SeleccionNivel") {
{ for (int i = 0; i < pColecNivel1.Length; i++)
if (pColecNivel1[i] != new Vector3(0, 0, 0))
{ {
if (pColecNivel1[i] != new Vector3(0, 0, 0))
{
Instantiate(prefabColeccionable, pColecNivel1[i], Quaternion.identity); Instantiate(prefabColeccionable, pColecNivel1[i], Quaternion.identity);
}
} }
} }
Modificado(); Modificado();
} }
...@@ -130,3 +134,24 @@ public class Coleccionables : MonoBehaviour ...@@ -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 0 → 100644
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 0 → 100644
fileFormatVersion: 2
guid: 1907c97001aad5943a7c511192d2d99c
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Scripts/Enemigo1Move.cs 0 → 100644
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 0 → 100644
fileFormatVersion: 2
guid: 82ace38098eedee4bb60e1b360991384
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Scripts/Jugador.cs 0 → 100644
using System.Collections;
using System.Collections.Generic;
using System;
using UnityEngine;
public class Jugador : MonoBehaviour
{
public int vidas;
private float tInvulnerable;
public bool powerUpInvulnerable;
// Start is called before the first frame update
void Start()
{
vidas = 3;
tInvulnerable = 0;
powerUpInvulnerable = false;
}
// Update is called once per frame
void Update()
{
//Se va reduciendo el tiempo de invulnerabilidad
if (tInvulnerable >= 0)
{
tInvulnerable -= Time.deltaTime;
}
}
private void OnTriggerEnter2D(Collider2D collision)
{
<<<<<<< HEAD
if (collision.tag == "Enemigo" && tInvulnerable<=0 && powerUpInvulnerable==false)
=======
//Si colisiona con un enemigose le quita una vida
if (collision.tag == "Enemigo" && tInvulnerable<=0)
>>>>>>> origin/Release
{
Dañado();
}
if (collision.tag == "Caida")
{
Muerte();
}
//Si colisiona con un power up se comprueba cuál es y se hacen sus efectos
//if (collision.tag == "PowerUp")
//{
//}
}
void Dañado()
{
if (vidas > 1)
{
//Si el jugador es dañado se baja una vida y se le da un tiempo de invulnerabilidad
vidas--;
tInvulnerable = 1.5f;
Debug.Log("Vida actual: " + vidas + "/3");
}
else
{
//Si las vidas se reducen a cero, el jugador muere
Muerte();
}
}
public void Muerte()
{
//El jugador muere
Debug.Log("Muerte");
}
}
Videojuegos_Proyecto/Assets/Scripts/Jugador.cs.meta 0 → 100644
fileFormatVersion: 2
guid: fb387e14ec85d764aa2bdac5ed1eb3cb
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Scripts/PowerUp.cs
...@@ -5,11 +5,9 @@ using UnityEngine; ...@@ -5,11 +5,9 @@ using UnityEngine;
public class PowerUp : MonoBehaviour public class PowerUp : MonoBehaviour
{ {
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
} }
// Update is called once per frame // Update is called once per frame
...@@ -21,19 +19,25 @@ public class PowerUp : MonoBehaviour ...@@ -21,19 +19,25 @@ public class PowerUp : MonoBehaviour
private void OnTriggerEnter2D(Collider2D other) private void OnTriggerEnter2D(Collider2D other)
{ {
if (other.CompareTag("Player")) { if (other.CompareTag("Player")) {
if (this.CompareTag("PU_Velocidad")) { if (this.CompareTag("PU_Velocidad")) {
Debug.Log("El jugador ha chocado con el power up de velocidad"); Debug.Log("El jugador ha chocado con el power up de velocidad");
other.GetComponent<Player2D>().velocidadAlAndar = 6.0f; other.GetComponent<Player2D>().velocidadAlAndar = 6.0f;
other.GetComponent<Player2D>().EmpezarAnimacionVelocidad();
StartCoroutine(CogerVelocidad(other)); StartCoroutine(CogerVelocidad(other));
} }
if (this.CompareTag("PU_Invulnerabilidad")) { if (this.CompareTag("PU_Invulnerabilidad")) {
Debug.Log("El jugador ha chocado con el power up de invulnerabilidad"); Debug.Log("El jugador ha chocado con el power up de invulnerabilidad");
Destroy(gameObject); other.GetComponent<Jugador>().powerUpInvulnerable = true;
other.GetComponent<Player2D>().EmpezarAnimacionInvulnerabilidad();
StartCoroutine(CogerInvulnerabilidad(other));
} }
if (this.CompareTag("PU_Vida")) { if (this.CompareTag("PU_Vida")) {
Debug.Log("El jugador ha chocado con el power up de vida"); Debug.Log("El jugador ha chocado con el power up de vida");
//other.GetComponent<Player2D>; other.GetComponent<Jugador>().vidas=3;
other.GetComponent<Player2D>().EmpezarAnimacionVida();
Debug.Log("Las vidas del jugador son:"+ other.GetComponent<Jugador>().vidas);
Destroy(gameObject); Destroy(gameObject);
} }
} }
...@@ -42,13 +46,13 @@ public class PowerUp : MonoBehaviour ...@@ -42,13 +46,13 @@ public class PowerUp : MonoBehaviour
void DesactivarObjeto() { void DesactivarObjeto() {
GetComponent<SpriteRenderer>().enabled = false; GetComponent<SpriteRenderer>().enabled = false;
GetComponent<BoxCollider2D>().enabled = false; GetComponent<BoxCollider2D>().enabled = false;
} }
IEnumerator CogerVelocidad(Collider2D player) { IEnumerator CogerVelocidad(Collider2D player) {
DesactivarObjeto(); DesactivarObjeto();
yield return new WaitForSeconds(5.0f); yield return new WaitForSeconds(5.0f);
player.GetComponent<Player2D>().velocidadAlAndar = 3.0f; player.GetComponent<Player2D>().velocidadAlAndar = 3.0f;
player.GetComponent<Player2D>().AcabarAnimacionVelocidad();
Destroy(gameObject); Destroy(gameObject);
} }
...@@ -56,12 +60,8 @@ public class PowerUp : MonoBehaviour ...@@ -56,12 +60,8 @@ public class PowerUp : MonoBehaviour
{ {
DesactivarObjeto(); DesactivarObjeto();
yield return new WaitForSeconds(5.0f); yield return new WaitForSeconds(5.0f);
Destroy(gameObject); player.GetComponent<Jugador>().powerUpInvulnerable = false;
} player.GetComponent<Player2D>().AcabarAnimacionInvulnerabilidad();
void CogerVida(Collider2D player)
{
Destroy(gameObject); Destroy(gameObject);
} }
} }
Videojuegos_Proyecto/Assets/Scripts/ZonaFinal.cs
...@@ -30,27 +30,28 @@ public class ZonaFinal : MonoBehaviour ...@@ -30,27 +30,28 @@ public class ZonaFinal : MonoBehaviour
private void OnTriggerEnter2D(Collider2D collision) private void OnTriggerEnter2D(Collider2D collision)
{ {
if(collision.gameObject.tag == "Player") {
GuardarYCargar.Guardar(colecto, "slotColeccionables"); GuardarYCargar.Guardar(colecto, "slotColeccionables");
//Si el jugador entra aqui significa que se ha pasado el nivel. Parar el tiempo de juego, //Si el jugador entra aqui significa que se ha pasado el nivel. Parar el tiempo de juego,
//entonces mirar el tema de los coleccionables. //entonces mirar el tema de los coleccionables.
Time.timeScale = 0; Time.timeScale = 0;
if (!Coleccionables.vMostrada[Coleccionables.niActual] && if (!Coleccionables.vMostrada[Coleccionables.niActual] &&
Coleccionables.cConseguidos[Coleccionables.niActual] == Coleccionables.cTotales[Coleccionables.niActual]) Coleccionables.cConseguidos[Coleccionables.niActual] == Coleccionables.cTotales[Coleccionables.niActual])
{ {
canvasColecionableDesbloqueados.gameObject.SetActive(true); canvasColecionableDesbloqueados.gameObject.SetActive(true);
Sprite imagenPartitura = Resources.Load<Sprite>(Coleccionables.nIPartitura[Coleccionables.niActual]); Sprite imagenPartitura = Resources.Load<Sprite>(Coleccionables.nIPartitura[Coleccionables.niActual]);
SitioImagenPartitura.GetComponent<Image>().sprite = imagenPartitura; SitioImagenPartitura.GetComponent<Image>().sprite = imagenPartitura;
Coleccionables.vMostrada[Coleccionables.niActual] = true; Coleccionables.vMostrada[Coleccionables.niActual] = true;
Coleccionables.Modificado(); Coleccionables.Modificado();
} }
else { else {
AbrirCanvasVictoria(); AbrirCanvasVictoria();
}
GuardarYCargar.Guardar(colecto, "slotColeccionables");
} }
GuardarYCargar.Guardar(colecto, "slotColeccionables");
} }
//Se abre al darle al boton siguiente desde el canvas "canvasColecionableDesbloqueados" o sino se han consguido todos los coleccionables //Se abre al darle al boton siguiente desde el canvas "canvasColecionableDesbloqueados" o sino se han consguido todos los coleccionables
...@@ -63,7 +64,7 @@ public class ZonaFinal : MonoBehaviour ...@@ -63,7 +64,7 @@ public class ZonaFinal : MonoBehaviour
//Este if hay que hacerlo siempre que se vaya a aumentar el contador de enemigo derrotado, para evitar que se den coleccionables extras //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; Coleccionables.eDerrotados[Coleccionables.niActual] = 0;
} }
} }
public void VolverALaSeleccionDeNivel() { public void VolverALaSeleccionDeNivel() {
......
Videojuegos_Proyecto/Library/CurrentLayout.dwlt
...@@ -21,7 +21,7 @@ MonoBehaviour: ...@@ -21,7 +21,7 @@ MonoBehaviour:
m_ShowMode: 4 m_ShowMode: 4
m_Title: m_Title:
m_RootView: {fileID: 6} m_RootView: {fileID: 6}
m_MinSize: {x: 950, y: 544} m_MinSize: {x: 950, y: 300}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &2 --- !u!114 &2
MonoBehaviour: MonoBehaviour:
...@@ -44,10 +44,17 @@ MonoBehaviour: ...@@ -44,10 +44,17 @@ MonoBehaviour:
y: 30 y: 30
width: 1920 width: 1920
height: 947 height: 947
m_MinSize: {x: 679, y: 494} <<<<<<< HEAD
m_MaxSize: {x: 14002, y: 14044} m_MinSize: {x: 683, y: 494}
m_MaxSize: {x: 14004, y: 14044}
vertical: 0
controlID: 79
=======
m_MinSize: {x: 679, y: 344}
m_MaxSize: {x: 12004, y: 8044}
vertical: 0 vertical: 0
controlID: 42 controlID: 54
>>>>>>> origin/Release
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -67,8 +74,8 @@ MonoBehaviour: ...@@ -67,8 +74,8 @@ MonoBehaviour:
y: 0 y: 0
width: 389 width: 389
height: 947 height: 947
m_MinSize: {x: 275, y: 50} m_MinSize: {x: 277, y: 72}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4002, y: 4022}
m_ActualView: {fileID: 14} m_ActualView: {fileID: 14}
m_Panes: m_Panes:
- {fileID: 14} - {fileID: 14}
...@@ -118,6 +125,7 @@ MonoBehaviour: ...@@ -118,6 +125,7 @@ MonoBehaviour:
x: 0 x: 0
y: 573 y: 573
width: 1531 width: 1531
<<<<<<< HEAD
height: 374 height: 374
m_MinSize: {x: 232, y: 272} m_MinSize: {x: 232, y: 272}
m_MaxSize: {x: 10002, y: 10022} m_MaxSize: {x: 10002, y: 10022}
...@@ -126,7 +134,17 @@ MonoBehaviour: ...@@ -126,7 +134,17 @@ MonoBehaviour:
- {fileID: 13} - {fileID: 13}
- {fileID: 18} - {fileID: 18}
m_Selected: 0 m_Selected: 0
m_LastSelected: 1 =======
height: 342
m_MinSize: {x: 102, y: 122}
m_MaxSize: {x: 4002, y: 4022}
m_ActualView: {fileID: 18}
m_Panes:
- {fileID: 13}
- {fileID: 18}
m_Selected: 1
>>>>>>> origin/Release
m_LastSelected: 0
--- !u!114 &6 --- !u!114 &6
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -215,10 +233,15 @@ MonoBehaviour: ...@@ -215,10 +233,15 @@ MonoBehaviour:
y: 0 y: 0
width: 1531 width: 1531
height: 947 height: 947
m_MinSize: {x: 404, y: 494} <<<<<<< HEAD
m_MinSize: {x: 406, y: 494}
m_MaxSize: {x: 10002, y: 14044} m_MaxSize: {x: 10002, y: 14044}
=======
m_MinSize: {x: 404, y: 344}
m_MaxSize: {x: 8004, y: 8044}
>>>>>>> origin/Release
vertical: 1 vertical: 1
controlID: 43 controlID: 55
--- !u!114 &10 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -240,10 +263,10 @@ MonoBehaviour: ...@@ -240,10 +263,10 @@ MonoBehaviour:
y: 0 y: 0
width: 1531 width: 1531
height: 573 height: 573
m_MinSize: {x: 404, y: 222} m_MinSize: {x: 406, y: 222}
m_MaxSize: {x: 8004, y: 4022} m_MaxSize: {x: 8006, y: 4022}
vertical: 0 vertical: 0
controlID: 44 controlID: 33
--- !u!114 &11 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -262,9 +285,15 @@ MonoBehaviour: ...@@ -262,9 +285,15 @@ MonoBehaviour:
x: 379 x: 379
y: 0 y: 0
width: 1152 width: 1152
<<<<<<< HEAD
height: 573 height: 573
m_MinSize: {x: 204, y: 222} m_MinSize: {x: 204, y: 222}
m_MaxSize: {x: 4004, y: 4022} m_MaxSize: {x: 4004, y: 4022}
=======
height: 605
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
>>>>>>> origin/Release
m_ActualView: {fileID: 16} m_ActualView: {fileID: 16}
m_Panes: m_Panes:
- {fileID: 16} - {fileID: 16}
...@@ -293,10 +322,10 @@ MonoBehaviour: ...@@ -293,10 +322,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 379 x: 468
y: 73 y: 181
width: 1150 width: 973
height: 554 height: 501
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
--- !u!114 &13 --- !u!114 &13
MonoBehaviour: MonoBehaviour:
...@@ -336,34 +365,50 @@ MonoBehaviour: ...@@ -336,34 +365,50 @@ MonoBehaviour:
m_ShowAllHits: 0 m_ShowAllHits: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
- Assets/Player/Scripts <<<<<<< HEAD
- Assets/Effects
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: m_LastFolders:
- Assets/Player/Scripts - Assets/Effects
m_LastFoldersGridSize: -1 m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\JC\Desktop\DesarrolloDeVideojuegos_Proyecto\Videojuegos_Proyecto m_LastProjectPath: C:\Users\JC\Desktop\DesarrolloDeVideojuegos_Proyecto\Videojuegos_Proyecto
=======
- Assets/Prefabs
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Prefabs
m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\alvmo\Documents\NetBeansProjects\DesarrolloDeVideojuegos_Proyecto\Videojuegos_Proyecto
>>>>>>> origin/Release
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 3a350000 <<<<<<< HEAD
m_LastClickedID: 13626 m_SelectedIDs: 36330000
m_ExpandedIDs: 00000000662b00009634000000ca9a3b m_LastClickedID: 13110
m_ExpandedIDs: 00000000662a000000ca9a3b
=======
m_SelectedIDs: ac370000
m_LastClickedID: 14252
m_ExpandedIDs: 00000000642d000000ca9a3b
>>>>>>> origin/Release
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name: Scripts
m_OriginalName: m_OriginalName: Scripts
m_EditFieldRect: m_EditFieldRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 0 width: 0
height: 0 height: 0
m_UserData: 0 m_UserData: 12856
m_IsWaitingForDelay: 0 m_IsWaitingForDelay: 0
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 0
m_IsRenamingFilename: 1 m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 5} m_ClientGUIView: {fileID: 5}
m_SearchString: m_SearchString:
...@@ -377,7 +422,11 @@ MonoBehaviour: ...@@ -377,7 +422,11 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 00000000662b0000 <<<<<<< HEAD
m_ExpandedIDs: 00000000662a0000
=======
m_ExpandedIDs: 00000000642d0000
>>>>>>> origin/Release
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -402,8 +451,8 @@ MonoBehaviour: ...@@ -402,8 +451,8 @@ MonoBehaviour:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_ResourceFile: m_ResourceFile:
m_ListAreaState: m_ListAreaState:
m_SelectedInstanceIDs: m_SelectedInstanceIDs: 0e440000
m_LastClickedInstanceID: 0 m_LastClickedInstanceID: 17422
m_HadKeyboardFocusLastEvent: 1 m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000 m_ExpandedInstanceIDs: c6230000
m_RenameOverlay: m_RenameOverlay:
...@@ -421,7 +470,7 @@ MonoBehaviour: ...@@ -421,7 +470,7 @@ MonoBehaviour:
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 11
m_IsRenamingFilename: 1 m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 5} m_ClientGUIView: {fileID: 0}
m_CreateAssetUtility: m_CreateAssetUtility:
m_EndAction: {fileID: 0} m_EndAction: {fileID: 0}
m_InstanceID: 0 m_InstanceID: 0
...@@ -497,23 +546,29 @@ MonoBehaviour: ...@@ -497,23 +546,29 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: b6290000 <<<<<<< HEAD
m_SelectedIDs: aa2a0000
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 20faffff m_ExpandedIDs: 00f3ffff10faffff78fbffff
=======
m_SelectedIDs: 0e440000
m_LastClickedID: 17422
m_ExpandedIDs: eeefffff1cf0ffff14f8ffffdaf8ffff0e440000
>>>>>>> origin/Release
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name: GameObject
m_OriginalName: m_OriginalName: GameObject
m_EditFieldRect: m_EditFieldRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 0 width: 0
height: 0 height: 0
m_UserData: 0 m_UserData: -6684
m_IsWaitingForDelay: 0 m_IsWaitingForDelay: 0
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 0
m_IsRenamingFilename: 0 m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 0} m_ClientGUIView: {fileID: 0}
m_SearchString: m_SearchString:
...@@ -522,7 +577,7 @@ MonoBehaviour: ...@@ -522,7 +577,7 @@ MonoBehaviour:
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_CurrentSortingName: TransformSorting m_CurrentSortingName: TransformSorting
m_WindowGUID: 882b1ffbccde250418ab8e4c9d2d3ed7 m_WindowGUID: 29a1ae5ed2e786e46ab464313a854c6e
--- !u!114 &16 --- !u!114 &16
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -550,7 +605,7 @@ MonoBehaviour: ...@@ -550,7 +605,7 @@ MonoBehaviour:
height: 554 height: 554
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_ShowContextualTools: 0 m_ShowContextualTools: 0
m_WindowGUID: 9da1557899ac30346918b300a279c884 m_WindowGUID: d2fa7bccd99ad644c90c32d37501e809
m_Gizmos: 1 m_Gizmos: 1
m_SceneIsLit: 1 m_SceneIsLit: 1
m_SceneLighting: 1 m_SceneLighting: 1
...@@ -559,9 +614,15 @@ MonoBehaviour: ...@@ -559,9 +614,15 @@ MonoBehaviour:
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
m_Target: {x: -5.123681, y: 0.13753039, z: -4.2441635} <<<<<<< HEAD
m_Target: {x: -4.810031, y: -0.21807352, z: -2.0888672}
speed: 2
m_Value: {x: -4.810031, y: -0.21807352, z: -2.0888672}
=======
m_Target: {x: 18.764812, y: -2.7877026, z: -0.078125}
speed: 2 speed: 2
m_Value: {x: -5.123681, y: 0.13753039, z: -4.2441635} m_Value: {x: 18.764812, y: -2.7877026, z: -0.078125}
>>>>>>> origin/Release
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
...@@ -594,9 +655,15 @@ MonoBehaviour: ...@@ -594,9 +655,15 @@ MonoBehaviour:
speed: 2 speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1} m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size: m_Size:
m_Target: 7.8685966 <<<<<<< HEAD
m_Target: 5.5487404
speed: 2 speed: 2
m_Value: 7.8685966 m_Value: 5.5487404
=======
m_Target: 21.01
speed: 2
m_Value: 21.01
>>>>>>> origin/Release
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
...@@ -723,8 +790,8 @@ MonoBehaviour: ...@@ -723,8 +790,8 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 8
y: 646 y: 718
width: 1531 width: 1366
height: 355 height: 308
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
Videojuegos_Proyecto/Library/StateCache/Hierarchy/29a1ae-be8437e4aefd8004eb.json 0 → 100644
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":2346756237646661404,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/Hierarchy/29a1ae-mainStage.json 0 → 100644
{"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-38c9ae1c49230e24a8.json 0 → 100644
{"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 0 → 100644
{"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} {"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-3012,-1236],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file \ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/Hierarchy/c30137-mainStage.json 0 → 100644
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-3498,-1690,-1508],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/Hierarchy/e4f845-1f95e6a67b369a549b.json 0 → 100644
{"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 0 → 100644
{"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-3f846f2b1ae2eab4c8.json 0 → 100644
{"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/e4f845-4cad856fb8f87054e8.json 0 → 100644
{"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 0 → 100644
{"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} {"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file \ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/2d69cc-38c9ae1c49230e24a8.json 0 → 100644
{"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 0 → 100644
{"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} {"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 \ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/407e75-mainStage.json 0 → 100644
{"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":-5.016723155975342,"y":0.5813383460044861,"z":-4.8798828125},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":6.283851146697998,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/43dad8-1f95e6a67b369a549b.json 0 → 100644
{"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 0 → 100644
{"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-3f846f2b1ae2eab4c8.json 0 → 100644
{"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":8.0,"y":-6.0,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":22.0,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/43dad8-4cad856fb8f87054e8.json 0 → 100644
{"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 0 → 100644
{"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":18.764812469482423,"y":-2.7877025604248049,"z":-0.078125},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":21.010000228881837,"orthographic":true}
{"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} \ 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":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
Videojuegos_Proyecto/Library/StateCache/SceneView/9da155-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":-5.12368106842041,"y":0.1375303864479065,"z":-4.244163513183594},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":7.86859655380249,"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":451.57598876953127,"y":141.83811950683595,"z":-62.875},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":482.1205139160156,"orthographic":true}
\ No newline at end of file \ No newline at end of file
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