Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit f864c3a6 by Juan Carlos
Options

Commit power up velocidad hecho

parent e9223af0
Expand all
Inline Side-by-side
Showing with 1036 additions and 138 deletions
Videojuegos_Proyecto/Assets/Player/Scripts/Player2D.cs
...@@ -22,7 +22,6 @@ public class Player2D : MonoBehaviour ...@@ -22,7 +22,6 @@ public class Player2D : MonoBehaviour
private int instrumentoUsandose = 0; /* 0 = flauta, 1 = guitarra */ private int instrumentoUsandose = 0; /* 0 = flauta, 1 = guitarra */
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
......
Videojuegos_Proyecto/Assets/Prefabs/Invulnerabilidad.prefab 0 → 100644
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2321382452776497405
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2321382452776497401}
- component: {fileID: 2321382452776497402}
- component: {fileID: 2321382452776497403}
- component: {fileID: 2321382452776497404}
m_Layer: 0
m_Name: Invulnerabilidad
m_TagString: PU_Invulnerabilidad
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2321382452776497401
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2321382452776497405}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -3.96, y: 1.93, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &2321382452776497402
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2321382452776497405}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: -8446839620434878363, guid: 05935f63555950743bc5b132fe4a28b0,
type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.7, y: 0.7}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &2321382452776497403
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2321382452776497405}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -0.00000011920929, y: -0.0025794506}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 0.7, y: 0.7}
newSize: {x: 0.7, y: 0.7}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.5039489, y: 0.43687892}
m_EdgeRadius: 0
--- !u!114 &2321382452776497404
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2321382452776497405}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3}
m_Name:
m_EditorClassIdentifier:
Videojuegos_Proyecto/Assets/Prefabs/Invulnerabilidad.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: 642ab671e3040d74096e03fcf1c4e181
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Prefabs/Velocidad.prefab 0 → 100644
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4353308154281813176
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4353308154281813180}
- component: {fileID: 4353308154281813181}
- component: {fileID: 4353308154281813178}
- component: {fileID: 4353308154281813179}
m_Layer: 0
m_Name: Velocidad
m_TagString: PU_Velocidad
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4353308154281813180
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4353308154281813176}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -5.04, y: 2.07, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4353308154281813181
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4353308154281813176}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 3046710074408030006, guid: 05935f63555950743bc5b132fe4a28b0,
type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.7, y: 0.7}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &4353308154281813178
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4353308154281813176}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -0.020636797, y: -0.09802562}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 0.7, y: 0.7}
newSize: {x: 0.7, y: 0.7}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.54522276, y: 0.5039488}
m_EdgeRadius: 0
--- !u!114 &4353308154281813179
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4353308154281813176}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3}
m_Name:
m_EditorClassIdentifier:
Videojuegos_Proyecto/Assets/Prefabs/Velocidad.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: 8c9a12bd8973bfb47aa954f2fb6efa0a
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Prefabs/Vida.prefab 0 → 100644
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3974070068712710307
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3974070068712710303}
- component: {fileID: 3974070068712710302}
- component: {fileID: 3974070068712710305}
- component: {fileID: 3974070068712710304}
m_Layer: 0
m_Name: Vida
m_TagString: PU_Vida
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3974070068712710303
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3974070068712710307}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2.77, y: 1.96, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &3974070068712710302
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3974070068712710307}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: -1500066791758496074, guid: 05935f63555950743bc5b132fe4a28b0,
type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.7, y: 0.7}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &3974070068712710305
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3974070068712710307}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -0.002579689, y: -0.00000017881393}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 0.7, y: 0.7}
newSize: {x: 0.7, y: 0.7}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.4987893, y: 0.44203794}
m_EdgeRadius: 0
--- !u!114 &3974070068712710304
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3974070068712710307}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3}
m_Name:
m_EditorClassIdentifier:
Videojuegos_Proyecto/Assets/Prefabs/Vida.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: 98edecaf87d755341a1c2ecc22082995
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Scenes/SampleScene.unity
...@@ -3755,6 +3755,144 @@ PrefabInstance: ...@@ -3755,6 +3755,144 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4d0737223868d7347af6b5e92a0c2dba, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4d0737223868d7347af6b5e92a0c2dba, type: 3}
--- !u!1001 &2321382452963353719
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2321382452776497405, guid: 642ab671e3040d74096e03fcf1c4e181,
type: 3}
propertyPath: m_Name
value: Invulnerabilidad
objectReference: {fileID: 0}
- target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181,
type: 3}
propertyPath: m_LocalPosition.x
value: -3.96
objectReference: {fileID: 0}
- target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.93
objectReference: {fileID: 0}
- target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181,
type: 3}
propertyPath: m_RootOrder
value: 10
objectReference: {fileID: 0}
- target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 642ab671e3040d74096e03fcf1c4e181, type: 3}
--- !u!1001 &3974070068923422014
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3974070068712710307, guid: 98edecaf87d755341a1c2ecc22082995,
type: 3}
propertyPath: m_Name
value: Vida
objectReference: {fileID: 0}
- target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
type: 3}
propertyPath: m_LocalPosition.x
value: -2.77
objectReference: {fileID: 0}
- target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.96
objectReference: {fileID: 0}
- target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
type: 3}
propertyPath: m_RootOrder
value: 11
objectReference: {fileID: 0}
- target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 98edecaf87d755341a1c2ecc22082995, type: 3}
--- !u!1001 &4265212405810581834 --- !u!1001 &4265212405810581834
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -3824,6 +3962,75 @@ PrefabInstance: ...@@ -3824,6 +3962,75 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 38c9ae1c49230e24a82e867ab13d6345, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 38c9ae1c49230e24a82e867ab13d6345, type: 3}
--- !u!1001 &4353308155033112225
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4353308154281813176, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a,
type: 3}
propertyPath: m_Name
value: Velocidad
objectReference: {fileID: 0}
- target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a,
type: 3}
propertyPath: m_LocalPosition.x
value: -5.04
objectReference: {fileID: 0}
- target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a,
type: 3}
propertyPath: m_LocalPosition.y
value: 2.07
objectReference: {fileID: 0}
- target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a,
type: 3}
propertyPath: m_RootOrder
value: 9
objectReference: {fileID: 0}
- target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a, type: 3}
--- !u!1001 &5465608059507527388 --- !u!1001 &5465608059507527388
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
Videojuegos_Proyecto/Assets/Scripts/PowerUp.cs 0 → 100644
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class PowerUp : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
private void OnTriggerEnter2D(Collider2D other)
{
if (other.CompareTag("Player")) {
if (this.CompareTag("PU_Velocidad")) {
Debug.Log("El jugador ha chocado con el power up de velocidad");
other.GetComponent<Player2D>().velocidadAlAndar = 6.0f;
StartCoroutine(CogerVelocidad(other));
}
if (this.CompareTag("PU_Invulnerabilidad")) {
Debug.Log("El jugador ha chocado con el power up de invulnerabilidad");
Destroy(gameObject);
}
if (this.CompareTag("PU_Vida")) {
Debug.Log("El jugador ha chocado con el power up de vida");
//other.GetComponent<Player2D>;
Destroy(gameObject);
}
}
}
void DesactivarObjeto() {
GetComponent<SpriteRenderer>().enabled = false;
GetComponent<BoxCollider2D>().enabled = false;
}
IEnumerator CogerVelocidad(Collider2D player) {
DesactivarObjeto();
yield return new WaitForSeconds(5.0f);
player.GetComponent<Player2D>().velocidadAlAndar = 3.0f;
Destroy(gameObject);
}
IEnumerator CogerInvulnerabilidad(Collider2D player)
{
DesactivarObjeto();
yield return new WaitForSeconds(5.0f);
Destroy(gameObject);
}
void CogerVida(Collider2D player)
{
Destroy(gameObject);
}
}
Videojuegos_Proyecto/Assets/Scripts/PowerUp.cs.meta 0 → 100644
fileFormatVersion: 2
guid: d17f5df61c8d24f4aa460b500b46a5ac
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Sprites/PowerUps.meta 0 → 100644
fileFormatVersion: 2
guid: d344f8beb905eef4f9e03de1de88342f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Sprites/PowerUps/Invincible.png.meta 0 → 100644
fileFormatVersion: 2
guid: 64b323039f7dc22428fb7e08664ab46e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 3
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 4
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline:
- - {x: 0, y: 2}
- {x: -1.7320509, y: 0.99999994}
- {x: -1.7320508, y: -1.0000001}
- {x: 0.00000017484555, y: -2}
- {x: 1.7320509, y: -0.9999998}
- {x: 1.7320509, y: 0.9999998}
physicsShape:
- - {x: 0, y: 2}
- {x: -1.7320509, y: 0.99999994}
- {x: -1.7320508, y: -1.0000001}
- {x: 0.00000017484555, y: -2}
- {x: 1.7320509, y: -0.9999998}
- {x: 1.7320509, y: 0.9999998}
bones: []
spriteID: 02af9a0245567c940b7adbdbce1a493f
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Sprites/PowerUps/MoveFaster.png.meta 0 → 100644
fileFormatVersion: 2
guid: c114eead74e12a24d85c97170e4065a4
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 3
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 4
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline:
- - {x: 0, y: 2}
- {x: -1.7320508, y: -1.0000001}
- {x: 1.7320509, y: -0.9999998}
physicsShape:
- - {x: 0, y: 2}
- {x: -1.7320508, y: -1.0000001}
- {x: 1.7320509, y: -0.9999998}
bones: []
spriteID: 48bf205162e2d0d4481c022df72264bb
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Sprites/PowerUps/RecoverLife.png.meta 0 → 100644
fileFormatVersion: 2
guid: 31a885f785940fa4faf757a7d0cb3c2e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 3
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 4
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline:
- - {x: -2, y: -2}
- {x: -2, y: 2}
- {x: 2, y: 2}
- {x: 2, y: -2}
physicsShape:
- - {x: -2, y: -2}
- {x: -2, y: 2}
- {x: 2, y: 2}
- {x: 2, y: -2}
bones: []
spriteID: 62b0704109fa1554da27b37e501c87d2
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Library/CurrentLayout.dwlt
...@@ -44,14 +44,10 @@ MonoBehaviour: ...@@ -44,14 +44,10 @@ MonoBehaviour:
y: 30 y: 30
width: 1920 width: 1920
height: 947 height: 947
m_MinSize: {x: 681, y: 494} m_MinSize: {x: 679, y: 494}
m_MaxSize: {x: 14004, y: 14044} m_MaxSize: {x: 14002, y: 14044}
vertical: 0 vertical: 0
<<<<<<< HEAD controlID: 42
controlID: 99
=======
controlID: 13
>>>>>>> origin/Release
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -67,12 +63,12 @@ MonoBehaviour: ...@@ -67,12 +63,12 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 1072 x: 1531
y: 0 y: 0
width: 848 width: 389
height: 947 height: 947
m_MinSize: {x: 277, y: 72} m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4002, y: 4022} m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 14} m_ActualView: {fileID: 14}
m_Panes: m_Panes:
- {fileID: 14} - {fileID: 14}
...@@ -95,17 +91,10 @@ MonoBehaviour: ...@@ -95,17 +91,10 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
<<<<<<< HEAD width: 379
width: 265
height: 573 height: 573
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
=======
width: 379
height: 605
m_MinSize: {x: 202, y: 222}
m_MaxSize: {x: 4002, y: 4022}
>>>>>>> origin/Release
m_ActualView: {fileID: 15} m_ActualView: {fileID: 15}
m_Panes: m_Panes:
- {fileID: 15} - {fileID: 15}
...@@ -127,15 +116,9 @@ MonoBehaviour: ...@@ -127,15 +116,9 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
<<<<<<< HEAD
y: 573 y: 573
width: 1072
height: 374
=======
y: 605
width: 1531 width: 1531
height: 342 height: 374
>>>>>>> origin/Release
m_MinSize: {x: 232, y: 272} m_MinSize: {x: 232, y: 272}
m_MaxSize: {x: 10002, y: 10022} m_MaxSize: {x: 10002, y: 10022}
m_ActualView: {fileID: 13} m_ActualView: {fileID: 13}
...@@ -166,7 +149,7 @@ MonoBehaviour: ...@@ -166,7 +149,7 @@ MonoBehaviour:
y: 0 y: 0
width: 1920 width: 1920
height: 997 height: 997
m_MinSize: {x: 950, y: 544} m_MinSize: {x: 950, y: 300}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &7 --- !u!114 &7
MonoBehaviour: MonoBehaviour:
...@@ -230,12 +213,12 @@ MonoBehaviour: ...@@ -230,12 +213,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1072 width: 1531
height: 947 height: 947
m_MinSize: {x: 404, y: 494} m_MinSize: {x: 404, y: 494}
m_MaxSize: {x: 10002, y: 14044} m_MaxSize: {x: 10002, y: 14044}
vertical: 1 vertical: 1
controlID: 14 controlID: 43
--- !u!114 &10 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -255,19 +238,12 @@ MonoBehaviour: ...@@ -255,19 +238,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
<<<<<<< HEAD width: 1531
width: 1072
height: 573 height: 573
m_MinSize: {x: 404, y: 222} m_MinSize: {x: 404, y: 222}
m_MaxSize: {x: 8004, y: 4022} m_MaxSize: {x: 8004, y: 4022}
=======
width: 1531
height: 605
m_MinSize: {x: 406, y: 222}
m_MaxSize: {x: 8006, y: 4022}
>>>>>>> origin/Release
vertical: 0 vertical: 0
controlID: 58 controlID: 44
--- !u!114 &11 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -283,15 +259,10 @@ MonoBehaviour: ...@@ -283,15 +259,10 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 265 x: 379
y: 0 y: 0
<<<<<<< HEAD
width: 807
height: 573
=======
width: 1152 width: 1152
height: 605 height: 573
>>>>>>> origin/Release
m_MinSize: {x: 204, y: 222} m_MinSize: {x: 204, y: 222}
m_MaxSize: {x: 4004, y: 4022} m_MaxSize: {x: 4004, y: 4022}
m_ActualView: {fileID: 16} m_ActualView: {fileID: 16}
...@@ -322,10 +293,10 @@ MonoBehaviour: ...@@ -322,10 +293,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 468 x: 379
y: 181 y: 73
width: 973 width: 1150
height: 501 height: 554
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
--- !u!114 &13 --- !u!114 &13
MonoBehaviour: MonoBehaviour:
...@@ -349,15 +320,9 @@ MonoBehaviour: ...@@ -349,15 +320,9 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
<<<<<<< HEAD
y: 646 y: 646
width: 1072
height: 355
=======
y: 678
width: 1531 width: 1531
height: 323 height: 355
>>>>>>> origin/Release
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_SearchFilter: m_SearchFilter:
m_NameFilter: m_NameFilter:
...@@ -371,48 +336,34 @@ MonoBehaviour: ...@@ -371,48 +336,34 @@ MonoBehaviour:
m_ShowAllHits: 0 m_ShowAllHits: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
<<<<<<< HEAD - Assets/Player/Scripts
- Assets/Prefabs
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: m_LastFolders:
- Assets/Prefabs - Assets/Player/Scripts
=======
- Assets/Scripts
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Scripts
>>>>>>> origin/Release
m_LastFoldersGridSize: -1 m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\Colme\Documents\UnityProjects\ProyectoVideojuegos\Videojuegos_Proyecto m_LastProjectPath: C:\Users\JC\Desktop\DesarrolloDeVideojuegos_Proyecto\Videojuegos_Proyecto
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
<<<<<<< HEAD m_SelectedIDs: 3a350000
m_SelectedIDs: ea340000 m_LastClickedID: 13626
m_LastClickedID: 13546 m_ExpandedIDs: 00000000662b00009634000000ca9a3b
m_ExpandedIDs: 00000000562a000000ca9a3b
=======
m_SelectedIDs: 12320000
m_LastClickedID: 12818
m_ExpandedIDs: 000000004a2a000000ca9a3b
>>>>>>> origin/Release
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: Animaciones m_Name:
m_OriginalName: Animaciones m_OriginalName:
m_EditFieldRect: m_EditFieldRect:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 0 width: 0
height: 0 height: 0
m_UserData: 12838 m_UserData: 0
m_IsWaitingForDelay: 0 m_IsWaitingForDelay: 0
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 0 m_OriginalEventType: 11
m_IsRenamingFilename: 1 m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 5} m_ClientGUIView: {fileID: 5}
m_SearchString: m_SearchString:
...@@ -426,11 +377,7 @@ MonoBehaviour: ...@@ -426,11 +377,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
<<<<<<< HEAD m_ExpandedIDs: 00000000662b0000
m_ExpandedIDs: 00000000562a000062320000
=======
m_ExpandedIDs: 000000004a2a0000
>>>>>>> origin/Release
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -506,9 +453,9 @@ MonoBehaviour: ...@@ -506,9 +453,9 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 1072 x: 1531
y: 73 y: 73
width: 846 width: 387
height: 928 height: 928
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OpenAddComponentMenu: 0 m_OpenAddComponentMenu: 0
...@@ -544,26 +491,15 @@ MonoBehaviour: ...@@ -544,26 +491,15 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 73 y: 73
<<<<<<< HEAD
width: 265
height: 554
=======
width: 379 width: 379
height: 586 height: 554
>>>>>>> origin/Release
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
<<<<<<< HEAD m_SelectedIDs: b6290000
m_SelectedIDs: 9e330000
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: dcf0ffff0ef1ffffd2f2ffff00f3ffffecfaffff74fbffff m_ExpandedIDs: 20faffff
=======
m_SelectedIDs: 98250000
m_LastClickedID: 0
m_ExpandedIDs: 8cfbffff
>>>>>>> origin/Release
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -579,14 +515,14 @@ MonoBehaviour: ...@@ -579,14 +515,14 @@ MonoBehaviour:
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 11
m_IsRenamingFilename: 0 m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 4} m_ClientGUIView: {fileID: 0}
m_SearchString: m_SearchString:
m_ExpandedScenes: [] m_ExpandedScenes: []
m_CurrenRootInstanceID: 0 m_CurrenRootInstanceID: 0
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_CurrentSortingName: TransformSorting m_CurrentSortingName: TransformSorting
m_WindowGUID: e4f845058af2fed45a9fd11aeb1bc7f9 m_WindowGUID: 882b1ffbccde250418ab8e4c9d2d3ed7
--- !u!114 &16 --- !u!114 &16
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -608,18 +544,13 @@ MonoBehaviour: ...@@ -608,18 +544,13 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 265 x: 379
y: 73 y: 73
<<<<<<< HEAD
width: 805
height: 554
=======
width: 1150 width: 1150
height: 586 height: 554
>>>>>>> origin/Release
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_ShowContextualTools: 0 m_ShowContextualTools: 0
m_WindowGUID: 43dad88c062228f459455f7a9fa529fd m_WindowGUID: 9da1557899ac30346918b300a279c884
m_Gizmos: 1 m_Gizmos: 1
m_SceneIsLit: 1 m_SceneIsLit: 1
m_SceneLighting: 1 m_SceneLighting: 1
...@@ -628,15 +559,9 @@ MonoBehaviour: ...@@ -628,15 +559,9 @@ MonoBehaviour:
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
<<<<<<< HEAD m_Target: {x: -5.123681, y: 0.13753039, z: -4.2441635}
m_Target: {x: 604.6396, y: 262.18216, z: -77.875}
speed: 2
m_Value: {x: 604.6396, y: 262.18216, z: -77.875}
=======
m_Target: {x: 578.6107, y: 285.79947, z: -120.5}
speed: 2 speed: 2
m_Value: {x: 578.6107, y: 285.79947, z: -120.5} m_Value: {x: -5.123681, y: 0.13753039, z: -4.2441635}
>>>>>>> origin/Release
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
...@@ -669,15 +594,9 @@ MonoBehaviour: ...@@ -669,15 +594,9 @@ MonoBehaviour:
speed: 2 speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1} m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size: m_Size:
<<<<<<< HEAD m_Target: 7.8685966
m_Target: 674.8079
speed: 2 speed: 2
m_Value: 674.8079 m_Value: 7.8685966
=======
m_Target: 610.695
speed: 2
m_Value: 610.695
>>>>>>> origin/Release
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
...@@ -726,7 +645,7 @@ MonoBehaviour: ...@@ -726,7 +645,7 @@ MonoBehaviour:
x: 379 x: 379
y: 73 y: 73
width: 1150 width: 1150
height: 586 height: 554
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_VSyncEnabled: 0 m_VSyncEnabled: 0
m_MaximizeOnPlay: 0 m_MaximizeOnPlay: 0
...@@ -741,8 +660,8 @@ MonoBehaviour: ...@@ -741,8 +660,8 @@ MonoBehaviour:
vZoomLockedByDefault: 0 vZoomLockedByDefault: 0
m_HBaseRangeMin: -575 m_HBaseRangeMin: -575
m_HBaseRangeMax: 575 m_HBaseRangeMax: 575
m_VBaseRangeMin: -284.5 m_VBaseRangeMin: -268.5
m_VBaseRangeMax: 284.5 m_VBaseRangeMax: 268.5
m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1 m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMin: 1
...@@ -761,9 +680,9 @@ MonoBehaviour: ...@@ -761,9 +680,9 @@ MonoBehaviour:
x: 0 x: 0
y: 17 y: 17
width: 1150 width: 1150
height: 569 height: 537
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Translation: {x: 575, y: 284.5} m_Translation: {x: 575, y: 268.5}
m_MarginLeft: 0 m_MarginLeft: 0
m_MarginRight: 0 m_MarginRight: 0
m_MarginTop: 0 m_MarginTop: 0
...@@ -771,14 +690,14 @@ MonoBehaviour: ...@@ -771,14 +690,14 @@ MonoBehaviour:
m_LastShownAreaInsideMargins: m_LastShownAreaInsideMargins:
serializedVersion: 2 serializedVersion: 2
x: -575 x: -575
y: -284.5 y: -268.5
width: 1150 width: 1150
height: 569 height: 537
m_MinimalGUI: 1 m_MinimalGUI: 1
m_defaultScale: 1 m_defaultScale: 1
m_TargetTexture: {fileID: 0} m_TargetTexture: {fileID: 0}
m_CurrentColorSpace: 0 m_CurrentColorSpace: 0
m_LastWindowPixelSize: {x: 1150, y: 586} m_LastWindowPixelSize: {x: 1150, y: 554}
m_ClearInEditMode: 1 m_ClearInEditMode: 1
m_NoCameraWarning: 1 m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000 m_LowResolutionForAspectRatios: 01000000000000000000
...@@ -805,7 +724,7 @@ MonoBehaviour: ...@@ -805,7 +724,7 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 678 y: 646
width: 1531 width: 1531
height: 323 height: 355
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
Videojuegos_Proyecto/Library/StateCache/Hierarchy/882b1f-mainStage.json 0 → 100644
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/9da155-mainStage.json 0 → 100644
{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-5.12368106842041,"y":0.1375303864479065,"z":-4.244163513183594},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":7.86859655380249,"orthographic":true}
\ No newline at end of file
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