Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit 6e2db983 by Álvaro Morales García
Options

Arreglo

parent 31cc7d60
Inline Side-by-side
Showing with 21 additions and 20 deletions
Videojuegos_Proyecto/Assets/Scenes/SampleScene.unity
...@@ -785,7 +785,7 @@ Transform: ...@@ -785,7 +785,7 @@ Transform:
- {fileID: 1263909782} - {fileID: 1263909782}
- {fileID: 1729172587} - {fileID: 1729172587}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 15 m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &127956974 --- !u!1001 &127956974
PrefabInstance: PrefabInstance:
...@@ -1298,7 +1298,7 @@ GameObject: ...@@ -1298,7 +1298,7 @@ GameObject:
- component: {fileID: 323403635} - component: {fileID: 323403635}
- component: {fileID: 323403634} - component: {fileID: 323403634}
m_Layer: 5 m_Layer: 5
m_Name: CanvasDeDesbloqueoDePartitura (1) m_Name: CanvasControles
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
...@@ -1377,7 +1377,7 @@ RectTransform: ...@@ -1377,7 +1377,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 432721746} - {fileID: 432721746}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 19 m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
...@@ -2187,7 +2187,7 @@ Transform: ...@@ -2187,7 +2187,7 @@ Transform:
- {fileID: 1930996488} - {fileID: 1930996488}
- {fileID: 1937726930} - {fileID: 1937726930}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 14 m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &462570829 --- !u!1001 &462570829
PrefabInstance: PrefabInstance:
...@@ -3002,7 +3002,7 @@ Transform: ...@@ -3002,7 +3002,7 @@ Transform:
- {fileID: 1490332841} - {fileID: 1490332841}
- {fileID: 410868128} - {fileID: 410868128}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 17 m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &579970572 --- !u!1001 &579970572
PrefabInstance: PrefabInstance:
...@@ -4549,7 +4549,7 @@ Transform: ...@@ -4549,7 +4549,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 11 m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &859690734 --- !u!1 &859690734
GameObject: GameObject:
...@@ -6443,7 +6443,7 @@ Transform: ...@@ -6443,7 +6443,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 18 m_RootOrder: 19
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1234913244 --- !u!1 &1234913244
GameObject: GameObject:
...@@ -7548,7 +7548,7 @@ Transform: ...@@ -7548,7 +7548,7 @@ Transform:
- {fileID: 801925811} - {fileID: 801925811}
- {fileID: 1781964011} - {fileID: 1781964011}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 16 m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1561285300 --- !u!1 &1561285300
GameObject: GameObject:
...@@ -8496,7 +8496,7 @@ RectTransform: ...@@ -8496,7 +8496,7 @@ RectTransform:
- {fileID: 2122110141} - {fileID: 2122110141}
- {fileID: 440952853} - {fileID: 440952853}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 13 m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
...@@ -10270,7 +10270,7 @@ RectTransform: ...@@ -10270,7 +10270,7 @@ RectTransform:
- {fileID: 778520912} - {fileID: 778520912}
- {fileID: 1663696523} - {fileID: 1663696523}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 12 m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
......
Videojuegos_Proyecto/Assets/Scripts/Jugador.cs
...@@ -83,7 +83,8 @@ public class Jugador : MonoBehaviour ...@@ -83,7 +83,8 @@ public class Jugador : MonoBehaviour
vidas--; vidas--;
tInvulnerable = 1.5f; tInvulnerable = 1.5f;
Debug.Log("Vida actual: " + vidas + "/3"); Debug.Log("Vida actual: " + vidas + "/3");
//Efecto de sonido de muerte de pajaro
//Efecto de sonido de daño.
AudioSource audio = GameObject.Find("Efectos").GetComponent<AudioSource>(); AudioSource audio = GameObject.Find("Efectos").GetComponent<AudioSource>();
AudioClip clip = Resources.Load("Musica/EfectosSonido/daño") as AudioClip; AudioClip clip = Resources.Load("Musica/EfectosSonido/daño") as AudioClip;
audio.PlayOneShot(clip, 0.2f); audio.PlayOneShot(clip, 0.2f);
......
Videojuegos_Proyecto/Library/CurrentLayout.dwlt
...@@ -219,7 +219,7 @@ MonoBehaviour: ...@@ -219,7 +219,7 @@ MonoBehaviour:
m_MinSize: {x: 406, y: 494} m_MinSize: {x: 406, y: 494}
m_MaxSize: {x: 10002, y: 14044} m_MaxSize: {x: 10002, y: 14044}
vertical: 1 vertical: 1
controlID: 54 controlID: 14
--- !u!114 &10 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -244,7 +244,7 @@ MonoBehaviour: ...@@ -244,7 +244,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: 55 controlID: 15
--- !u!114 &11 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -350,9 +350,9 @@ MonoBehaviour: ...@@ -350,9 +350,9 @@ MonoBehaviour:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 882b0000 m_SelectedIDs: 6e2b0000
m_LastClickedID: 11144 m_LastClickedID: 11118
m_ExpandedIDs: 00000000a02a0000163400009c3400007435000000ca9a3b m_ExpandedIDs: 00000000862a0000fe3300005c35000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -380,7 +380,7 @@ MonoBehaviour: ...@@ -380,7 +380,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 00000000a02a00001634000074350000 m_ExpandedIDs: 00000000862a0000fe3300005c350000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -500,9 +500,9 @@ MonoBehaviour: ...@@ -500,9 +500,9 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 54330000 m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 4079ffff4c8effff508effff528effff2491ffff2891ffff78faffff0cfbffff923f0000 m_ExpandedIDs: f2faffff8cfbffff
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
......
Videojuegos_Proyecto/Library/LastSceneManagerSetup.txt
sceneSetups: sceneSetups:
- path: Assets/Scenes/MenuInicial.unity - path: Assets/Scenes/SampleScene.unity
isLoaded: 1 isLoaded: 1
isActive: 1 isActive: 1
isSubScene: 0 isSubScene: 0
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