Control totalmente hecho

Videojuegos_Proyecto/Assets/Player/Animaciones/0_idleV2.anim → Videojuegos_Proyecto/Assets/Player/Animaciones/0_idle_Flauta.anim

@@ -6,7 +6,7 @@ AnimationClip:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: 0_idleV2
+  m_Name: 0_idle_Flauta
   serializedVersion: 6
   m_Legacy: 0
   m_Compressed: 0
@@ -20,7 +20,7 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 4334783836991956000, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4,
+      value: {fileID: -194451497202015452, guid: 6e246062716c98e43aefa1e70f472b7d,
         type: 3}
     attribute: m_Sprite
     path: 
@@ -41,7 +41,7 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 4334783836991956000, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4, type: 3}
+    - {fileID: -194451497202015452, guid: 6e246062716c98e43aefa1e70f472b7d, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}

Videojuegos_Proyecto/Assets/Player/Animaciones/subir.anim → Videojuegos_Proyecto/Assets/Player/Animaciones/0_idle_Guitarra.anim

@@ -6,7 +6,7 @@ AnimationClip:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: subir
+  m_Name: 0_idle_Guitarra
   serializedVersion: 6
   m_Legacy: 0
   m_Compressed: 0
@@ -20,7 +20,7 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 1755772209161902963, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4,
+      value: {fileID: 1948020831882019289, guid: 0c3279f55b54d94449d876234b89e965,
         type: 3}
     attribute: m_Sprite
     path: 
@@ -41,7 +41,7 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 1755772209161902963, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4, type: 3}
+    - {fileID: 1948020831882019289, guid: 0c3279f55b54d94449d876234b89e965, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}

Videojuegos_Proyecto/Assets/Player/Animaciones/0_idle_Guitarra.anim.meta

+fileFormatVersion: 2
+guid: 8e38035feabe8094282362cb4e9cc558
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Videojuegos_Proyecto/Assets/Player/Animaciones/1_andar_Flauta.anim

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 1_andar_Flauta
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 8914315954352880149, guid: 6e246062716c98e43aefa1e70f472b7d,
+        type: 3}
+    - time: 0.16666667
+      value: {fileID: 9179202728709092545, guid: 6e246062716c98e43aefa1e70f472b7d,
+        type: 3}
+    - time: 0.33333334
+      value: {fileID: 6613235376059442932, guid: 6e246062716c98e43aefa1e70f472b7d,
+        type: 3}
+    - time: 0.5
+      value: {fileID: 6669846921696866638, guid: 6e246062716c98e43aefa1e70f472b7d,
+        type: 3}
+    - time: 0.6666667
+      value: {fileID: -7482578858010190812, guid: 6e246062716c98e43aefa1e70f472b7d,
+        type: 3}
+    - time: 0.8333333
+      value: {fileID: -8926559704167933136, guid: 6e246062716c98e43aefa1e70f472b7d,
+        type: 3}
+    - time: 1
+      value: {fileID: 8914315954352880149, guid: 6e246062716c98e43aefa1e70f472b7d,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 8914315954352880149, guid: 6e246062716c98e43aefa1e70f472b7d, type: 3}
+    - {fileID: 9179202728709092545, guid: 6e246062716c98e43aefa1e70f472b7d, type: 3}
+    - {fileID: 6613235376059442932, guid: 6e246062716c98e43aefa1e70f472b7d, type: 3}
+    - {fileID: 6669846921696866638, guid: 6e246062716c98e43aefa1e70f472b7d, type: 3}
+    - {fileID: -7482578858010190812, guid: 6e246062716c98e43aefa1e70f472b7d, type: 3}
+    - {fileID: -8926559704167933136, guid: 6e246062716c98e43aefa1e70f472b7d, type: 3}
+    - {fileID: 8914315954352880149, guid: 6e246062716c98e43aefa1e70f472b7d, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1.0166667
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

Videojuegos_Proyecto/Assets/Player/Animaciones/1_andar_Guitarra.anim

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 1_andar_Guitarra
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: -8344839993035745031, guid: 0c3279f55b54d94449d876234b89e965,
+        type: 3}
+    - time: 0.16666667
+      value: {fileID: 894932447536778615, guid: 0c3279f55b54d94449d876234b89e965,
+        type: 3}
+    - time: 0.33333334
+      value: {fileID: -2880114702895713049, guid: 0c3279f55b54d94449d876234b89e965,
+        type: 3}
+    - time: 0.5
+      value: {fileID: 8777073727678584315, guid: 0c3279f55b54d94449d876234b89e965,
+        type: 3}
+    - time: 0.6666667
+      value: {fileID: 3152697129899817972, guid: 0c3279f55b54d94449d876234b89e965,
+        type: 3}
+    - time: 0.8333333
+      value: {fileID: 5038433701231486854, guid: 0c3279f55b54d94449d876234b89e965,
+        type: 3}
+    - time: 1
+      value: {fileID: -8344839993035745031, guid: 0c3279f55b54d94449d876234b89e965,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: -8344839993035745031, guid: 0c3279f55b54d94449d876234b89e965, type: 3}
+    - {fileID: 894932447536778615, guid: 0c3279f55b54d94449d876234b89e965, type: 3}
+    - {fileID: -2880114702895713049, guid: 0c3279f55b54d94449d876234b89e965, type: 3}
+    - {fileID: 8777073727678584315, guid: 0c3279f55b54d94449d876234b89e965, type: 3}
+    - {fileID: 3152697129899817972, guid: 0c3279f55b54d94449d876234b89e965, type: 3}
+    - {fileID: 5038433701231486854, guid: 0c3279f55b54d94449d876234b89e965, type: 3}
+    - {fileID: -8344839993035745031, guid: 0c3279f55b54d94449d876234b89e965, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1.0166667
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

Videojuegos_Proyecto/Assets/Player/Animaciones/Andar.anim.meta → Videojuegos_Proyecto/Assets/Player/Animaciones/1_andar_Guitarra.anim.meta

 fileFormatVersion: 2
-guid: cc9a36ae4a1b0c64ea0716a2c2311b16
+guid: c7ef0e1e9f070ff4fa11ccb152bffc15
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000

Videojuegos_Proyecto/Assets/Player/Animaciones/2_disparar_Flauta.anim

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 2_disparar_Flauta
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 3412100820460773362, guid: 6e246062716c98e43aefa1e70f472b7d,
+        type: 3}
+    - time: 0.33333334
+      value: {fileID: 3412100820460773362, guid: 6e246062716c98e43aefa1e70f472b7d,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 3412100820460773362, guid: 6e246062716c98e43aefa1e70f472b7d, type: 3}
+    - {fileID: 3412100820460773362, guid: 6e246062716c98e43aefa1e70f472b7d, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.35000002
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

Videojuegos_Proyecto/Assets/Player/Animaciones/1_andarv2.anim → Videojuegos_Proyecto/Assets/Player/Animaciones/2_disparar_Guitarra.anim

@@ -6,7 +6,7 @@ AnimationClip:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: 1_andarv2
+  m_Name: 2_disparar_Guitarra
   serializedVersion: 6
   m_Legacy: 0
   m_Compressed: 0
@@ -20,25 +20,16 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: -2418196558428526619, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4,
+      value: {fileID: 8896275783633955916, guid: 0c3279f55b54d94449d876234b89e965,
         type: 3}
     - time: 0.15
-      value: {fileID: -480808811739928509, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4,
+      value: {fileID: 6314260995519735524, guid: 0c3279f55b54d94449d876234b89e965,
         type: 3}
-    - time: 0.28333333
-      value: {fileID: -7814200450545973387, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4,
+    - time: 0.26666668
+      value: {fileID: -8783689748563955062, guid: 0c3279f55b54d94449d876234b89e965,
         type: 3}
-    - time: 0.43333334
-      value: {fileID: -7689382371589266427, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4,
-        type: 3}
-    - time: 0.56666666
-      value: {fileID: -6119387374007233121, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4,
-        type: 3}
-    - time: 0.71666664
-      value: {fileID: 5435452280369712508, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4,
-        type: 3}
-    - time: 0.8333333
-      value: {fileID: -2418196558428526619, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4,
+    - time: 0.6666667
+      value: {fileID: -8783689748563955062, guid: 0c3279f55b54d94449d876234b89e965,
         type: 3}
     attribute: m_Sprite
     path: 
@@ -59,19 +50,16 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: -2418196558428526619, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4, type: 3}
-    - {fileID: -480808811739928509, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4, type: 3}
-    - {fileID: -7814200450545973387, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4, type: 3}
-    - {fileID: -7689382371589266427, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4, type: 3}
-    - {fileID: -6119387374007233121, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4, type: 3}
-    - {fileID: 5435452280369712508, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4, type: 3}
-    - {fileID: -2418196558428526619, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4, type: 3}
+    - {fileID: 8896275783633955916, guid: 0c3279f55b54d94449d876234b89e965, type: 3}
+    - {fileID: 6314260995519735524, guid: 0c3279f55b54d94449d876234b89e965, type: 3}
+    - {fileID: -8783689748563955062, guid: 0c3279f55b54d94449d876234b89e965, type: 3}
+    - {fileID: -8783689748563955062, guid: 0c3279f55b54d94449d876234b89e965, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.84999996
+    m_StopTime: 0.68333334
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

Videojuegos_Proyecto/Assets/Player/Animaciones/caer.anim.meta → Videojuegos_Proyecto/Assets/Player/Animaciones/2_disparar_Guitarra.anim.meta

 fileFormatVersion: 2
-guid: 5827e1427aa177c44a516cc7a558ef16
+guid: 305cd0b575c388a4cb6dab46af13adcf
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000

Videojuegos_Proyecto/Assets/Player/Animaciones/dispararFlauta.anim → Videojuegos_Proyecto/Assets/Player/Animaciones/3_melee_Flauta.anim

@@ -6,7 +6,7 @@ AnimationClip:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: dispararFlauta
+  m_Name: 3_melee_Flauta
   serializedVersion: 6
   m_Legacy: 0
   m_Compressed: 0
@@ -19,17 +19,14 @@ AnimationClip:
   m_FloatCurves: []
   m_PPtrCurves:
   - curve:
-    - time: 0.033333335
-      value: {fileID: -540375121143967267, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4,
+    - time: 0
+      value: {fileID: -2604218592511095886, guid: 6e246062716c98e43aefa1e70f472b7d,
         type: 3}
     - time: 0.33333334
-      value: {fileID: 5602337906906987636, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4,
-        type: 3}
-    - time: 0.45
-      value: {fileID: 5044450397378941176, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4,
+      value: {fileID: 4338716138553877272, guid: 6e246062716c98e43aefa1e70f472b7d,
         type: 3}
     - time: 0.6666667
-      value: {fileID: 6426868497666326525, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4,
+      value: {fileID: -194451497202015452, guid: 6e246062716c98e43aefa1e70f472b7d,
         type: 3}
     attribute: m_Sprite
     path: 
@@ -50,10 +47,9 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: -540375121143967267, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4, type: 3}
-    - {fileID: 5602337906906987636, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4, type: 3}
-    - {fileID: 5044450397378941176, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4, type: 3}
-    - {fileID: 6426868497666326525, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4, type: 3}
+    - {fileID: -2604218592511095886, guid: 6e246062716c98e43aefa1e70f472b7d, type: 3}
+    - {fileID: 4338716138553877272, guid: 6e246062716c98e43aefa1e70f472b7d, type: 3}
+    - {fileID: -194451497202015452, guid: 6e246062716c98e43aefa1e70f472b7d, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
@@ -64,7 +60,7 @@ AnimationClip:
     m_Level: 0
     m_CycleOffset: 0
     m_HasAdditiveReferencePose: 0
-    m_LoopTime: 0
+    m_LoopTime: 1
     m_LoopBlend: 0
     m_LoopBlendOrientation: 0
     m_LoopBlendPositionY: 0

Videojuegos_Proyecto/Assets/Player/Animaciones/idle.anim.meta → Videojuegos_Proyecto/Assets/Player/Animaciones/3_melee_Flauta.anim.meta

 fileFormatVersion: 2
-guid: 39d6f64b06cfd2646a735c24fbb75332
+guid: 60d9c955fd77680468623de8c550149c
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000

Videojuegos_Proyecto/Assets/Player/Animaciones/Andar.anim → Videojuegos_Proyecto/Assets/Player/Animaciones/3_melee_Guitarra.anim

@@ -6,7 +6,7 @@ AnimationClip:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Andar
+  m_Name: 3_melee_Guitarra
   serializedVersion: 6
   m_Legacy: 0
   m_Compressed: 0
@@ -20,34 +20,19 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 7968868846237713680, guid: 1dd7b922bf70c4541b6857277eec6851,
-        type: 3}
-    - time: 0.11666667
-      value: {fileID: -9018094171575822726, guid: 1dd7b922bf70c4541b6857277eec6851,
+      value: {fileID: 8724373332404428253, guid: 0c3279f55b54d94449d876234b89e965,
         type: 3}
     - time: 0.2
-      value: {fileID: 489169098068905920, guid: 1dd7b922bf70c4541b6857277eec6851,
-        type: 3}
-    - time: 0.3
-      value: {fileID: 5297239019864082559, guid: 1dd7b922bf70c4541b6857277eec6851,
-        type: 3}
-    - time: 0.41666666
-      value: {fileID: 6539129619630269423, guid: 1dd7b922bf70c4541b6857277eec6851,
-        type: 3}
-    - time: 0.5
-      value: {fileID: 2956103426259435633, guid: 1dd7b922bf70c4541b6857277eec6851,
-        type: 3}
-    - time: 0.6166667
-      value: {fileID: 4397503385276384642, guid: 1dd7b922bf70c4541b6857277eec6851,
+      value: {fileID: 6392728175395987437, guid: 0c3279f55b54d94449d876234b89e965,
         type: 3}
-    - time: 0.71666664
-      value: {fileID: -6787817563810448501, guid: 1dd7b922bf70c4541b6857277eec6851,
+    - time: 0.38333333
+      value: {fileID: -983869874967241593, guid: 0c3279f55b54d94449d876234b89e965,
         type: 3}
-    - time: 0.8
-      value: {fileID: -4046781677986431466, guid: 1dd7b922bf70c4541b6857277eec6851,
+    - time: 0.56666666
+      value: {fileID: 1711192532778030261, guid: 0c3279f55b54d94449d876234b89e965,
         type: 3}
-    - time: 0.9166667
-      value: {fileID: 8497275607518591928, guid: 1dd7b922bf70c4541b6857277eec6851,
+    - time: 0.98333335
+      value: {fileID: 1711192532778030261, guid: 0c3279f55b54d94449d876234b89e965,
         type: 3}
     attribute: m_Sprite
     path: 
@@ -68,22 +53,17 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 7968868846237713680, guid: 1dd7b922bf70c4541b6857277eec6851, type: 3}
-    - {fileID: -9018094171575822726, guid: 1dd7b922bf70c4541b6857277eec6851, type: 3}
-    - {fileID: 489169098068905920, guid: 1dd7b922bf70c4541b6857277eec6851, type: 3}
-    - {fileID: 5297239019864082559, guid: 1dd7b922bf70c4541b6857277eec6851, type: 3}
-    - {fileID: 6539129619630269423, guid: 1dd7b922bf70c4541b6857277eec6851, type: 3}
-    - {fileID: 2956103426259435633, guid: 1dd7b922bf70c4541b6857277eec6851, type: 3}
-    - {fileID: 4397503385276384642, guid: 1dd7b922bf70c4541b6857277eec6851, type: 3}
-    - {fileID: -6787817563810448501, guid: 1dd7b922bf70c4541b6857277eec6851, type: 3}
-    - {fileID: -4046781677986431466, guid: 1dd7b922bf70c4541b6857277eec6851, type: 3}
-    - {fileID: 8497275607518591928, guid: 1dd7b922bf70c4541b6857277eec6851, type: 3}
+    - {fileID: 8724373332404428253, guid: 0c3279f55b54d94449d876234b89e965, type: 3}
+    - {fileID: 6392728175395987437, guid: 0c3279f55b54d94449d876234b89e965, type: 3}
+    - {fileID: -983869874967241593, guid: 0c3279f55b54d94449d876234b89e965, type: 3}
+    - {fileID: 1711192532778030261, guid: 0c3279f55b54d94449d876234b89e965, type: 3}
+    - {fileID: 1711192532778030261, guid: 0c3279f55b54d94449d876234b89e965, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.93333334
+    m_StopTime: 1
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

Videojuegos_Proyecto/Assets/Player/Animaciones/3_melee_Guitarra.anim.meta

+fileFormatVersion: 2
+guid: 32281e86a670a944aaf7e1e61a515d6f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Videojuegos_Proyecto/Assets/Player/Animaciones/caer.anim → Videojuegos_Proyecto/Assets/Player/Animaciones/4_saltar_Flauta.anim

@@ -6,7 +6,7 @@ AnimationClip:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: caer
+  m_Name: 4_saltar_Flauta
   serializedVersion: 6
   m_Legacy: 0
   m_Compressed: 0
@@ -20,7 +20,7 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: -6781412095145881161, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4,
+      value: {fileID: -3819391865042261307, guid: 6e246062716c98e43aefa1e70f472b7d,
         type: 3}
     attribute: m_Sprite
     path: 
@@ -41,7 +41,7 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: -6781412095145881161, guid: aa90eb5d676cb5a468c4aa5f2fc9cca4, type: 3}
+    - {fileID: -3819391865042261307, guid: 6e246062716c98e43aefa1e70f472b7d, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}

Videojuegos_Proyecto/Assets/Player/Animaciones/idle.anim → Videojuegos_Proyecto/Assets/Player/Animaciones/4_saltar_Guitarra.anim

@@ -6,7 +6,7 @@ AnimationClip:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: idle
+  m_Name: 4_saltar_Guitarra
   serializedVersion: 6
   m_Legacy: 0
   m_Compressed: 0
@@ -20,22 +20,7 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 6774799682205786477, guid: 1dd7b922bf70c4541b6857277eec6851,
-        type: 3}
-    - time: 0.083333336
-      value: {fileID: 3822295306797679523, guid: 1dd7b922bf70c4541b6857277eec6851,
-        type: 3}
-    - time: 0.16666667
-      value: {fileID: -5604455639361449990, guid: 1dd7b922bf70c4541b6857277eec6851,
-        type: 3}
-    - time: 0.25
-      value: {fileID: 3822295306797679523, guid: 1dd7b922bf70c4541b6857277eec6851,
-        type: 3}
-    - time: 0.33333334
-      value: {fileID: 6774799682205786477, guid: 1dd7b922bf70c4541b6857277eec6851,
-        type: 3}
-    - time: 2.3333333
-      value: {fileID: 6774799682205786477, guid: 1dd7b922bf70c4541b6857277eec6851,
+      value: {fileID: -1074089526813125528, guid: 0c3279f55b54d94449d876234b89e965,
         type: 3}
     attribute: m_Sprite
     path: 
@@ -56,18 +41,13 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 6774799682205786477, guid: 1dd7b922bf70c4541b6857277eec6851, type: 3}
-    - {fileID: 3822295306797679523, guid: 1dd7b922bf70c4541b6857277eec6851, type: 3}
-    - {fileID: -5604455639361449990, guid: 1dd7b922bf70c4541b6857277eec6851, type: 3}
-    - {fileID: 3822295306797679523, guid: 1dd7b922bf70c4541b6857277eec6851, type: 3}
-    - {fileID: 6774799682205786477, guid: 1dd7b922bf70c4541b6857277eec6851, type: 3}
-    - {fileID: 6774799682205786477, guid: 1dd7b922bf70c4541b6857277eec6851, type: 3}
+    - {fileID: -1074089526813125528, guid: 0c3279f55b54d94449d876234b89e965, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 2.35
+    m_StopTime: 0.016666668
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

Videojuegos_Proyecto/Assets/Player/Animaciones/Player.controller.meta → Videojuegos_Proyecto/Assets/Player/Animaciones/4_saltar_Guitarra.anim.meta

 fileFormatVersion: 2
-guid: 252bc84b50b98d14ab3f1712cc9b666e
+guid: 6bd6f1dec94145940859ce0c447e2847
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 9100000
+  mainObjectFileID: 7400000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Videojuegos_Proyecto/Assets/Player/Animaciones/Player.controller

-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1107 &-6711841860319440833
-AnimatorStateMachine:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Base Layer
-  m_ChildStates:
-  - serializedVersion: 1
-    m_State: {fileID: 6730759524873062771}
-    m_Position: {x: 330, y: 120, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: 7492104159565235441}
-    m_Position: {x: 330, y: 270, z: 0}
-  m_ChildStateMachines: []
-  m_AnyStateTransitions: []
-  m_EntryTransitions: []
-  m_StateMachineTransitions: {}
-  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 50, y: 20, z: 0}
-  m_EntryPosition: {x: 50, y: 120, z: 0}
-  m_ExitPosition: {x: 670, y: 120, z: 0}
-  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: 6730759524873062771}
---- !u!1101 &-798331057717283813
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 6
-    m_ConditionEvent: nAnim
-    m_EventTreshold: 1
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 7492104159565235441}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.89361703
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!91 &9100000
-AnimatorController:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Player
-  serializedVersion: 5
-  m_AnimatorParameters:
-  - m_Name: nAnim
-    m_Type: 3
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
-  m_AnimatorLayers:
-  - serializedVersion: 5
-    m_Name: Base Layer
-    m_StateMachine: {fileID: -6711841860319440833}
-    m_Mask: {fileID: 0}
-    m_Motions: []
-    m_Behaviours: []
-    m_BlendingMode: 0
-    m_SyncedLayerIndex: -1
-    m_DefaultWeight: 0
-    m_IKPass: 0
-    m_SyncedLayerAffectsTiming: 0
-    m_Controller: {fileID: 9100000}
---- !u!1101 &185509992565469904
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 6
-    m_ConditionEvent: nAnim
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 6730759524873062771}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.73214287
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1102 &6730759524873062771
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 0_idle
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: -798331057717283813}
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 39d6f64b06cfd2646a735c24fbb75332, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!1102 &7492104159565235441
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 1_Andar
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 185509992565469904}
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: cc9a36ae4a1b0c64ea0716a2c2311b16, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 

Videojuegos_Proyecto/Assets/Player/Prefabs/DisparoBlanca.prefab

@@ -131,5 +131,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5826fc580708fb9428ba9526b71e3b33, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  velocidadDisparoFlauta: 5
+  velocidadDisparoFlauta: 6
   duracionDisparoFlauta: 3

Videojuegos_Proyecto/Assets/Player/Prefabs/DisparosCorcheas.prefab.meta

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

Videojuegos_Proyecto/Assets/Player/Scripts/BalaFlauta.cs

@@ -5,7 +5,7 @@ using UnityEngine;
 public class BalaFlauta : MonoBehaviour
 {
 
-    public float velocidadDisparoFlauta = 5;
+    public float velocidadDisparoFlauta = 6;
     public float duracionDisparoFlauta = 3;
 
     // Start is called before the first frame update
@@ -27,12 +27,7 @@ public class BalaFlauta : MonoBehaviour
 
         Destroy(this.gameObject, duracionDisparoFlauta);
     }
-
-    // Update is called once per frame
-    void Update()
-    {
-
-    }
+    
     
     private void OnTriggerEnter2D(Collider2D collision)
     {

Videojuegos_Proyecto/Assets/Player/Scripts/BalaGuitarra.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class BalaGuitarra : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    private void OnTriggerEnter2D(Collider2D collision)
+    {
+        //Para cuando entre la bala en un enemigo.
+
+        //Que se destruyan al chocar con el suelo o una pared
+        if (collision.gameObject.tag == "Suelo")
+        {
+            Destroy(this.gameObject);
+        }
+    }
+
+}

Videojuegos_Proyecto/Assets/Player/Scripts/BalaGuitarra.cs.meta

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

Videojuegos_Proyecto/Assets/Player/Scripts/BalasGuitarra.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class BalasGuitarra : MonoBehaviour
+{
+    public GameObject bala0;
+    public GameObject bala1;
+    public GameObject bala2;
+
+    public float velocidadDisparoGuitarra = 5;
+    public float duracionDisparoGuitarra = 0.6f;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        SpriteRenderer SR = this.GetComponent<SpriteRenderer>();
+        float f = 1f;
+        if (SR.flipX){
+            f = -1f;
+            bala0.GetComponent<SpriteRenderer>().flipX = true;
+            bala1.GetComponent<SpriteRenderer>().flipX = true;
+            bala2.GetComponent<SpriteRenderer>().flipX = true;
+        }
+
+        //Movimiento de la bala hacia la derecha
+        Rigidbody2D balaRB0 = bala0.GetComponent<Rigidbody2D>();
+        Rigidbody2D balaRB1 = bala1.GetComponent<Rigidbody2D>();
+        Rigidbody2D balaRB2 = bala2.GetComponent<Rigidbody2D>();
+        balaRB0.velocity = new Vector2(f * velocidadDisparoGuitarra, balaRB0.velocity.y + 1f);
+        balaRB1.velocity = new Vector2(f * velocidadDisparoGuitarra, balaRB1.velocity.y);
+        balaRB2.velocity = new Vector2(f * velocidadDisparoGuitarra, balaRB2.velocity.y - 1f);
+
+        Destroy(this.gameObject, duracionDisparoGuitarra);
+    }
+ 
+
+}

Videojuegos_Proyecto/Assets/Player/Scripts/BalasGuitarra.cs.meta

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

Videojuegos_Proyecto/Assets/Player/Scripts/Player2D.cs

@@ -4,17 +4,24 @@ using UnityEngine;
 
 public class Player2D : MonoBehaviour
 {
-    [Range(0.1f,5)] public float velocidadAlAndar = 1.0f;
-    [Range(0.1f, 15)] public float fuerzaDelSalto = 8f;
+    [Range(0.1f,5f)] public float velocidadAlAndar = 1.0f;
+    [Range(0.1f, 15f)] public float fuerzaDelSalto = 8f;
+    //Ratios de ataques por segundo
+    [Range(0f, 5f)] public float ratioAtaqueFlauta = 2f; 
+    [Range(0f, 5f)] public float ratioAtaqueGuitarra = 2f;
+    [Range(0f, 3f)] public float ratioAtaqueMelee = 1;
+    float timeSiguienteAtaque = 0f;
     public GameObject spawnDisparosDerecha;
     public GameObject spawnDisparosIzquierda;
     public GameObject disparoFlauta;
-    public float tiempoRecargaFlauta;
-    float contadorRecargaFlauta;
+    public GameObject disparoGuitarra;
+    public LayerMask layersEnemigos;
     Rigidbody2D rb2d;
     SpriteRenderer spriteRenderer;
     Animator animator;
-    bool saltar = false;
+
+    private int instrumentoUsandose = 0; /* 0 = flauta, 1 = guitarra */
+
 
     // Start is called before the first frame update
     void Start()
@@ -22,120 +29,160 @@ public class Player2D : MonoBehaviour
         spriteRenderer = GetComponent<SpriteRenderer>();
         animator = GetComponent<Animator>();
         rb2d = GetComponent<Rigidbody2D>();
-        contadorRecargaFlauta = 0;
     }
 
     // Update is called once per frame
     void Update()
     {
-        /**
-         * nAnim:integer
-         * 0: idle
-         * 1: andar
-         */
 
-        MovimientoDerecha();
-        MovimientoIzquierda();
-        Saltar();
-        DispararFlauta();
+        if (Input.GetKey(KeyCode.D)){ MovimientoDerecha(); }
+
+        if (Input.GetKey(KeyCode.A)){ MovimientoIzquierda(); }
+
+        if (Input.GetKeyUp(KeyCode.A) || Input.GetKeyUp(KeyCode.D)){ PararMovimiento(); }
 
+        if (Input.GetKey(KeyCode.W) && animator.GetBool("enSuelo")) { Saltar(); }
 
+        if (Input.GetKeyDown(KeyCode.L)) { CambiarInstrumento(); }
+
+        if (Time.time >= timeSiguienteAtaque) {
+            if (Input.GetKeyDown(KeyCode.J)) {
+                Disparar();
+            }
+        }
+        if (Time.time >= timeSiguienteAtaque)
+        {
+            if (Input.GetKeyDown(KeyCode.K)) { AtaqueMelee(); }
+        }
     }
     
 
     /*Funciones para el movimiento basico con animaciones*/
     private void MovimientoDerecha() {
-
-        /*Moverse a la derecha*/
-        if (Input.GetKey(KeyCode.D))
+        
+        if (spriteRenderer.flipX)
         {
-
-            if (spriteRenderer.flipX)
-            {
-                spriteRenderer.flipX = false;
-            }
-            animator.SetInteger("nAnim", 1);
-            transform.Translate(Time.deltaTime * velocidadAlAndar, 0.0f, 0.0f);
+            spriteRenderer.flipX = false;
         }
-
-        PararMovimiento();
+        animator.SetBool("Andando", true);
+        transform.Translate(Time.deltaTime * velocidadAlAndar, 0.0f, 0.0f);
+        
     }
 
     private void MovimientoIzquierda() {
-
-        /*Moverse a la izquierda*/
-        if (Input.GetKey(KeyCode.A))
+        
+        if (!spriteRenderer.flipX)
         {
-            if (!spriteRenderer.flipX)
-            {
-                spriteRenderer.flipX = true;
-            }
-            animator.SetInteger("nAnim", 1);
-            transform.Translate(-Time.deltaTime * velocidadAlAndar, 0.0f, 0.0f);
+            spriteRenderer.flipX = true;
         }
-
-        PararMovimiento();
+        animator.SetBool("Andando", true);
+        transform.Translate(-Time.deltaTime * velocidadAlAndar, 0.0f, 0.0f);
+        
     }
 
     private void PararMovimiento()
     {
         /*Dejar de moverse hacia la izquierda o derecha*/
-        if (Input.GetKeyUp(KeyCode.A) || Input.GetKeyUp(KeyCode.D))
-        {
-            animator.SetInteger("nAnim", 0);
-        }
+        animator.SetBool("Andando", false);
+
     }
 
     private void Saltar() {
+        
+        /*He aumentado la gravedad a x2 (Edit->Proyect Settings->Physcics2D->Gravity->Y=..*2)*/
+        rb2d.velocity = new Vector2(rb2d.velocity.x, 0); //Impide que se acumule el impulso si tocas un suelo durante el impulso
+        rb2d.AddForce(Vector2.up * fuerzaDelSalto, ForceMode2D.Impulse);
+        
+    }
 
-        /*Para saltar (usa las fisicas, asi que el control esta en FixedUpdate)*/
-        if (Input.GetKey(KeyCode.W) && animator.GetBool("enSuelo"))
-        {
-            saltar = true;
-            animator.SetBool("enSuelo", false);
-        }
+    private void CambiarInstrumento(){
 
-        /*He aumentado la gravedad a x2 (Edit->Proyect Settings->Physcics2D->Gravity->Y=..*2)*/
-        if (saltar)
+        //Si hubiera más instrumentos, sustituir el numero del condicional por el numero de instrumentos posibles - 1
+        if (instrumentoUsandose == 1) {
+            instrumentoUsandose = 0; }
+        else
         {
-            rb2d.velocity = new Vector2(rb2d.velocity.x, 0); //Impide que se acumule el impulso si tocas un suelo durante el impulso
-            rb2d.AddForce(Vector2.up * fuerzaDelSalto, ForceMode2D.Impulse);
-            saltar = false;
+            instrumentoUsandose++;
         }
-    }
 
-    private void DispararFlauta() {
+        animator.SetInteger("Instrumento", instrumentoUsandose);
+        animator.SetTrigger("CambioInstrumento");
+    }
 
-        contadorRecargaFlauta -= Time.deltaTime;
-        if (contadorRecargaFlauta < 0) { 
-            if (Input.GetKeyDown(KeyCode.J)) {
+    private void Disparar() {
 
-                animator.SetInteger("nAnim", 2);
-                GameObject disparo;
+        animator.SetTrigger("Disparando");
 
-                if (!spriteRenderer.flipX)
+        /*Uso de un switch case por si en un futuro se incorporaran mas instrumentos*/
+        switch (instrumentoUsandose) {
+            case 0:
                 {
-                    //Movimiento de la bala hacia la derecha
-                    disparo = Instantiate(disparoFlauta, spawnDisparosDerecha.transform.position, spawnDisparosDerecha.transform.rotation);
+                    DispararFlauta();
+                    timeSiguienteAtaque = Time.time + 1f / ratioAtaqueFlauta;
+                    break;
                 }
-                else
+            case 1:
                 {
-                    //Movimiento de la bala hacia la izquierda
-                    disparo = Instantiate(disparoFlauta, spawnDisparosIzquierda.transform.position, spawnDisparosIzquierda.transform.rotation);
-                    disparo.GetComponent<SpriteRenderer>().flipX = true;
+                    DispararGuitarra();
+                    timeSiguienteAtaque = Time.time + 1f / ratioAtaqueGuitarra;
+                    break;
+                }
+            default: {
+                    DispararFlauta();
+                    timeSiguienteAtaque = Time.time + 1f / ratioAtaqueFlauta;
+                    break;
                 }
-                contadorRecargaFlauta = tiempoRecargaFlauta;
-            }
         }
+    }
 
-        if (Input.GetKeyUp(KeyCode.J))
+    private void DispararFlauta() {
+        
+        
+        if (!spriteRenderer.flipX)
         {
-            animator.SetInteger("nAnim", 0);
-            if (Input.GetKey(KeyCode.A) || Input.GetKey(KeyCode.D))
-            {
-                animator.SetInteger("nAnim", 1);
-            }
+            //Movimiento de la bala hacia la derecha
+            Instantiate(disparoFlauta, spawnDisparosDerecha.transform.position, spawnDisparosDerecha.transform.rotation);
+        }
+        else
+        {
+            //Movimiento de la bala hacia la izquierda
+            GameObject disparo = Instantiate(disparoFlauta, spawnDisparosIzquierda.transform.position, spawnDisparosIzquierda.transform.rotation);
+            disparo.GetComponent<SpriteRenderer>().flipX = true;
+        }
+           
+    }
+
+    private void DispararGuitarra() {
+
+        if (!spriteRenderer.flipX)
+        {
+            //Movimiento de la bala hacia la derecha
+            Instantiate(disparoGuitarra, spawnDisparosDerecha.transform.position, spawnDisparosDerecha.transform.rotation);
+        }
+        else
+        {
+            //Movimiento de la bala hacia la izquierda
+            GameObject disparo = Instantiate(disparoGuitarra, spawnDisparosIzquierda.transform.position, spawnDisparosIzquierda.transform.rotation);
+            disparo.GetComponent<SpriteRenderer>().flipX = true;
+        }
+    }
+
+    private void AtaqueMelee() {
+
+        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;
     }
 
     /*NO OLVIDAR poner a todas las plataformas que sean suelo la etiqueta "Suelo"*/

Videojuegos_Proyecto/Assets/Player/Sprites/nota-musical-blanca.png.meta

-fileFormatVersion: 2
-guid: a6e83bf412d14844b9d8dbd4340c7bfc
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 10
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    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: -1
-    aniso: -1
-    mipBias: -100
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 400
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  platformSettings:
-  - serializedVersion: 2
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 1afd6e17e9b1c544d8a9d759b8452d3e
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Videojuegos_Proyecto/Assets/Prefabs/pl1x1.prefab

@@ -94,7 +94,7 @@ BoxCollider2D:
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
+  m_Offset: {x: 0, y: 0.37820518}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
@@ -105,5 +105,5 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 1, y: 1}
+  m_Size: {x: 1, y: 0.24358964}
   m_EdgeRadius: 0

Videojuegos_Proyecto/Assets/Prefabs/pl3x1.prefab

@@ -286,7 +286,7 @@ BoxCollider2D:
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
+  m_Offset: {x: 0, y: 0.2700336}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0, y: 0}
@@ -297,5 +297,5 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 3, y: 1}
+  m_Size: {x: 3, y: 0.4599328}
   m_EdgeRadius: 0

Videojuegos_Proyecto/Assets/Prefabs/pl5x3.prefab

@@ -1259,7 +1259,7 @@ BoxCollider2D:
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
+  m_Offset: {x: 0, y: 1.065465}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0, y: 0}
@@ -1270,5 +1270,5 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 5, y: 3}
+  m_Size: {x: 5, y: 0.86907005}
   m_EdgeRadius: 0

Videojuegos_Proyecto/Assets/Prefabs/pl5x5.prefab

@@ -869,7 +869,7 @@ BoxCollider2D:
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
+  m_Offset: {x: 0, y: 2.1960988}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0, y: 0}
@@ -880,7 +880,7 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 5, y: 5}
+  m_Size: {x: 5, y: 0.6078024}
   m_EdgeRadius: 0
 --- !u!1 &3576738800641666452
 GameObject:

Videojuegos_Proyecto/Assets/Prefabs/plAbajo2.prefab

@@ -66,8 +66,9 @@ PolygonCollider2D:
   m_Points:
     m_Paths:
     - - {x: -0.5, y: 1.5}
-      - {x: -0.5, y: -1.5}
-      - {x: 1.5, y: -1.5}
+      - {x: -0.4671955, y: 0.97667074}
+      - {x: 0.66401863, y: 1.9115729}
+      - {x: 1.5, y: 2.584046}
       - {x: 1.5, y: 3.5}
 --- !u!1 &806543811106615818
 GameObject:

Videojuegos_Proyecto/Assets/Prefabs/plArriba2.prefab

@@ -226,8 +226,8 @@ PolygonCollider2D:
   m_Points:
     m_Paths:
     - - {x: -0.5, y: 1.5}
-      - {x: -0.5, y: -1.5}
-      - {x: 1.5, y: -1.5}
+      - {x: -0.5164014, y: 1.0914831}
+      - {x: 1.5164015, y: 2.8300734}
       - {x: 1.5, y: 3.5}
 --- !u!1 &3796954703022055786
 GameObject:

Videojuegos_Proyecto/Library/StateCache/Hierarchy/2fdfad-021ba06bc654c1a49a.json

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

Videojuegos_Proyecto/Library/StateCache/Hierarchy/2fdfad-1f95e6a67b369a549b.json

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

Videojuegos_Proyecto/Library/StateCache/Hierarchy/2fdfad-4a60d0ff4cd58a9409.json

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

Videojuegos_Proyecto/Library/StateCache/Hierarchy/2fdfad-4d0737223868d7347a.json

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

Videojuegos_Proyecto/Library/StateCache/Hierarchy/2fdfad-4eada546b3029f24ea.json

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

Videojuegos_Proyecto/Library/StateCache/Hierarchy/2fdfad-726f1e301bb87004cb.json

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

Videojuegos_Proyecto/Library/StateCache/Hierarchy/2fdfad-8d1a822faf6ebdb4fa.json

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

Videojuegos_Proyecto/Library/StateCache/Hierarchy/2fdfad-a5a71a4c38f617d429.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/92b0a9-021ba06bc654c1a49a.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.5,"y":1.0,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":8.891647338867188,"orthographic":true}
\ No newline at end of file

Videojuegos_Proyecto/Library/StateCache/SceneView/92b0a9-1f95e6a67b369a549b.json

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

Videojuegos_Proyecto/Library/StateCache/SceneView/92b0a9-4a60d0ff4cd58a9409.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":11.671928405761719,"orthographic":true}
\ No newline at end of file

Videojuegos_Proyecto/Library/StateCache/SceneView/92b0a9-4d0737223868d7347a.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":16.5,"y":-3.0,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":8.891647338867188,"orthographic":true}
\ No newline at end of file

Videojuegos_Proyecto/Library/StateCache/SceneView/92b0a9-4eada546b3029f24ea.json

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

Videojuegos_Proyecto/Library/StateCache/SceneView/92b0a9-726f1e301bb87004cb.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":5.228182792663574,"orthographic":true}
\ No newline at end of file

Videojuegos_Proyecto/Library/StateCache/SceneView/92b0a9-8d1a822faf6ebdb4fa.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":-1.0,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":9.626728057861329,"orthographic":true}
\ No newline at end of file

Videojuegos_Proyecto/Library/StateCache/SceneView/92b0a9-a5a71a4c38f617d429.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":2.3566715717315676,"orthographic":true}
\ No newline at end of file

Videojuegos_Proyecto/Library/StateCache/SceneView/92b0a9-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":34.81358337402344,"y":2.943817377090454,"z":-405.7890625},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":58.505802154541019,"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":-3.441254138946533,"y":-2.946812152862549,"z":-0.984375},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":11.424559593200684,"orthographic":true}
\ No newline at end of file