Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit 452f27b1 by Álvaro Morales García
Options

Perdida de vida y tiempo invulnerable.

parent 55267ef5
Inline Side-by-side
Showing with 138 additions and 54 deletions
Videojuegos_Proyecto/Assembly-CSharp.csproj
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
<Compile Include="Assets\Player\Scripts\Player2D.cs" /> <Compile Include="Assets\Player\Scripts\Player2D.cs" />
<Compile Include="Assets\Scripts\CrearEnemigos.cs" /> <Compile Include="Assets\Scripts\CrearEnemigos.cs" />
<Compile Include="Assets\Scripts\Enemigo1Move.cs" /> <Compile Include="Assets\Scripts\Enemigo1Move.cs" />
<Compile Include="Assets\Scripts\Jugador.cs" />
<Compile Include="Assets\Scripts\ScriptColeccionables.cs" /> <Compile Include="Assets\Scripts\ScriptColeccionables.cs" />
<None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface-Mobile.shader" /> <None Include="Assets\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface-Mobile.shader" />
<None Include="Assets\TextMesh Pro\Resources\LineBreaking Leading Characters.txt" /> <None Include="Assets\TextMesh Pro\Resources\LineBreaking Leading Characters.txt" />
......
Videojuegos_Proyecto/Assets/Prefabs/EnemigoEjemplo.prefab
...@@ -13,9 +13,9 @@ GameObject: ...@@ -13,9 +13,9 @@ GameObject:
- component: {fileID: 3326548381514800794} - component: {fileID: 3326548381514800794}
- component: {fileID: 3326548381514800797} - component: {fileID: 3326548381514800797}
- component: {fileID: 4435491010459611782} - component: {fileID: 4435491010459611782}
m_Layer: 8 m_Layer: 0
m_Name: EnemigoEjemplo m_Name: EnemigoEjemplo
m_TagString: Untagged m_TagString: Enemigo
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
......
Videojuegos_Proyecto/Assets/Scenes/SampleScene.unity
...@@ -333,6 +333,24 @@ Transform: ...@@ -333,6 +333,24 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 558445664} m_PrefabInstance: {fileID: 558445664}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &146496493 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5415114670227481229, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3}
m_PrefabInstance: {fileID: 4265212405810581834}
m_PrefabAsset: {fileID: 0}
--- !u!114 &146496499
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 146496493}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fb387e14ec85d764aa2bdac5ed1eb3cb, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &220438935 --- !u!1 &220438935
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -2292,6 +2310,11 @@ PrefabInstance: ...@@ -2292,6 +2310,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5415114670227481230, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3}
propertyPath: m_IsTrigger
value: 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 &5465608059507527388 --- !u!1001 &5465608059507527388
......
Videojuegos_Proyecto/Assets/Scripts/Jugador.cs 0 → 100644
using System.Collections;
using System.Collections.Generic;
using System;
using UnityEngine;
public class Jugador : MonoBehaviour
{
private int vidas;
private float tInvulnerable;
// Start is called before the first frame update
void Start()
{
vidas = 3;
tInvulnerable = 0;
}
// Update is called once per frame
void Update()
{
tInvulnerable -= Time.deltaTime;
}
private void OnTriggerEnter2D(Collider2D collision)
{
if (collision.tag == "Enemigo" && tInvulnerable<=0)
{
Dañado();
}
}
void Dañado()
{
vidas--;
tInvulnerable = 1.5f;
Debug.Log(vidas);
}
}
Videojuegos_Proyecto/Assets/Scripts/Jugador.cs.meta 0 → 100644
fileFormatVersion: 2
guid: fb387e14ec85d764aa2bdac5ed1eb3cb
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Library/CurrentLayout.dwlt
...@@ -44,10 +44,10 @@ MonoBehaviour: ...@@ -44,10 +44,10 @@ MonoBehaviour:
y: 30 y: 30
width: 1920 width: 1920
height: 947 height: 947
m_MinSize: {x: 683, y: 494} m_MinSize: {x: 683, y: 344}
m_MaxSize: {x: 14004, y: 14044} m_MaxSize: {x: 12008, y: 8044}
vertical: 0 vertical: 0
controlID: 41 controlID: 31
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -119,14 +119,14 @@ MonoBehaviour: ...@@ -119,14 +119,14 @@ MonoBehaviour:
y: 531 y: 531
width: 1369 width: 1369
height: 416 height: 416
m_MinSize: {x: 232, y: 272} m_MinSize: {x: 102, y: 122}
m_MaxSize: {x: 10002, y: 10022} m_MaxSize: {x: 4002, y: 4022}
m_ActualView: {fileID: 13} m_ActualView: {fileID: 18}
m_Panes: m_Panes:
- {fileID: 13} - {fileID: 13}
- {fileID: 18} - {fileID: 18}
m_Selected: 0 m_Selected: 1
m_LastSelected: 1 m_LastSelected: 0
--- !u!114 &6 --- !u!114 &6
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -215,10 +215,10 @@ MonoBehaviour: ...@@ -215,10 +215,10 @@ MonoBehaviour:
y: 0 y: 0
width: 1369 width: 1369
height: 947 height: 947
m_MinSize: {x: 406, y: 494} m_MinSize: {x: 406, y: 344}
m_MaxSize: {x: 10002, y: 14044} m_MaxSize: {x: 8006, y: 8044}
vertical: 1 vertical: 1
controlID: 88 controlID: 32
--- !u!114 &10 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -243,7 +243,7 @@ MonoBehaviour: ...@@ -243,7 +243,7 @@ MonoBehaviour:
m_MinSize: {x: 406, y: 222} m_MinSize: {x: 406, y: 222}
m_MaxSize: {x: 8006, y: 4022} m_MaxSize: {x: 8006, y: 4022}
vertical: 0 vertical: 0
controlID: 15 controlID: 33
--- !u!114 &11 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -265,13 +265,13 @@ MonoBehaviour: ...@@ -265,13 +265,13 @@ MonoBehaviour:
height: 531 height: 531
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: 17}
m_Panes: m_Panes:
- {fileID: 16} - {fileID: 16}
- {fileID: 17} - {fileID: 17}
- {fileID: 12} - {fileID: 12}
m_Selected: 0 m_Selected: 1
m_LastSelected: 1 m_LastSelected: 0
--- !u!114 &12 --- !u!114 &12
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -347,9 +347,9 @@ MonoBehaviour: ...@@ -347,9 +347,9 @@ MonoBehaviour:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: ce340000 m_SelectedIDs: 00350000
m_LastClickedID: 13518 m_LastClickedID: 13568
m_ExpandedIDs: 00000000442a00006a33000000ca9a3b m_ExpandedIDs: 000000007a2a00009c33000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -377,7 +377,7 @@ MonoBehaviour: ...@@ -377,7 +377,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 00000000442a00006a330000 m_ExpandedIDs: 000000007a2a00009c330000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -402,8 +402,8 @@ MonoBehaviour: ...@@ -402,8 +402,8 @@ MonoBehaviour:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_ResourceFile: m_ResourceFile:
m_ListAreaState: m_ListAreaState:
m_SelectedInstanceIDs: m_SelectedInstanceIDs: d6580000
m_LastClickedInstanceID: 0 m_LastClickedInstanceID: 22742
m_HadKeyboardFocusLastEvent: 1 m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000 m_ExpandedInstanceIDs: c6230000
m_RenameOverlay: m_RenameOverlay:
...@@ -421,7 +421,7 @@ MonoBehaviour: ...@@ -421,7 +421,7 @@ MonoBehaviour:
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 11
m_IsRenamingFilename: 1 m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 3} m_ClientGUIView: {fileID: 5}
m_CreateAssetUtility: m_CreateAssetUtility:
m_EndAction: {fileID: 0} m_EndAction: {fileID: 0}
m_InstanceID: 0 m_InstanceID: 0
...@@ -497,9 +497,9 @@ MonoBehaviour: ...@@ -497,9 +497,9 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 12350000 m_SelectedIDs: d6580000
m_LastClickedID: 0 m_LastClickedID: 22742
m_ExpandedIDs: 8cfbffff m_ExpandedIDs: 24e4ffff
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -552,16 +552,16 @@ MonoBehaviour: ...@@ -552,16 +552,16 @@ MonoBehaviour:
m_ShowContextualTools: 0 m_ShowContextualTools: 0
m_WindowGUID: 2d69ccd3c606f1346bdf8a3d51488996 m_WindowGUID: 2d69ccd3c606f1346bdf8a3d51488996
m_Gizmos: 1 m_Gizmos: 1
m_SceneIsLit: 1 m_SceneIsLit: 0
m_SceneLighting: 1 m_SceneLighting: 1
m_2DMode: 1 m_2DMode: 1
m_isRotationLocked: 0 m_isRotationLocked: 0
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
m_Target: {x: 28.342342, y: 4.5864763, z: -130.97266} m_Target: {x: -10.025, y: -2.108, z: 0}
speed: 2 speed: 2
m_Value: {x: 28.342342, y: 4.5864763, z: -130.97266} m_Value: {x: -10.025, y: -2.108, z: 0}
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
...@@ -572,7 +572,7 @@ MonoBehaviour: ...@@ -572,7 +572,7 @@ MonoBehaviour:
m_SceneViewState: m_SceneViewState:
showFog: 1 showFog: 1
showMaterialUpdate: 0 showMaterialUpdate: 0
showSkybox: 1 showSkybox: 0
showFlares: 1 showFlares: 1
showImageEffects: 1 showImageEffects: 1
showParticleSystems: 1 showParticleSystems: 1
...@@ -594,9 +594,9 @@ MonoBehaviour: ...@@ -594,9 +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:
m_Target: 22.365404 m_Target: 3.0049949
speed: 2 speed: 2
m_Value: 22.365404 m_Value: 3.0049949
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
...@@ -642,10 +642,10 @@ MonoBehaviour: ...@@ -642,10 +642,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 283 x: 398
y: 73 y: 73
width: 689 width: 969
height: 337 height: 512
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_VSyncEnabled: 0 m_VSyncEnabled: 0
m_MaximizeOnPlay: 0 m_MaximizeOnPlay: 0
...@@ -658,10 +658,10 @@ MonoBehaviour: ...@@ -658,10 +658,10 @@ MonoBehaviour:
m_VRangeLocked: 0 m_VRangeLocked: 0
hZoomLockedByDefault: 0 hZoomLockedByDefault: 0
vZoomLockedByDefault: 0 vZoomLockedByDefault: 0
m_HBaseRangeMin: -344.5 m_HBaseRangeMin: -484.5
m_HBaseRangeMax: 344.5 m_HBaseRangeMax: 484.5
m_VBaseRangeMin: -160 m_VBaseRangeMin: -247.5
m_VBaseRangeMax: 160 m_VBaseRangeMax: 247.5
m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1 m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMin: 1
...@@ -670,7 +670,7 @@ MonoBehaviour: ...@@ -670,7 +670,7 @@ MonoBehaviour:
m_HSlider: 0 m_HSlider: 0
m_VSlider: 0 m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0 m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 0 m_EnableMouseInput: 1
m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0 m_EnableSliderZoomVertical: 0
m_UniformScale: 1 m_UniformScale: 1
...@@ -679,25 +679,25 @@ MonoBehaviour: ...@@ -679,25 +679,25 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 17 y: 17
width: 689 width: 969
height: 320 height: 495
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Translation: {x: 344.5, y: 160} m_Translation: {x: 484.5, y: 247.5}
m_MarginLeft: 0 m_MarginLeft: 0
m_MarginRight: 0 m_MarginRight: 0
m_MarginTop: 0 m_MarginTop: 0
m_MarginBottom: 0 m_MarginBottom: 0
m_LastShownAreaInsideMargins: m_LastShownAreaInsideMargins:
serializedVersion: 2 serializedVersion: 2
x: -344.5 x: -484.5
y: -160 y: -247.5
width: 689 width: 969
height: 320 height: 495
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: 689, y: 337} m_LastWindowPixelSize: {x: 969, y: 512}
m_ClearInEditMode: 1 m_ClearInEditMode: 1
m_NoCameraWarning: 1 m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000 m_LowResolutionForAspectRatios: 01000000000000000000
...@@ -724,7 +724,7 @@ MonoBehaviour: ...@@ -724,7 +724,7 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 436 y: 604
width: 1089 width: 1369
height: 253 height: 397
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
Videojuegos_Proyecto/Library/StateCache/Hierarchy/a6872e-38c9ae1c49230e24a8.json 0 → 100644
{"m_ExpandedPrefabGameObjectFileIDs":[5415114670227481229],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/Hierarchy/a6872e-4cad856fb8f87054e8.json 0 → 100644
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/Hierarchy/a6872e-mainStage.json
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0} {"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-3012,-1236],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file \ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/2d69cc-38c9ae1c49230e24a8.json 0 → 100644
{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":false,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-7.9800004959106449,"y":-0.7299999594688416,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":3.5357775688171388,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/2d69cc-4cad856fb8f87054e8.json 0 → 100644
{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":false,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-10.024999618530274,"y":-2.1080000400543215,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":3.0049948692321779,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/ProjectSettings/TagManager.asset
...@@ -5,6 +5,7 @@ TagManager: ...@@ -5,6 +5,7 @@ TagManager:
serializedVersion: 2 serializedVersion: 2
tags: tags:
- Suelo - Suelo
- Enemigo
layers: layers:
- Default - Default
- TransparentFX - 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