Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit 3ff7242a by David Colmenero Chica
Options

Merge remote-tracking branch 'origin/Ataque_melee_y_creditos' into Release

parents f398900b 38d3d23a
Expand all
Inline Side-by-side
Showing with 157 additions and 67 deletions
Videojuegos_Proyecto/Assets/MainMenu/Scripts/MainMenu.cs
...@@ -29,7 +29,7 @@ public class MainMenu : MonoBehaviour ...@@ -29,7 +29,7 @@ public class MainMenu : MonoBehaviour
} }
public void CreditsScene() { public void CreditsScene() {
//Cargar pantalla creditos SceneManager.LoadScene("MenuCreditos");
} }
public void MainMenuScreen() { public void MainMenuScreen() {
......
Videojuegos_Proyecto/Assets/Player/Animaciones/3_melee_Guitarra.anim
...@@ -20,19 +20,16 @@ AnimationClip: ...@@ -20,19 +20,16 @@ AnimationClip:
m_PPtrCurves: m_PPtrCurves:
- curve: - curve:
- time: 0 - time: 0
value: {fileID: 8724373332404428253, guid: 0c3279f55b54d94449d876234b89e965, value: {fileID: 1711192532778030261, guid: 0c3279f55b54d94449d876234b89e965,
type: 3}
- time: 0.2
value: {fileID: 6392728175395987437, guid: 0c3279f55b54d94449d876234b89e965,
type: 3} type: 3}
- time: 0.38333333 - time: 0.25
value: {fileID: -983869874967241593, guid: 0c3279f55b54d94449d876234b89e965, value: {fileID: -983869874967241593, guid: 0c3279f55b54d94449d876234b89e965,
type: 3} type: 3}
- time: 0.56666666 - time: 0.45
value: {fileID: 1711192532778030261, guid: 0c3279f55b54d94449d876234b89e965, value: {fileID: 6392728175395987437, guid: 0c3279f55b54d94449d876234b89e965,
type: 3} type: 3}
- time: 0.98333335 - time: 0.6666667
value: {fileID: 1711192532778030261, guid: 0c3279f55b54d94449d876234b89e965, value: {fileID: 8724373332404428253, guid: 0c3279f55b54d94449d876234b89e965,
type: 3} type: 3}
attribute: m_Sprite attribute: m_Sprite
path: path:
...@@ -53,17 +50,16 @@ AnimationClip: ...@@ -53,17 +50,16 @@ AnimationClip:
customType: 23 customType: 23
isPPtrCurve: 1 isPPtrCurve: 1
pptrCurveMapping: 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: 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: m_AnimationClipSettings:
serializedVersion: 2 serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0 m_AdditiveReferencePoseTime: 0
m_StartTime: 0 m_StartTime: 0
m_StopTime: 1 m_StopTime: 0.68333334
m_OrientationOffsetY: 0 m_OrientationOffsetY: 0
m_Level: 0 m_Level: 0
m_CycleOffset: 0 m_CycleOffset: 0
......
Videojuegos_Proyecto/Assets/Player/Scripts/Player2D.cs
...@@ -12,12 +12,13 @@ public class Player2D : MonoBehaviour ...@@ -12,12 +12,13 @@ public class Player2D : MonoBehaviour
[Range(0f, 5f)] public float ratioAtaqueFlauta = 2f; [Range(0f, 5f)] public float ratioAtaqueFlauta = 2f;
[Range(0f, 5f)] public float ratioAtaqueGuitarra = 2f; [Range(0f, 5f)] public float ratioAtaqueGuitarra = 2f;
[Range(0f, 3f)] public float ratioAtaqueMelee = 1; [Range(0f, 3f)] public float ratioAtaqueMelee = 1;
public GameObject hitBoxMeleeR; //Right
public GameObject hitBoxMeleeL; //Left
float timeSiguienteAtaque = 0f; float timeSiguienteAtaque = 0f;
public GameObject spawnDisparosDerecha; public GameObject spawnDisparosDerecha;
public GameObject spawnDisparosIzquierda; public GameObject spawnDisparosIzquierda;
public GameObject disparoFlauta; public GameObject disparoFlauta;
public GameObject disparoGuitarra; public GameObject disparoGuitarra;
public LayerMask layersEnemigos;
Rigidbody2D rb2d; Rigidbody2D rb2d;
SpriteRenderer spriteRenderer; SpriteRenderer spriteRenderer;
Animator animator; Animator animator;
...@@ -37,6 +38,9 @@ public class Player2D : MonoBehaviour ...@@ -37,6 +38,9 @@ public class Player2D : MonoBehaviour
spriteRenderer = GetComponent<SpriteRenderer>(); spriteRenderer = GetComponent<SpriteRenderer>();
animator = GetComponent<Animator>(); animator = GetComponent<Animator>();
rb2d = GetComponent<Rigidbody2D>(); rb2d = GetComponent<Rigidbody2D>();
hitBoxMeleeL.SetActive(false);
hitBoxMeleeR.SetActive(false);
} }
// Update is called once per frame // Update is called once per frame
...@@ -177,11 +181,27 @@ public class Player2D : MonoBehaviour ...@@ -177,11 +181,27 @@ public class Player2D : MonoBehaviour
private void AtaqueMelee() { private void AtaqueMelee() {
animator.SetTrigger("GolpeandoMelee"); 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; 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"*/ /*NO OLVIDAR poner a todas las plataformas que sean suelo la etiqueta "Suelo"*/
private void OnCollisionStay2D(Collision2D collision) private void OnCollisionStay2D(Collision2D collision)
{ {
......
Videojuegos_Proyecto/Assets/Scenes/MenuCreditos.unity.meta 0 → 100644
fileFormatVersion: 2
guid: 9512f311d51240547a69c1fd14d8b330
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Scenes/MenuInicial.unity
...@@ -992,7 +992,18 @@ MonoBehaviour: ...@@ -992,7 +992,18 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1126699024} m_TargetGraphic: {fileID: 1126699024}
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls:
- m_Target: {fileID: 572894596}
m_MethodName: CreditsScene
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null Culture=neutral, PublicKeyToken=null
--- !u!114 &1126699024 --- !u!114 &1126699024
......
Videojuegos_Proyecto/Assets/Scripts/Enemigo1Move.cs
...@@ -78,5 +78,27 @@ public class Enemigo1Move : MonoBehaviour ...@@ -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
...@@ -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: 679, y: 494} m_MinSize: {x: 683, y: 494}
m_MaxSize: {x: 14002, y: 14044} m_MaxSize: {x: 14004, y: 14044}
vertical: 0 vertical: 0
controlID: 71 controlID: 147
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -67,11 +67,11 @@ MonoBehaviour: ...@@ -67,11 +67,11 @@ 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: 15}
m_Panes: m_Panes:
- {fileID: 14} - {fileID: 15}
m_Selected: 0 m_Selected: 0
m_LastSelected: 0 m_LastSelected: 0
--- !u!114 &4 --- !u!114 &4
...@@ -93,11 +93,11 @@ MonoBehaviour: ...@@ -93,11 +93,11 @@ MonoBehaviour:
y: 0 y: 0
width: 379 width: 379
height: 573 height: 573
m_MinSize: {x: 200, y: 200} m_MinSize: {x: 202, y: 222}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4002, y: 4022}
m_ActualView: {fileID: 15} m_ActualView: {fileID: 16}
m_Panes: m_Panes:
- {fileID: 15} - {fileID: 16}
m_Selected: 0 m_Selected: 0
m_LastSelected: 0 m_LastSelected: 0
--- !u!114 &5 --- !u!114 &5
...@@ -121,10 +121,11 @@ MonoBehaviour: ...@@ -121,10 +121,11 @@ MonoBehaviour:
height: 374 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: 14}
m_Panes: m_Panes:
- {fileID: 13} - {fileID: 14}
- {fileID: 18} - {fileID: 19}
- {fileID: 12}
m_Selected: 0 m_Selected: 0
m_LastSelected: 1 m_LastSelected: 1
--- !u!114 &6 --- !u!114 &6
...@@ -215,10 +216,10 @@ MonoBehaviour: ...@@ -215,10 +216,10 @@ MonoBehaviour:
y: 0 y: 0
width: 1531 width: 1531
height: 947 height: 947
m_MinSize: {x: 404, 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: 72 controlID: 59
--- !u!114 &10 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -240,10 +241,10 @@ MonoBehaviour: ...@@ -240,10 +241,10 @@ MonoBehaviour:
y: 0 y: 0
width: 1531 width: 1531
height: 573 height: 573
m_MinSize: {x: 404, y: 222} m_MinSize: {x: 406, y: 222}
m_MaxSize: {x: 8004, y: 4022} m_MaxSize: {x: 8006, y: 4022}
vertical: 0 vertical: 0
controlID: 73 controlID: 60
--- !u!114 &11 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -265,11 +266,11 @@ MonoBehaviour: ...@@ -265,11 +266,11 @@ MonoBehaviour:
height: 573 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: 17}
m_Panes: m_Panes:
- {fileID: 16}
- {fileID: 17} - {fileID: 17}
- {fileID: 12} - {fileID: 18}
- {fileID: 13}
m_Selected: 0 m_Selected: 0
m_LastSelected: 1 m_LastSelected: 1
--- !u!114 &12 --- !u!114 &12
...@@ -280,6 +281,35 @@ MonoBehaviour: ...@@ -280,6 +281,35 @@ MonoBehaviour:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0} m_GameObject: {fileID: 0}
m_Enabled: 1 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_EditorHideFlags: 1
m_Script: {fileID: 12111, guid: 0000000000000000e000000000000000, type: 0} m_Script: {fileID: 12111, guid: 0000000000000000e000000000000000, type: 0}
m_Name: m_Name:
...@@ -298,7 +328,7 @@ MonoBehaviour: ...@@ -298,7 +328,7 @@ MonoBehaviour:
width: 973 width: 973
height: 501 height: 501
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
--- !u!114 &13 --- !u!114 &14
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -336,20 +366,20 @@ MonoBehaviour: ...@@ -336,20 +366,20 @@ MonoBehaviour:
m_ShowAllHits: 0 m_ShowAllHits: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
- Assets/Scripts - Assets/Scenes
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: m_LastFolders:
- Assets/Scripts - Assets/Scenes
m_LastFoldersGridSize: -1 m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\Colme\Documents\UnityProjects\ProyectoVideojuegos\Videojuegos_Proyecto m_LastProjectPath: C:\Users\Colme\Documents\UnityProjects\ProyectoVideojuegos\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}
m_SelectedIDs: de330000 m_SelectedIDs: 482b0000
m_LastClickedID: 13278 m_LastClickedID: 11080
m_ExpandedIDs: 00000000082c0000243400004635000000ca9a3b m_ExpandedIDs: 000000006e2a00008a320000ac330000d633000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -377,7 +407,7 @@ MonoBehaviour: ...@@ -377,7 +407,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 00000000082c000046350000 m_ExpandedIDs: 000000006e2a0000ac330000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -405,7 +435,7 @@ MonoBehaviour: ...@@ -405,7 +435,7 @@ MonoBehaviour:
m_SelectedInstanceIDs: m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0 m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1 m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000 m_ExpandedInstanceIDs: c6230000a8320000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -421,7 +451,7 @@ MonoBehaviour: ...@@ -421,7 +451,7 @@ MonoBehaviour:
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 11
m_IsRenamingFilename: 1 m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 0} m_ClientGUIView: {fileID: 5}
m_CreateAssetUtility: m_CreateAssetUtility:
m_EndAction: {fileID: 0} m_EndAction: {fileID: 0}
m_InstanceID: 0 m_InstanceID: 0
...@@ -432,7 +462,7 @@ MonoBehaviour: ...@@ -432,7 +462,7 @@ MonoBehaviour:
m_ScrollPosition: {x: 0, y: 0} m_ScrollPosition: {x: 0, y: 0}
m_GridSize: 64 m_GridSize: 64
m_DirectoriesAreaWidth: 115 m_DirectoriesAreaWidth: 115
--- !u!114 &14 --- !u!114 &15
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -468,7 +498,7 @@ MonoBehaviour: ...@@ -468,7 +498,7 @@ MonoBehaviour:
m_ControlHash: -371814159 m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview m_PrefName: Preview_InspectorPreview
m_PreviewWindow: {fileID: 0} m_PreviewWindow: {fileID: 0}
--- !u!114 &15 --- !u!114 &16
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -497,23 +527,23 @@ MonoBehaviour: ...@@ -497,23 +527,23 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs: f6320000
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 38faffff743e00006c3f0000943f0000a83f0000 m_ExpandedIDs: f2d9ffff3cdaffffa2dcffffc4dffffff0dfffff24e1ffff68e9ffff88e9ffffa4e9ffff12f1ffff26f1ffff28f1ffff2af1ffff60f1ffffe4f1ffffc6f2ffff8cfbffffca410000184600003a46000058460000544700007c470000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: CanvasMuerte m_Name:
m_OriginalName: CanvasMuerte 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: 16236 m_UserData: 0
m_IsWaitingForDelay: 0 m_IsWaitingForDelay: 0
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 0 m_OriginalEventType: 11
m_IsRenamingFilename: 0 m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 4} m_ClientGUIView: {fileID: 4}
m_SearchString: m_SearchString:
...@@ -523,7 +553,7 @@ MonoBehaviour: ...@@ -523,7 +553,7 @@ MonoBehaviour:
m_IsLocked: 0 m_IsLocked: 0
m_CurrentSortingName: TransformSorting m_CurrentSortingName: TransformSorting
m_WindowGUID: defd79de2c582ea45ab6fa9ed58148b9 m_WindowGUID: defd79de2c582ea45ab6fa9ed58148b9
--- !u!114 &16 --- !u!114 &17
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -559,9 +589,9 @@ MonoBehaviour: ...@@ -559,9 +589,9 @@ MonoBehaviour:
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
m_Target: {x: 574.8234, y: 170.78032, z: -100.875} m_Target: {x: 586.14294, y: 267.58862, z: -112}
speed: 2 speed: 2
m_Value: {x: 574.8234, y: 170.78032, z: -100.875} m_Value: {x: 586.14294, y: 267.58862, z: -112}
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
...@@ -594,9 +624,9 @@ MonoBehaviour: ...@@ -594,9 +624,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: 833.83777 m_Target: 693.57764
speed: 2 speed: 2
m_Value: 833.83777 m_Value: 693.57764
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
...@@ -621,7 +651,7 @@ MonoBehaviour: ...@@ -621,7 +651,7 @@ MonoBehaviour:
m_SceneVisActive: 1 m_SceneVisActive: 1
m_LastLockedObject: {fileID: 0} m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0 m_ViewIsLockedToObject: 0
--- !u!114 &17 --- !u!114 &18
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -702,7 +732,7 @@ MonoBehaviour: ...@@ -702,7 +732,7 @@ MonoBehaviour:
m_NoCameraWarning: 1 m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000 m_LowResolutionForAspectRatios: 01000000000000000000
m_XRRenderMode: 0 m_XRRenderMode: 0
--- !u!114 &18 --- !u!114 &19
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
......
Videojuegos_Proyecto/Library/LastSceneManagerSetup.txt
sceneSetups: sceneSetups:
- path: Assets/Scenes/SampleScene.unity - path: Assets/Scenes/MenuInicial.unity
isLoaded: 1 isLoaded: 1
isActive: 1 isActive: 1
isSubScene: 0 isSubScene: 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} {"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":586.1429443359375,"y":267.588623046875,"z":-112.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":693.57763671875,"orthographic":true}
\ No newline at end of file \ 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