Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit a25ed37c by David Colmenero Chica
Options

El ataque a melee funcionaaa!!!

parent f398900b
Inline Side-by-side
Showing with 701 additions and 581 deletions
Videojuegos_Proyecto/Assets/Player/Animaciones/3_melee_Guitarra.anim
......@@ -20,19 +20,16 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 8724373332404428253, guid: 0c3279f55b54d94449d876234b89e965,
type: 3}
- time: 0.2
value: {fileID: 6392728175395987437, guid: 0c3279f55b54d94449d876234b89e965,
value: {fileID: 1711192532778030261, guid: 0c3279f55b54d94449d876234b89e965,
type: 3}
- time: 0.38333333
- time: 0.25
value: {fileID: -983869874967241593, guid: 0c3279f55b54d94449d876234b89e965,
type: 3}
- time: 0.56666666
value: {fileID: 1711192532778030261, guid: 0c3279f55b54d94449d876234b89e965,
- time: 0.45
value: {fileID: 6392728175395987437, guid: 0c3279f55b54d94449d876234b89e965,
type: 3}
- time: 0.98333335
value: {fileID: 1711192532778030261, guid: 0c3279f55b54d94449d876234b89e965,
- time: 0.6666667
value: {fileID: 8724373332404428253, guid: 0c3279f55b54d94449d876234b89e965,
type: 3}
attribute: m_Sprite
path:
......@@ -53,17 +50,16 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {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}
- {fileID: -983869874967241593, guid: 0c3279f55b54d94449d876234b89e965, type: 3}
- {fileID: 6392728175395987437, guid: 0c3279f55b54d94449d876234b89e965, type: 3}
- {fileID: 8724373332404428253, guid: 0c3279f55b54d94449d876234b89e965, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1
m_StopTime: 0.68333334
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
......
Videojuegos_Proyecto/Assets/Player/Scripts/Player2D.cs
......@@ -12,12 +12,13 @@ public class Player2D : MonoBehaviour
[Range(0f, 5f)] public float ratioAtaqueFlauta = 2f;
[Range(0f, 5f)] public float ratioAtaqueGuitarra = 2f;
[Range(0f, 3f)] public float ratioAtaqueMelee = 1;
public GameObject hitBoxMeleeR; //Right
public GameObject hitBoxMeleeL; //Left
float timeSiguienteAtaque = 0f;
public GameObject spawnDisparosDerecha;
public GameObject spawnDisparosIzquierda;
public GameObject disparoFlauta;
public GameObject disparoGuitarra;
public LayerMask layersEnemigos;
Rigidbody2D rb2d;
SpriteRenderer spriteRenderer;
Animator animator;
......@@ -37,6 +38,9 @@ public class Player2D : MonoBehaviour
spriteRenderer = GetComponent<SpriteRenderer>();
animator = GetComponent<Animator>();
rb2d = GetComponent<Rigidbody2D>();
hitBoxMeleeL.SetActive(false);
hitBoxMeleeR.SetActive(false);
}
// Update is called once per frame
......@@ -178,10 +182,26 @@ public class Player2D : MonoBehaviour
animator.SetTrigger("GolpeandoMelee");
if (!spriteRenderer.flipX)
{
//Activar hitbox derecha
hitBoxMeleeR.SetActive(true);
}
else
{
//Activar hitbox izquierda
hitBoxMeleeL.SetActive(true);
}
StartCoroutine(DesactivarHitBoxMelee());
timeSiguienteAtaque = Time.time + 1f / ratioAtaqueMelee;
}
IEnumerator DesactivarHitBoxMelee() {
yield return new WaitForSeconds(0.8f);
hitBoxMeleeL.SetActive(false);
hitBoxMeleeR.SetActive(false);
}
/*NO OLVIDAR poner a todas las plataformas que sean suelo la etiqueta "Suelo"*/
private void OnCollisionStay2D(Collision2D collision)
{
......
Videojuegos_Proyecto/Assets/Prefabs/PlayerV2.prefab
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1270590275
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1270590276}
- component: {fileID: 1270590277}
m_Layer: 0
m_Name: HitBoxMeleeR
m_TagString: HitBoxMelee
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1270590276
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1270590275}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.67, y: 1.37, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5415114670227481227}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &1270590277
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1270590275}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.016054153, y: -0.34825325}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.49757957, y: 1.6965065}
m_EdgeRadius: 0
--- !u!1 &5415114670227481229
GameObject:
m_ObjectHideFlags: 0
......@@ -35,6 +92,12 @@ Transform:
m_Children:
- {fileID: 5415114671481677872}
- {fileID: 5415114671120557115}
- {fileID: 7953291921050649509}
- {fileID: 6860208036869571196}
- {fileID: 6929124595357352186}
- {fileID: 7571515234073206594}
- {fileID: 1270590276}
- {fileID: 1131062269441459644}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -165,6 +228,16 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fb387e14ec85d764aa2bdac5ed1eb3cb, type: 3}
m_Name:
m_EditorClassIdentifier:
vidas: 0
powerUpInvulnerable: 0
corazon1: {fileID: 0}
corazon2: {fileID: 0}
corazon3: {fileID: 0}
corazonLleno: {fileID: -8405058192176592724, guid: 05935f63555950743bc5b132fe4a28b0,
type: 3}
corazonVacio: {fileID: -4371761223435045764, guid: 05935f63555950743bc5b132fe4a28b0,
type: 3}
canvasMuerte: {fileID: 0}
--- !u!114 &5415114670227481231
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -182,15 +255,19 @@ MonoBehaviour:
ratioAtaqueFlauta: 2
ratioAtaqueGuitarra: 2
ratioAtaqueMelee: 1
hitBoxMeleeR: {fileID: 1270590275}
hitBoxMeleeL: {fileID: 8329091607610403158}
spawnDisparosDerecha: {fileID: 5415114671481677879}
spawnDisparosIzquierda: {fileID: 5415114671120557114}
disparoFlauta: {fileID: 9101462949979880529, guid: 4eada546b3029f24eae22f3ee526f55c,
type: 3}
disparoGuitarra: {fileID: 6213653338870642002, guid: 1f95e6a67b369a549b3244950ea5692b,
type: 3}
layersEnemigos:
serializedVersion: 2
m_Bits: 256
efectoVida: {fileID: 3284485315763610732}
efectoVelocidad: {fileID: 1177376348828413460}
efectoInvulnerabilidad: {fileID: 7313478007846490211}
efectoAtaque: {fileID: 9199162259377357215}
nColeccionablesCanvas: {fileID: 0}
--- !u!1 &5415114671120557114
GameObject:
m_ObjectHideFlags: 0
......@@ -251,3 +328,476 @@ Transform:
m_Father: {fileID: 5415114670227481227}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8329091607610403158
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1131062269441459644}
- component: {fileID: 8084015138686411577}
m_Layer: 0
m_Name: HitBoxMeleeL
m_TagString: HitBoxMelee
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1131062269441459644
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8329091607610403158}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.675, y: 1.37, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5415114670227481227}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &8084015138686411577
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8329091607610403158}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.016054153, y: -0.34825325}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.49757957, y: 1.6965065}
m_EdgeRadius: 0
--- !u!1001 &670472201766877260
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 5415114670227481227}
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: 8566976512845724115, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
propertyPath: playOnAwake
value: 0
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}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 72cf9991b7b52504aacba9be3a9b93f2, type: 3}
--- !u!4 &7571515234073206594 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
m_PrefabInstance: {fileID: 670472201766877260}
m_PrefabAsset: {fileID: 0}
--- !u!198 &9199162259377357215 stripped
ParticleSystem:
m_CorrespondingSourceObject: {fileID: 8566976512845724115, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
m_PrefabInstance: {fileID: 670472201766877260}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4265212405098308648
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 5415114670227481227}
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.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 &7953291921050649509 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6156087301233190797, guid: be8437e4aefd8004ebc5d004b4ac4798,
type: 3}
m_PrefabInstance: {fileID: 4265212405098308648}
m_PrefabAsset: {fileID: 0}
--- !u!198 &3284485315763610732 stripped
ParticleSystem:
m_CorrespondingSourceObject: {fileID: 1631923658231038020, guid: be8437e4aefd8004ebc5d004b4ac4798,
type: 3}
m_PrefabInstance: {fileID: 4265212405098308648}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4265212405113934619
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 5415114670227481227}
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: InitialModule.startLifetime.scalar
value: 0.3
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.startSize.scalar
value: 0.4
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.placementMode
value: 1
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.radius.value
value: 0.5
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: 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_MaxParticleSize
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 537a38f03ae37734e8fe833077f59531, type: 3}
--- !u!4 &6860208036869571196 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7207253405088338279, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
m_PrefabInstance: {fileID: 4265212405113934619}
m_PrefabAsset: {fileID: 0}
--- !u!198 &7313478007846490211 stripped
ParticleSystem:
m_CorrespondingSourceObject: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
m_PrefabInstance: {fileID: 4265212405113934619}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4265212405688771833
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 5415114670227481227}
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!4 &6929124595357352186 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6564038301720355843, guid: 47e6ce82743488e40a8b3bb0615e28d9,
type: 3}
m_PrefabInstance: {fileID: 4265212405688771833}
m_PrefabAsset: {fileID: 0}
--- !u!198 &1177376348828413460 stripped
ParticleSystem:
m_CorrespondingSourceObject: {fileID: 3127738502141577965, guid: 47e6ce82743488e40a8b3bb0615e28d9,
type: 3}
m_PrefabInstance: {fileID: 4265212405688771833}
m_PrefabAsset: {fileID: 0}
Videojuegos_Proyecto/Assets/Scenes/SampleScene.unity
......@@ -658,12 +658,12 @@ PrefabInstance:
- target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e,
type: 3}
propertyPath: m_LocalPosition.x
value: -5.95
value: -4.043
objectReference: {fileID: 0}
- target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.85
value: -1.928
objectReference: {fileID: 0}
- target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e,
type: 3}
......@@ -2233,12 +2233,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, 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,
......@@ -3132,12 +3126,6 @@ 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
......@@ -3570,252 +3558,6 @@ 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!1 &1534779097
GameObject:
m_ObjectHideFlags: 0
......@@ -5236,12 +4978,6 @@ 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
......@@ -5823,85 +5559,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2122110140}
m_CullTransparentMesh: 0
--- !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
......@@ -6055,12 +5712,12 @@ PrefabInstance:
- target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181,
type: 3}
propertyPath: m_LocalPosition.x
value: -3.96
value: -0.2
objectReference: {fileID: 0}
- target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.93
value: -2.29
objectReference: {fileID: 0}
- target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181,
type: 3}
......@@ -6109,85 +5766,6 @@ 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: 8566976512845724115, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
propertyPath: playOnAwake
value: 0
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}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 72cf9991b7b52504aacba9be3a9b93f2, type: 3}
--- !u!1001 &3974070068923422014
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -6203,12 +5781,12 @@ PrefabInstance:
- target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
type: 3}
propertyPath: m_LocalPosition.x
value: -7.5
value: -10.022
objectReference: {fileID: 0}
- target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.46
value: -2.31
objectReference: {fileID: 0}
- target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
type: 3}
......@@ -6326,63 +5904,6 @@ PrefabInstance:
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}
- target: {fileID: 5415114670227481231, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3}
propertyPath: velocidadAlAndar
value: 3
objectReference: {fileID: 0}
- target: {fileID: 5415114670227481231, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3}
propertyPath: spawnDisparosDerecha
value:
objectReference: {fileID: 4265212405810581836}
- target: {fileID: 5415114670227481231, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3}
propertyPath: spawnDisparosIzquierda
value:
objectReference: {fileID: 4265212405810581835}
- target: {fileID: 5415114670227481231, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3}
propertyPath: disparoFlauta
value:
objectReference: {fileID: 9101462949979880529, guid: 4eada546b3029f24eae22f3ee526f55c,
type: 3}
- target: {fileID: 5415114670227481231, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3}
propertyPath: disparoGuitarra
value:
objectReference: {fileID: 6213653338870642002, guid: 1f95e6a67b369a549b3244950ea5692b,
type: 3}
- target: {fileID: 5415114670227481231, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3}
propertyPath: layersEnemigos.m_Bits
value: 256
objectReference: {fileID: 0}
- target: {fileID: 5415114670227481231, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3}
propertyPath: nColeccionablesCanvas
value:
objectReference: {fileID: 666489588}
......@@ -6403,35 +5924,11 @@ PrefabInstance:
objectReference: {fileID: 1561285302}
- target: {fileID: 9185189218782277443, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3}
propertyPath: corazonLleno
value:
objectReference: {fileID: -8405058192176592724, guid: 05935f63555950743bc5b132fe4a28b0,
type: 3}
- target: {fileID: 9185189218782277443, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3}
propertyPath: corazonVacio
value:
objectReference: {fileID: -4371761223435045764, guid: 05935f63555950743bc5b132fe4a28b0,
type: 3}
- target: {fileID: 9185189218782277443, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3}
propertyPath: canvasMuerte
value:
objectReference: {fileID: 1648845513}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 38c9ae1c49230e24a82e867ab13d6345, type: 3}
--- !u!1 &4265212405810581835 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5415114671120557114, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3}
m_PrefabInstance: {fileID: 4265212405810581834}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4265212405810581836 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5415114671481677879, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3}
m_PrefabInstance: {fileID: 4265212405810581834}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4353308155033112225
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -6447,12 +5944,12 @@ PrefabInstance:
- target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a,
type: 3}
propertyPath: m_LocalPosition.x
value: -5.04
value: -4.08
objectReference: {fileID: 0}
- target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.07
value: 0.12
objectReference: {fileID: 0}
- target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a,
type: 3}
......@@ -6765,12 +6262,12 @@ PrefabInstance:
- target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
type: 3}
propertyPath: m_LocalPosition.x
value: -7.13402
value: 2.86
objectReference: {fileID: 0}
- target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.97681314
value: -2.18
objectReference: {fileID: 0}
- target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
type: 3}
......
Videojuegos_Proyecto/Assets/Scripts/Enemigo1Move.cs
......@@ -78,5 +78,27 @@ public class Enemigo1Move : MonoBehaviour
}
}
if (collision.tag == "HitBoxMelee")
{
vida--;
if (vida == 0)
{
//Aqui se cuenta cuantos enemigos quedan para entregar el coleccionable que te dan por derrotar a todos los enemigos
if (Coleccionables.eDerrotados[Coleccionables.niActual] != Coleccionables.eTotales[Coleccionables.niActual])
{
if (Coleccionables.eDerrotados[Coleccionables.niActual] == Coleccionables.eTotales[Coleccionables.niActual] - 1)
{
//AQUI SE INSTANCIA EL PREFAB DEL COLECCIONABLE
Instantiate(prefabColeccionable, collision.transform.position, Quaternion.identity);
}
Coleccionables.eDerrotados[Coleccionables.niActual]++;
}
Destroy(this.gameObject);
}
}
}
}
Videojuegos_Proyecto/Library/CurrentLayout.dwlt
......@@ -21,7 +21,7 @@ MonoBehaviour:
m_ShowMode: 4
m_Title:
m_RootView: {fileID: 6}
m_MinSize: {x: 950, y: 544}
m_MinSize: {x: 950, y: 300}
m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &2
MonoBehaviour:
......@@ -44,10 +44,10 @@ MonoBehaviour:
y: 30
width: 1920
height: 947
m_MinSize: {x: 679, y: 494}
m_MaxSize: {x: 14002, y: 14044}
m_MinSize: {x: 683, y: 494}
m_MaxSize: {x: 14004, y: 14044}
vertical: 0
controlID: 71
controlID: 91
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -67,11 +67,11 @@ MonoBehaviour:
y: 0
width: 389
height: 947
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 14}
m_MinSize: {x: 277, y: 72}
m_MaxSize: {x: 4002, y: 4022}
m_ActualView: {fileID: 15}
m_Panes:
- {fileID: 14}
- {fileID: 15}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &4
......@@ -93,11 +93,11 @@ MonoBehaviour:
y: 0
width: 379
height: 573
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 15}
m_MinSize: {x: 202, y: 222}
m_MaxSize: {x: 4002, y: 4022}
m_ActualView: {fileID: 16}
m_Panes:
- {fileID: 15}
- {fileID: 16}
m_Selected: 0
m_LastSelected: 0
--- !u!114 &5
......@@ -121,10 +121,11 @@ MonoBehaviour:
height: 374
m_MinSize: {x: 232, y: 272}
m_MaxSize: {x: 10002, y: 10022}
m_ActualView: {fileID: 13}
m_ActualView: {fileID: 14}
m_Panes:
- {fileID: 13}
- {fileID: 18}
- {fileID: 14}
- {fileID: 19}
- {fileID: 12}
m_Selected: 0
m_LastSelected: 1
--- !u!114 &6
......@@ -215,10 +216,10 @@ MonoBehaviour:
y: 0
width: 1531
height: 947
m_MinSize: {x: 404, y: 494}
m_MinSize: {x: 406, y: 494}
m_MaxSize: {x: 10002, y: 14044}
vertical: 1
controlID: 72
controlID: 68
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -240,10 +241,10 @@ MonoBehaviour:
y: 0
width: 1531
height: 573
m_MinSize: {x: 404, y: 222}
m_MaxSize: {x: 8004, y: 4022}
m_MinSize: {x: 406, y: 222}
m_MaxSize: {x: 8006, y: 4022}
vertical: 0
controlID: 73
controlID: 69
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -265,11 +266,11 @@ MonoBehaviour:
height: 573
m_MinSize: {x: 204, y: 222}
m_MaxSize: {x: 4004, y: 4022}
m_ActualView: {fileID: 16}
m_ActualView: {fileID: 17}
m_Panes:
- {fileID: 16}
- {fileID: 17}
- {fileID: 12}
- {fileID: 18}
- {fileID: 13}
m_Selected: 0
m_LastSelected: 1
--- !u!114 &12
......@@ -280,6 +281,35 @@ MonoBehaviour:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_MinSize: {x: 100, y: 100}
m_MaxSize: {x: 4000, y: 4000}
m_TitleContent:
m_Text: Animation
m_Image: {fileID: 1561878555887300916, guid: 0000000000000000d000000000000000,
type: 0}
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 0
y: 646
width: 1531
height: 355
m_ViewDataDictionary: {fileID: 0}
m_LockTracker:
m_IsLocked: 0
m_LastSelectedObjectID: -2996
--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12111, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
......@@ -298,7 +328,7 @@ MonoBehaviour:
width: 973
height: 501
m_ViewDataDictionary: {fileID: 0}
--- !u!114 &13
--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -336,20 +366,20 @@ MonoBehaviour:
m_ShowAllHits: 0
m_SearchArea: 1
m_Folders:
- Assets/Scripts
- Assets/Player/Sprites
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Scripts
- Assets/Player/Sprites
m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\Colme\Documents\UnityProjects\ProyectoVideojuegos\Videojuegos_Proyecto
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: de330000
m_LastClickedID: 13278
m_ExpandedIDs: 00000000082c0000243400004635000000ca9a3b
m_SelectedIDs: 4c340000
m_LastClickedID: 13388
m_ExpandedIDs: 000000006c2a0000aa330000d433000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -377,7 +407,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 00000000082c000046350000
m_ExpandedIDs: 000000006c2a0000aa330000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -405,7 +435,7 @@ MonoBehaviour:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000
m_ExpandedInstanceIDs: c6230000a8320000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -432,7 +462,7 @@ MonoBehaviour:
m_ScrollPosition: {x: 0, y: 0}
m_GridSize: 64
m_DirectoriesAreaWidth: 115
--- !u!114 &14
--- !u!114 &15
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -468,7 +498,7 @@ MonoBehaviour:
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_PreviewWindow: {fileID: 0}
--- !u!114 &15
--- !u!114 &16
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -497,23 +527,23 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 38faffff743e00006c3f0000943f0000a83f0000
m_SelectedIDs: 4cf4ffff
m_LastClickedID: -2996
m_ExpandedIDs: 8cfbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name: CanvasMuerte
m_OriginalName: CanvasMuerte
m_Name:
m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: 16236
m_UserData: 0
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 4}
m_SearchString:
......@@ -523,7 +553,7 @@ MonoBehaviour:
m_IsLocked: 0
m_CurrentSortingName: TransformSorting
m_WindowGUID: defd79de2c582ea45ab6fa9ed58148b9
--- !u!114 &16
--- !u!114 &17
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -559,9 +589,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: 574.8234, y: 170.78032, z: -100.875}
m_Target: {x: -6.7260084, y: -1.7376392, z: -1.5839844}
speed: 2
m_Value: {x: 574.8234, y: 170.78032, z: -100.875}
m_Value: {x: -6.7260084, y: -1.7376392, z: -1.5839844}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
......@@ -594,9 +624,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
m_Target: 833.83777
m_Target: 4.500365
speed: 2
m_Value: 833.83777
m_Value: 4.500365
m_Ortho:
m_Target: 1
speed: 2
......@@ -621,7 +651,7 @@ MonoBehaviour:
m_SceneVisActive: 1
m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0
--- !u!114 &17
--- !u!114 &18
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......@@ -702,7 +732,7 @@ MonoBehaviour:
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
m_XRRenderMode: 0
--- !u!114 &18
--- !u!114 &19
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
......
Videojuegos_Proyecto/Library/StateCache/Hierarchy/defd79-4cad856fb8f87054e8.json 0 → 100644
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":3326548381514800793,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/de700f-4cad856fb8f87054e8.json 0 → 100644
{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":false,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-10.024999618530274,"y":-2.1080000400543215,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":3.0049948692321779,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/de700f-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":574.8234252929688,"y":170.7803192138672,"z":-100.875},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":833.8377685546875,"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":-6.726008415222168,"y":-1.7376391887664796,"z":-1.583984375},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":4.500364780426025,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/ProjectSettings/TagManager.asset
......@@ -15,6 +15,7 @@ TagManager:
- Caida
- PowerUpEffect
- PU_Ataque
- HitBoxMelee
layers:
- Default
- TransparentFX
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment