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

Videojuegos_Proyecto/Assets/Sprites/PowerUps.meta → Videojuegos_Proyecto/Assets/Effects.meta

 fileFormatVersion: 2
-guid: d344f8beb905eef4f9e03de1de88342f
+guid: f6d872c6bac611044b248b80ead2ebe6
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Videojuegos_Proyecto/Assets/Effects/PickAttack.prefab.meta

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

Videojuegos_Proyecto/Assets/Effects/PickInvulnerability.prefab.meta

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

Videojuegos_Proyecto/Assets/Effects/PickLife.prefab.meta

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

Videojuegos_Proyecto/Assets/Effects/PickVelocity.prefab.meta

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

Videojuegos_Proyecto/Assets/Player/Scripts/Player2D.cs

@@ -22,6 +22,11 @@ public class Player2D : MonoBehaviour
 
     private int instrumentoUsandose = 0; /* 0 = flauta, 1 = guitarra */
 
+    public ParticleSystem efectoVida;
+    public ParticleSystem efectoVelocidad;
+    public ParticleSystem efectoInvulnerabilidad;
+    public ParticleSystem efectoAtaque;
+
     // Start is called before the first frame update
     void Start()
     {
@@ -203,4 +208,38 @@ public class Player2D : MonoBehaviour
             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();
+    }
+
+    public void EmpezarAnimacionAtaque()
+    {
+        efectoAtaque.Play();
+    }
+
+    public void AcabarAnimacionAtaque()
+    {
+        efectoAtaque.Stop();
+    }
 }

Videojuegos_Proyecto/Assets/Prefabs/Ataque.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8319826604163745464
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8319826604163745470}
+  - component: {fileID: 8319826604163745471}
+  - component: {fileID: 8124161828312065322}
+  - component: {fileID: 949298270689518643}
+  m_Layer: 0
+  m_Name: Ataque
+  m_TagString: PU_Ataque
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8319826604163745470
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8319826604163745464}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -7.13402, y: 0.97681314, 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 &8319826604163745471
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8319826604163745464}
+  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: 1591816466183293685, 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!114 &8124161828312065322
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8319826604163745464}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!61 &949298270689518643
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8319826604163745464}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0.005110979, y: -0.15844202}
+  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.5262246, y: 0.3831159}
+  m_EdgeRadius: 0

Videojuegos_Proyecto/Assets/Prefabs/Ataque.prefab.meta

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

Videojuegos_Proyecto/Assets/Prefabs/Invulnerabilidad.prefab

@@ -120,3 +120,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  efectoCogerVida: {fileID: 2346756237646661404, guid: be8437e4aefd8004ebc5d004b4ac4798,
+    type: 3}
+  player: {fileID: 0}

Videojuegos_Proyecto/Assets/Prefabs/Velocidad.prefab

@@ -120,3 +120,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  efectoCogerVida: {fileID: 2346756237646661404, guid: be8437e4aefd8004ebc5d004b4ac4798,
+    type: 3}
+  player: {fileID: 0}

Videojuegos_Proyecto/Assets/Prefabs/Vida.prefab

@@ -120,3 +120,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  efectoCogerVida: {fileID: 2346756237646661404, guid: be8437e4aefd8004ebc5d004b4ac4798,
+    type: 3}
+  player: {fileID: 0}

Videojuegos_Proyecto/Assets/Scenes/SampleScene.unity

@@ -1569,6 +1569,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4a60d0ff4cd58a9409b0c9e6090f8691, type: 3}
+--- !u!198 &907822432 stripped
+ParticleSystem:
+  m_CorrespondingSourceObject: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
+    type: 3}
+  m_PrefabInstance: {fileID: 1502216785}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &934017994 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 5795469288980629201, guid: a5a71a4c38f617d4299230137ddfd37a,
@@ -2256,6 +2262,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8d1a822faf6ebdb4fadb73791c65c824, type: 3}
+--- !u!198 &1369306225 stripped
+ParticleSystem:
+  m_CorrespondingSourceObject: {fileID: 3127738502141577965, guid: 47e6ce82743488e40a8b3bb0615e28d9,
+    type: 3}
+  m_PrefabInstance: {fileID: 2135356851}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1381450684
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2688,6 +2700,252 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1496841462}
   m_CullTransparentMesh: 0
+--- !u!198 &1498513994 stripped
+ParticleSystem:
+  m_CorrespondingSourceObject: {fileID: 1631923658231038020, guid: be8437e4aefd8004ebc5d004b4ac4798,
+    type: 3}
+  m_PrefabInstance: {fileID: 1519695202}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1502216785
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8077010286852682689}
+    m_Modifications:
+    - target: {fileID: 712684995694393650, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: m_Name
+      value: PickInvulnerability
+      objectReference: {fileID: 0}
+    - target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: ShapeModule.type
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: ShapeModule.m_Sprite
+      value: 
+      objectReference: {fileID: 303064485153503272, guid: 05935f63555950743bc5b132fe4a28b0,
+        type: 3}
+    - target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: ShapeModule.placementMode
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: InitialModule.startSize.scalar
+      value: 0.4
+      objectReference: {fileID: 0}
+    - target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: InitialModule.rotation3D
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: ShapeModule.radiusThickness
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: ShapeModule.m_MeshNormalOffset
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: UVModule.enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: UVModule.mode
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: UVModule.sprites.Array.data[0].sprite
+      value: 
+      objectReference: {fileID: 303064485153503272, guid: 05935f63555950743bc5b132fe4a28b0,
+        type: 3}
+    - target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: ShapeModule.arc.mode
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: InitialModule.startSpeed.scalar
+      value: 0.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: InitialModule.startLifetime.scalar
+      value: 0.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: ShapeModule.radius.value
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7207253405088338279, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7207253405088338279, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.75
+      objectReference: {fileID: 0}
+    - target: {fileID: 7207253405088338279, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7207253405088338279, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 7207253405088338279, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7207253405088338279, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7207253405088338279, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 7207253405088338279, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 7207253405088338279, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 7207253405088338279, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7207253405088338279, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4470096071008591614, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+    - target: {fileID: 4470096071008591614, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4470096071008591614, guid: 537a38f03ae37734e8fe833077f59531,
+        type: 3}
+      propertyPath: m_MaxParticleSize
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 537a38f03ae37734e8fe833077f59531, type: 3}
+--- !u!1001 &1519695202
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8077010286852682689}
+    m_Modifications:
+    - target: {fileID: 2346756237646661404, guid: be8437e4aefd8004ebc5d004b4ac4798,
+        type: 3}
+      propertyPath: m_Name
+      value: PickLife
+      objectReference: {fileID: 0}
+    - target: {fileID: 1631923658231038020, guid: be8437e4aefd8004ebc5d004b4ac4798,
+        type: 3}
+      propertyPath: InitialModule.startSize.scalar
+      value: 0.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 1631923658231038020, guid: be8437e4aefd8004ebc5d004b4ac4798,
+        type: 3}
+      propertyPath: InitialModule.startLifetime.scalar
+      value: 0.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 1631923658231038020, guid: be8437e4aefd8004ebc5d004b4ac4798,
+        type: 3}
+      propertyPath: InitialModule.startSpeed.scalar
+      value: 0.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 6156087301233190797, guid: be8437e4aefd8004ebc5d004b4ac4798,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.112
+      objectReference: {fileID: 0}
+    - target: {fileID: 6156087301233190797, guid: be8437e4aefd8004ebc5d004b4ac4798,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6156087301233190797, guid: be8437e4aefd8004ebc5d004b4ac4798,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6156087301233190797, guid: be8437e4aefd8004ebc5d004b4ac4798,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 6156087301233190797, guid: be8437e4aefd8004ebc5d004b4ac4798,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6156087301233190797, guid: be8437e4aefd8004ebc5d004b4ac4798,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6156087301233190797, guid: be8437e4aefd8004ebc5d004b4ac4798,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 6156087301233190797, guid: be8437e4aefd8004ebc5d004b4ac4798,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 6156087301233190797, guid: be8437e4aefd8004ebc5d004b4ac4798,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 6156087301233190797, guid: be8437e4aefd8004ebc5d004b4ac4798,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6156087301233190797, guid: be8437e4aefd8004ebc5d004b4ac4798,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: be8437e4aefd8004ebc5d004b4ac4798, type: 3}
 --- !u!4 &1542754107 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 430921950440142130, guid: 726f1e301bb87004cb25690c7f76df9c,
@@ -3495,6 +3753,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8d1a822faf6ebdb4fadb73791c65c824, type: 3}
+--- !u!198 &1935859694 stripped
+ParticleSystem:
+  m_CorrespondingSourceObject: {fileID: 8566976512845724115, guid: 72cf9991b7b52504aacba9be3a9b93f2,
+    type: 3}
+  m_PrefabInstance: {fileID: 3638040982261033222}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1936763700
 GameObject:
   m_ObjectHideFlags: 0
@@ -3797,6 +4061,85 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4a60d0ff4cd58a9409b0c9e6090f8691, type: 3}
+--- !u!1001 &2135356851
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8077010286852682689}
+    m_Modifications:
+    - target: {fileID: 6262235519980911227, guid: 47e6ce82743488e40a8b3bb0615e28d9,
+        type: 3}
+      propertyPath: m_Name
+      value: PickVelocity
+      objectReference: {fileID: 0}
+    - target: {fileID: 3127738502141577965, guid: 47e6ce82743488e40a8b3bb0615e28d9,
+        type: 3}
+      propertyPath: InitialModule.startSize.scalar
+      value: 0.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 6564038301720355843, guid: 47e6ce82743488e40a8b3bb0615e28d9,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.084
+      objectReference: {fileID: 0}
+    - target: {fileID: 6564038301720355843, guid: 47e6ce82743488e40a8b3bb0615e28d9,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.08
+      objectReference: {fileID: 0}
+    - target: {fileID: 6564038301720355843, guid: 47e6ce82743488e40a8b3bb0615e28d9,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6564038301720355843, guid: 47e6ce82743488e40a8b3bb0615e28d9,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 6564038301720355843, guid: 47e6ce82743488e40a8b3bb0615e28d9,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6564038301720355843, guid: 47e6ce82743488e40a8b3bb0615e28d9,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6564038301720355843, guid: 47e6ce82743488e40a8b3bb0615e28d9,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 6564038301720355843, guid: 47e6ce82743488e40a8b3bb0615e28d9,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 6564038301720355843, guid: 47e6ce82743488e40a8b3bb0615e28d9,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 6564038301720355843, guid: 47e6ce82743488e40a8b3bb0615e28d9,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6564038301720355843, guid: 47e6ce82743488e40a8b3bb0615e28d9,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6564038301720355843, guid: 47e6ce82743488e40a8b3bb0615e28d9,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.6
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 47e6ce82743488e40a8b3bb0615e28d9, type: 3}
 --- !u!1001 &190603104927944265
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -4004,6 +4347,85 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 642ab671e3040d74096e03fcf1c4e181, type: 3}
+--- !u!1001 &3638040982261033222
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8077010286852682689}
+    m_Modifications:
+    - target: {fileID: 8792321243693318521, guid: 72cf9991b7b52504aacba9be3a9b93f2,
+        type: 3}
+      propertyPath: m_Name
+      value: PickAttack
+      objectReference: {fileID: 0}
+    - target: {fileID: 8792321243693318521, guid: 72cf9991b7b52504aacba9be3a9b93f2,
+        type: 3}
+      propertyPath: m_TagString
+      value: PowerUpEffect
+      objectReference: {fileID: 0}
+    - target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.08
+      objectReference: {fileID: 0}
+    - target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.8
+      objectReference: {fileID: 0}
+    - target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8566976512845724115, guid: 72cf9991b7b52504aacba9be3a9b93f2,
+        type: 3}
+      propertyPath: playOnAwake
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 72cf9991b7b52504aacba9be3a9b93f2, type: 3}
 --- !u!1001 &3974070068923422014
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -4019,12 +4441,12 @@ PrefabInstance:
     - target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -2.77
+      value: -7.5
       objectReference: {fileID: 0}
     - target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 1.96
+      value: -1.46
       objectReference: {fileID: 0}
     - target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
         type: 3}
@@ -4140,6 +4562,31 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5415114670227481231, guid: 38c9ae1c49230e24a82e867ab13d6345,
+        type: 3}
+      propertyPath: efectoVida
+      value: 
+      objectReference: {fileID: 1498513994}
+    - target: {fileID: 5415114670227481231, guid: 38c9ae1c49230e24a82e867ab13d6345,
+        type: 3}
+      propertyPath: efectoVelocidad
+      value: 
+      objectReference: {fileID: 1369306225}
+    - target: {fileID: 5415114670227481231, guid: 38c9ae1c49230e24a82e867ab13d6345,
+        type: 3}
+      propertyPath: efectoInvulnerabilidad
+      value: 
+      objectReference: {fileID: 907822432}
+    - target: {fileID: 5415114670227481231, guid: 38c9ae1c49230e24a82e867ab13d6345,
+        type: 3}
+      propertyPath: ratioAtaqueFlauta
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 5415114670227481231, guid: 38c9ae1c49230e24a82e867ab13d6345,
+        type: 3}
+      propertyPath: efectoAtaque
+      value: 
+      objectReference: {fileID: 1935859694}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 38c9ae1c49230e24a82e867ab13d6345, type: 3}
 --- !u!1001 &4353308155033112225
@@ -4460,3 +4907,72 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 4265212405810581834}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &8319826604127891867
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 8319826604163745464, guid: 9365b94df04b8da4d9758178654c30c0,
+        type: 3}
+      propertyPath: m_Name
+      value: Ataque
+      objectReference: {fileID: 0}
+    - target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -7.13402
+      objectReference: {fileID: 0}
+    - target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.97681314
+      objectReference: {fileID: 0}
+    - target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 15
+      objectReference: {fileID: 0}
+    - target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 9365b94df04b8da4d9758178654c30c0, type: 3}

Videojuegos_Proyecto/Assets/Scripts/Jugador.cs

@@ -6,14 +6,17 @@ using UnityEngine;
 public class Jugador : MonoBehaviour
 {
 
-    private int vidas;
+    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
@@ -29,7 +32,7 @@ public class Jugador : MonoBehaviour
     private void OnTriggerEnter2D(Collider2D collision)
     {
         //Si colisiona con un enemigose le quita una vida
-        if (collision.tag == "Enemigo" && tInvulnerable<=0)
+        if (collision.tag == "Enemigo" && tInvulnerable<=0 && powerUpInvulnerable==false)
         {
             Dañado();
         }

Videojuegos_Proyecto/Assets/Scripts/PowerUp.cs

@@ -5,11 +5,9 @@ using UnityEngine;
 public class PowerUp : MonoBehaviour
 {
 
-
     // Start is called before the first frame update
     void Start()
     {
-
     }
 
     // Update is called once per frame
@@ -21,47 +19,70 @@ public class PowerUp : MonoBehaviour
     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;
+                other.GetComponent<Player2D>().EmpezarAnimacionVelocidad();
                 StartCoroutine(CogerVelocidad(other));
             }
 
             if (this.CompareTag("PU_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")) {
                 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);
             }
+            if (this.CompareTag("PU_Ataque"))
+            {
+                Debug.Log("El jugador ha chocado con el power up de ataque");
+                other.GetComponent<Player2D>().ratioAtaqueFlauta = 4.0f;
+                other.GetComponent<Player2D>().ratioAtaqueGuitarra = 4.0f;
+                other.GetComponent<Player2D>().ratioAtaqueMelee = 2.0f;
+                other.GetComponent<Player2D>().EmpezarAnimacionAtaque();
+                StartCoroutine(CogerAtaque(other));
+            }
         }
     }
 
     void DesactivarObjeto() {
         GetComponent<SpriteRenderer>().enabled = false;
         GetComponent<BoxCollider2D>().enabled = false;
-
     }
 
     IEnumerator CogerVelocidad(Collider2D player) {
         DesactivarObjeto();
-        yield return new WaitForSeconds(5.0f);
+        yield return new WaitForSeconds(8.0f);
         player.GetComponent<Player2D>().velocidadAlAndar = 3.0f;
+        player.GetComponent<Player2D>().AcabarAnimacionVelocidad();
         Destroy(gameObject);
     }
 
     IEnumerator CogerInvulnerabilidad(Collider2D player)
     {
         DesactivarObjeto();
-        yield return new WaitForSeconds(5.0f);
+        yield return new WaitForSeconds(12.0f);
+        player.GetComponent<Jugador>().powerUpInvulnerable = false;
+        player.GetComponent<Player2D>().AcabarAnimacionInvulnerabilidad();
         Destroy(gameObject);
     }
 
-    void CogerVida(Collider2D player)
+    IEnumerator CogerAtaque(Collider2D player)
     {
-
+        DesactivarObjeto();
+        yield return new WaitForSeconds(10.0f);
+        player.GetComponent<Jugador>().powerUpInvulnerable = false;
+        player.GetComponent<Player2D>().AcabarAnimacionAtaque();
+        player.GetComponent<Player2D>().ratioAtaqueFlauta = 2.0f;
+        player.GetComponent<Player2D>().ratioAtaqueGuitarra = 2.0f;
+        player.GetComponent<Player2D>().ratioAtaqueMelee = 1.0f;
         Destroy(gameObject);
     }
 }

Videojuegos_Proyecto/Assets/Sprites/PowerUps/Invincible.png.meta

-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/Assets/Sprites/PowerUps/MoveFaster.png.meta

-fileFormatVersion: 2
-guid: c114eead74e12a24d85c97170e4065a4
-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.7320508, y: -1.0000001}
-      - {x: 1.7320509, y: -0.9999998}
-    physicsShape:
-    - - {x: 0, y: 2}
-      - {x: -1.7320508, y: -1.0000001}
-      - {x: 1.7320509, y: -0.9999998}
-    bones: []
-    spriteID: 48bf205162e2d0d4481c022df72264bb
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Videojuegos_Proyecto/Assets/Sprites/PowerUps/RecoverLife.png.meta

-fileFormatVersion: 2
-guid: 31a885f785940fa4faf757a7d0cb3c2e
-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: -2, y: -2}
-      - {x: -2, y: 2}
-      - {x: 2, y: 2}
-      - {x: 2, y: -2}
-    physicsShape:
-    - - {x: -2, y: -2}
-      - {x: -2, y: 2}
-      - {x: 2, y: 2}
-      - {x: 2, y: -2}
-    bones: []
-    spriteID: 62b0704109fa1554da27b37e501c87d2
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Videojuegos_Proyecto/Library/StateCache/Hierarchy/29a1ae-be8437e4aefd8004eb.json

+{"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

+{"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/c30137-mainStage.json

+{"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/cf3b61-mainStage.json

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

Videojuegos_Proyecto/Library/StateCache/SceneView/407e75-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.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/4ba86f-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":-8.045736312866211,"y":1.2080817222595215,"z":-161.0326690673828},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":7.729910373687744,"orthographic":true}
\ No newline at end of file

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}
\ 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":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

Videojuegos_Proyecto/Library/StateCache/SceneView/d2fa7b-be8437e4aefd8004eb.json

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

Videojuegos_Proyecto/Library/StateCache/SceneView/d2fa7b-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":-4.810030937194824,"y":-0.2180735170841217,"z":-2.0888671875},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":5.548740386962891,"orthographic":true}
\ No newline at end of file

Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe0.log

 Base path: C:/Program Files/Unity/Hub/Editor/2019.1.11f1/Editor/Data
 Cmd: initializeCompiler
+Cmd: compileSnippet
+  api=4 type=0 insize=1596 outsize=1638 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
+Cmd: compileSnippet
+  api=4 type=1 insize=1596 outsize=5590 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1

Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe1.log

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

Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe2.log

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

Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe3.log

 Base path: C:/Program Files/Unity/Editor/Data
 Cmd: initializeCompiler
 Cmd: compileSnippet
-  api=4 type=1 insize=1596 outsize=6814 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
+  api=4 type=0 insize=1396 outsize=822 kw=UNITY_PASS_FORWARDBASE _ALPHABLEND_ON pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1

Videojuegos_Proyecto/ProjectSettings/TagManager.asset

@@ -13,6 +13,8 @@ TagManager:
   - BalaGuitarra
   - BalaFlauta
   - Caida
+  - PowerUpEffect
+  - PU_Ataque
   layers:
   - Default
   - TransparentFX