Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit b9c10d90 by Juan Carlos
Options

Commit antes de merge

parent 4217049b
Expand all
Inline Side-by-side
Showing with 155 additions and 106 deletions
Videojuegos_Proyecto/Assets/Effects.meta 0 → 100644
fileFormatVersion: 2
guid: f6d872c6bac611044b248b80ead2ebe6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Effects/PickInvulnerability.prefab 0 → 100644
This diff could not be displayed because it is too large.
Videojuegos_Proyecto/Assets/Effects/PickInvulnerability.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: 537a38f03ae37734e8fe833077f59531
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Effects/PickLife.prefab 0 → 100644
This diff could not be displayed because it is too large.
Videojuegos_Proyecto/Assets/Effects/PickLife.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: be8437e4aefd8004ebc5d004b4ac4798
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Effects/PickVelocity.prefab 0 → 100644
This diff could not be displayed because it is too large.
Videojuegos_Proyecto/Assets/Effects/PickVelocity.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: 47e6ce82743488e40a8b3bb0615e28d9
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Player/Scripts/Player2D.cs
...@@ -22,6 +22,10 @@ public class Player2D : MonoBehaviour ...@@ -22,6 +22,10 @@ public class Player2D : MonoBehaviour
private int instrumentoUsandose = 0; /* 0 = flauta, 1 = guitarra */ private int instrumentoUsandose = 0; /* 0 = flauta, 1 = guitarra */
public ParticleSystem efectoVida;
public ParticleSystem efectoVelocidad;
public ParticleSystem efectoInvulnerabilidad;
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
...@@ -203,4 +207,28 @@ public class Player2D : MonoBehaviour ...@@ -203,4 +207,28 @@ public class Player2D : MonoBehaviour
Debug.Log("Coleccionables: "+Coleccionables.cConseguidos[Coleccionables.niActual] + "/" + Coleccionables.cTotales[Coleccionables.niActual]); Debug.Log("Coleccionables: "+Coleccionables.cConseguidos[Coleccionables.niActual] + "/" + Coleccionables.cTotales[Coleccionables.niActual]);
} }
} }
public void EmpezarAnimacionVida() {
efectoVida.Play();
}
public void EmpezarAnimacionVelocidad()
{
efectoVelocidad.Play();
}
public void AcabarAnimacionVelocidad()
{
efectoVelocidad.Stop();
}
public void EmpezarAnimacionInvulnerabilidad()
{
efectoInvulnerabilidad.Play();
}
public void AcabarAnimacionInvulnerabilidad()
{
efectoInvulnerabilidad.Stop();
}
} }
Videojuegos_Proyecto/Assets/Prefabs/Invulnerabilidad.prefab
...@@ -120,3 +120,6 @@ MonoBehaviour: ...@@ -120,3 +120,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3} m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
efectoCogerVida: {fileID: 2346756237646661404, guid: be8437e4aefd8004ebc5d004b4ac4798,
type: 3}
player: {fileID: 0}
Videojuegos_Proyecto/Assets/Prefabs/Velocidad.prefab
...@@ -120,3 +120,6 @@ MonoBehaviour: ...@@ -120,3 +120,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3} m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
efectoCogerVida: {fileID: 2346756237646661404, guid: be8437e4aefd8004ebc5d004b4ac4798,
type: 3}
player: {fileID: 0}
Videojuegos_Proyecto/Assets/Prefabs/Vida.prefab
...@@ -120,3 +120,6 @@ MonoBehaviour: ...@@ -120,3 +120,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3} m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
efectoCogerVida: {fileID: 2346756237646661404, guid: be8437e4aefd8004ebc5d004b4ac4798,
type: 3}
player: {fileID: 0}
Videojuegos_Proyecto/Assets/Scripts/Jugador.cs
...@@ -6,14 +6,17 @@ using UnityEngine; ...@@ -6,14 +6,17 @@ using UnityEngine;
public class Jugador : MonoBehaviour public class Jugador : MonoBehaviour
{ {
private int vidas; public int vidas;
private float tInvulnerable; private float tInvulnerable;
public bool powerUpInvulnerable;
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
vidas = 3; vidas = 3;
tInvulnerable = 0; tInvulnerable = 0;
powerUpInvulnerable = false;
} }
// Update is called once per frame // Update is called once per frame
...@@ -25,7 +28,7 @@ public class Jugador : MonoBehaviour ...@@ -25,7 +28,7 @@ public class Jugador : MonoBehaviour
private void OnTriggerEnter2D(Collider2D collision) private void OnTriggerEnter2D(Collider2D collision)
{ {
if (collision.tag == "Enemigo" && tInvulnerable<=0) if (collision.tag == "Enemigo" && tInvulnerable<=0 && powerUpInvulnerable==false)
{ {
Dañado(); Dañado();
} }
......
Videojuegos_Proyecto/Assets/Scripts/PowerUp.cs
...@@ -5,11 +5,9 @@ using UnityEngine; ...@@ -5,11 +5,9 @@ using UnityEngine;
public class PowerUp : MonoBehaviour public class PowerUp : MonoBehaviour
{ {
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
} }
// Update is called once per frame // Update is called once per frame
...@@ -21,19 +19,25 @@ public class PowerUp : MonoBehaviour ...@@ -21,19 +19,25 @@ public class PowerUp : MonoBehaviour
private void OnTriggerEnter2D(Collider2D other) private void OnTriggerEnter2D(Collider2D other)
{ {
if (other.CompareTag("Player")) { if (other.CompareTag("Player")) {
if (this.CompareTag("PU_Velocidad")) { if (this.CompareTag("PU_Velocidad")) {
Debug.Log("El jugador ha chocado con el power up de velocidad"); Debug.Log("El jugador ha chocado con el power up de velocidad");
other.GetComponent<Player2D>().velocidadAlAndar = 6.0f; other.GetComponent<Player2D>().velocidadAlAndar = 6.0f;
other.GetComponent<Player2D>().EmpezarAnimacionVelocidad();
StartCoroutine(CogerVelocidad(other)); StartCoroutine(CogerVelocidad(other));
} }
if (this.CompareTag("PU_Invulnerabilidad")) { if (this.CompareTag("PU_Invulnerabilidad")) {
Debug.Log("El jugador ha chocado con el power up de invulnerabilidad"); Debug.Log("El jugador ha chocado con el power up de invulnerabilidad");
Destroy(gameObject); other.GetComponent<Jugador>().powerUpInvulnerable = true;
other.GetComponent<Player2D>().EmpezarAnimacionInvulnerabilidad();
StartCoroutine(CogerInvulnerabilidad(other));
} }
if (this.CompareTag("PU_Vida")) { if (this.CompareTag("PU_Vida")) {
Debug.Log("El jugador ha chocado con el power up de vida"); Debug.Log("El jugador ha chocado con el power up de vida");
//other.GetComponent<Player2D>; other.GetComponent<Jugador>().vidas=3;
other.GetComponent<Player2D>().EmpezarAnimacionVida();
Debug.Log("Las vidas del jugador son:"+ other.GetComponent<Jugador>().vidas);
Destroy(gameObject); Destroy(gameObject);
} }
} }
...@@ -42,13 +46,13 @@ public class PowerUp : MonoBehaviour ...@@ -42,13 +46,13 @@ public class PowerUp : MonoBehaviour
void DesactivarObjeto() { void DesactivarObjeto() {
GetComponent<SpriteRenderer>().enabled = false; GetComponent<SpriteRenderer>().enabled = false;
GetComponent<BoxCollider2D>().enabled = false; GetComponent<BoxCollider2D>().enabled = false;
} }
IEnumerator CogerVelocidad(Collider2D player) { IEnumerator CogerVelocidad(Collider2D player) {
DesactivarObjeto(); DesactivarObjeto();
yield return new WaitForSeconds(5.0f); yield return new WaitForSeconds(5.0f);
player.GetComponent<Player2D>().velocidadAlAndar = 3.0f; player.GetComponent<Player2D>().velocidadAlAndar = 3.0f;
player.GetComponent<Player2D>().AcabarAnimacionVelocidad();
Destroy(gameObject); Destroy(gameObject);
} }
...@@ -56,12 +60,8 @@ public class PowerUp : MonoBehaviour ...@@ -56,12 +60,8 @@ public class PowerUp : MonoBehaviour
{ {
DesactivarObjeto(); DesactivarObjeto();
yield return new WaitForSeconds(5.0f); yield return new WaitForSeconds(5.0f);
Destroy(gameObject); player.GetComponent<Jugador>().powerUpInvulnerable = false;
} player.GetComponent<Player2D>().AcabarAnimacionInvulnerabilidad();
void CogerVida(Collider2D player)
{
Destroy(gameObject); Destroy(gameObject);
} }
} }
Videojuegos_Proyecto/Library/CurrentLayout.dwlt
...@@ -47,7 +47,7 @@ MonoBehaviour: ...@@ -47,7 +47,7 @@ MonoBehaviour:
m_MinSize: {x: 683, y: 494} m_MinSize: {x: 683, y: 494}
m_MaxSize: {x: 14004, y: 14044} m_MaxSize: {x: 14004, y: 14044}
vertical: 0 vertical: 0
controlID: 13 controlID: 79
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -67,8 +67,8 @@ MonoBehaviour: ...@@ -67,8 +67,8 @@ MonoBehaviour:
y: 0 y: 0
width: 389 width: 389
height: 947 height: 947
m_MinSize: {x: 275, y: 50} m_MinSize: {x: 277, y: 72}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4002, y: 4022}
m_ActualView: {fileID: 14} m_ActualView: {fileID: 14}
m_Panes: m_Panes:
- {fileID: 14} - {fileID: 14}
...@@ -92,15 +92,9 @@ MonoBehaviour: ...@@ -92,15 +92,9 @@ MonoBehaviour:
x: 0 x: 0
y: 0 y: 0
width: 379 width: 379
<<<<<<< HEAD
height: 573 height: 573
m_MinSize: {x: 202, y: 222}
m_MaxSize: {x: 4002, y: 4022}
=======
height: 605
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4000, y: 4000}
>>>>>>> origin/Release
m_ActualView: {fileID: 15} m_ActualView: {fileID: 15}
m_Panes: m_Panes:
- {fileID: 15} - {fileID: 15}
...@@ -122,9 +116,9 @@ MonoBehaviour: ...@@ -122,9 +116,9 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 605 y: 573
width: 1531 width: 1531
height: 342 height: 374
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}
...@@ -132,7 +126,7 @@ MonoBehaviour: ...@@ -132,7 +126,7 @@ MonoBehaviour:
- {fileID: 13} - {fileID: 13}
- {fileID: 18} - {fileID: 18}
m_Selected: 0 m_Selected: 0
m_LastSelected: 1 m_LastSelected: 0
--- !u!114 &6 --- !u!114 &6
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -155,7 +149,7 @@ MonoBehaviour: ...@@ -155,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:
...@@ -245,15 +239,9 @@ MonoBehaviour: ...@@ -245,15 +239,9 @@ MonoBehaviour:
x: 0 x: 0
y: 0 y: 0
width: 1531 width: 1531
<<<<<<< HEAD
height: 573 height: 573
m_MinSize: {x: 406, y: 222} m_MinSize: {x: 406, y: 222}
m_MaxSize: {x: 8006, y: 4022} m_MaxSize: {x: 8006, y: 4022}
=======
height: 605
m_MinSize: {x: 404, y: 222}
m_MaxSize: {x: 8004, y: 4022}
>>>>>>> origin/Release
vertical: 0 vertical: 0
controlID: 15 controlID: 15
--- !u!114 &11 --- !u!114 &11
...@@ -274,7 +262,7 @@ MonoBehaviour: ...@@ -274,7 +262,7 @@ MonoBehaviour:
x: 379 x: 379
y: 0 y: 0
width: 1152 width: 1152
height: 605 height: 573
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}
...@@ -332,9 +320,9 @@ MonoBehaviour: ...@@ -332,9 +320,9 @@ 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}
m_SearchFilter: m_SearchFilter:
m_NameFilter: m_NameFilter:
...@@ -348,42 +336,36 @@ MonoBehaviour: ...@@ -348,42 +336,36 @@ MonoBehaviour:
m_ShowAllHits: 0 m_ShowAllHits: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
- Assets/Scenes - Assets/Effects
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: m_LastFolders:
- Assets/Scenes - Assets/Effects
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: 36330000
m_SelectedIDs: f02b0000 m_LastClickedID: 13110
m_LastClickedID: 11248 m_ExpandedIDs: 00000000662a000000ca9a3b
m_ExpandedIDs: 00000000222b000000ca9a3b
=======
m_SelectedIDs: 962b0000
m_LastClickedID: 11158
m_ExpandedIDs: 00000000c82a00001a34000000ca9a3b
>>>>>>> origin/Release
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name: Scripts
m_OriginalName: m_OriginalName: Scripts
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: 0 m_UserData: 12856
m_IsWaitingForDelay: 0 m_IsWaitingForDelay: 0
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 0
m_IsRenamingFilename: 1 m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 0} m_ClientGUIView: {fileID: 5}
m_SearchString: m_SearchString:
m_CreateAssetUtility: m_CreateAssetUtility:
m_EndAction: {fileID: 0} m_EndAction: {fileID: 0}
...@@ -395,11 +377,7 @@ MonoBehaviour: ...@@ -395,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: 00000000662a0000
m_ExpandedIDs: 00000000222b000070340000
=======
m_ExpandedIDs: 00000000c82a00001a340000
>>>>>>> origin/Release
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -443,7 +421,7 @@ MonoBehaviour: ...@@ -443,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: 5} m_ClientGUIView: {fileID: 0}
m_CreateAssetUtility: m_CreateAssetUtility:
m_EndAction: {fileID: 0} m_EndAction: {fileID: 0}
m_InstanceID: 0 m_InstanceID: 0
...@@ -514,20 +492,14 @@ MonoBehaviour: ...@@ -514,20 +492,14 @@ MonoBehaviour:
x: 0 x: 0
y: 73 y: 73
width: 379 width: 379
height: 586 height: 554
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: aa2a0000
m_SelectedIDs: 94330000
m_LastClickedID: 0
m_ExpandedIDs: e6f0ffff32f1ffff72faffff
=======
m_SelectedIDs: 3e330000
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 862dffff1c3cffffd04dffffb84effff3858ffff0259ffff485affffdc77ffff0a94ffff5ea1ffffdcd4fffffce6ffff28e7fffff0f1ffff3afaffff m_ExpandedIDs: 00f3ffff10faffff78fbffff
>>>>>>> origin/Release
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -543,14 +515,14 @@ MonoBehaviour: ...@@ -543,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: 29a1ae5ed2e786e46ab464313a854c6e
--- !u!114 &16 --- !u!114 &16
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -575,10 +547,10 @@ MonoBehaviour: ...@@ -575,10 +547,10 @@ 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_ShowContextualTools: 0 m_ShowContextualTools: 0
m_WindowGUID: 43dad88c062228f459455f7a9fa529fd m_WindowGUID: d2fa7bccd99ad644c90c32d37501e809
m_Gizmos: 1 m_Gizmos: 1
m_SceneIsLit: 1 m_SceneIsLit: 1
m_SceneLighting: 1 m_SceneLighting: 1
...@@ -587,15 +559,9 @@ MonoBehaviour: ...@@ -587,15 +559,9 @@ MonoBehaviour:
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
<<<<<<< HEAD m_Target: {x: -4.810031, y: -0.21807352, z: -2.0888672}
m_Target: {x: 451.576, y: 141.83812, z: -62.875}
speed: 2
m_Value: {x: 451.576, y: 141.83812, z: -62.875}
=======
m_Target: {x: 2.6275835, y: -0.29340863, z: -0.9394531}
speed: 2 speed: 2
m_Value: {x: 2.6275835, y: -0.29340863, z: -0.9394531} m_Value: {x: -4.810031, y: -0.21807352, z: -2.0888672}
>>>>>>> origin/Release
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
...@@ -628,15 +594,9 @@ MonoBehaviour: ...@@ -628,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: 5.5487404
m_Target: 482.1205
speed: 2
m_Value: 482.1205
=======
m_Target: 11.060756
speed: 2 speed: 2
m_Value: 10.5844555 m_Value: 5.5487404
>>>>>>> origin/Release
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
...@@ -685,7 +645,7 @@ MonoBehaviour: ...@@ -685,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
...@@ -700,8 +660,8 @@ MonoBehaviour: ...@@ -700,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
...@@ -720,9 +680,9 @@ MonoBehaviour: ...@@ -720,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
...@@ -730,14 +690,14 @@ MonoBehaviour: ...@@ -730,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
...@@ -763,8 +723,8 @@ MonoBehaviour: ...@@ -763,8 +723,8 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 8
y: 678 y: 718
width: 1531 width: 1366
height: 323 height: 308
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
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
Videojuegos_Proyecto/Library/StateCache/Hierarchy/29a1ae-be8437e4aefd8004eb.json 0 → 100644
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":2346756237646661404,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/Hierarchy/29a1ae-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/Hierarchy/c30137-mainStage.json 0 → 100644
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-3498,-1690,-1508],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/407e75-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.016723155975342,"y":0.5813383460044861,"z":-4.8798828125},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":6.283851146697998,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/d2fa7b-be8437e4aefd8004eb.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":0.0,"y":0.0,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":3.7895538806915285,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/d2fa7b-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":-4.810030937194824,"y":-0.2180735170841217,"z":-2.0888671875},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":5.548740386962891,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe0.log
Base path: C:/Program Files/Unity/Hub/Editor/2019.1.11f1/Editor/Data Base path: C:/Program Files/Unity/Editor/Data
Cmd: initializeCompiler Cmd: initializeCompiler
Cmd: compileSnippet
api=4 type=0 insize=934 outsize=818 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
Cmd: compileSnippet
api=4 type=1 insize=934 outsize=250 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe1.log
Base path: C:/Program Files/Unity/Editor/Data Base path: C:/Program Files/Unity/Editor/Data
Cmd: initializeCompiler Cmd: initializeCompiler
Cmd: compileSnippet Cmd: compileSnippet
api=4 type=1 insize=1302 outsize=218 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 api=4 type=0 insize=1152 outsize=2770 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH PROCEDURAL_INSTANCING_ON _ALPHABLEND_ON pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
Cmd: compileSnippet Cmd: compileSnippet
api=4 type=0 insize=1596 outsize=1894 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 api=4 type=1 insize=1396 outsize=422 kw=UNITY_PASS_FORWARDBASE _ALPHABLEND_ON pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
Cmd: compileSnippet
api=4 type=0 insize=934 outsize=818 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe2.log
Base path: C:/Program Files/Unity/Editor/Data Base path: C:/Program Files/Unity/Editor/Data
Cmd: initializeCompiler Cmd: initializeCompiler
Cmd: compileSnippet Cmd: compileSnippet
api=4 type=0 insize=1302 outsize=1414 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 api=4 type=1 insize=1152 outsize=638 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH PROCEDURAL_INSTANCING_ON _ALPHABLEND_ON pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
Cmd: compileSnippet
api=4 type=1 insize=934 outsize=282 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe3.log
Base path: C:/Program Files/Unity/Editor/Data Base path: C:/Program Files/Unity/Editor/Data
Cmd: initializeCompiler Cmd: initializeCompiler
Cmd: compileSnippet Cmd: compileSnippet
api=4 type=1 insize=1596 outsize=6814 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 api=4 type=0 insize=1396 outsize=822 kw=UNITY_PASS_FORWARDBASE _ALPHABLEND_ON pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
Videojuegos_Proyecto/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache
e3e7ce3c9141ed3e2564c1fa58246d1c2aef5990 ffeba46d040eb84d2da74aeed6850bddc816cc90
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