Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

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

Merge branch 'Cambio_musica' into Release

parents fa6ee123 458746b9
Expand all
Inline Side-by-side
Showing with 310 additions and 114 deletions
Videojuegos_Proyecto/Assets/Prefabs/GameManager.prefab
...@@ -10,7 +10,7 @@ GameObject: ...@@ -10,7 +10,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 7736364748447018736} - component: {fileID: 7736364748447018736}
- component: {fileID: 3174322665456641310} - component: {fileID: 3174322665456641310}
- component: {fileID: 8228429523814113897} - component: {fileID: -8015309000698621888}
m_Layer: 0 m_Layer: 0
m_Name: GameManager m_Name: GameManager
m_TagString: Untagged m_TagString: Untagged
...@@ -63,7 +63,7 @@ MonoBehaviour: ...@@ -63,7 +63,7 @@ MonoBehaviour:
- {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0}
--- !u!114 &8228429523814113897 --- !u!114 &-8015309000698621888
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
......
Videojuegos_Proyecto/Assets/Scenes/MenuExtras.unity
...@@ -990,7 +990,8 @@ PrefabInstance: ...@@ -990,7 +990,8 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents:
- {fileID: 0}
m_SourcePrefab: {fileID: 100100000, guid: c299a511f2a249142ac36667ddcf3b49, type: 3} m_SourcePrefab: {fileID: 100100000, guid: c299a511f2a249142ac36667ddcf3b49, type: 3}
--- !u!114 &804031676 stripped --- !u!114 &804031676 stripped
MonoBehaviour: MonoBehaviour:
...@@ -1082,6 +1083,7 @@ GameObject: ...@@ -1082,6 +1083,7 @@ GameObject:
- component: {fileID: 951091444} - component: {fileID: 951091444}
- component: {fileID: 951091443} - component: {fileID: 951091443}
- component: {fileID: 951091442} - component: {fileID: 951091442}
- component: {fileID: 951091445}
m_Layer: 5 m_Layer: 5
m_Name: ButtonBack m_Name: ButtonBack
m_TagString: Untagged m_TagString: Untagged
...@@ -1152,6 +1154,17 @@ MonoBehaviour: ...@@ -1152,6 +1154,17 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 951091445}
m_MethodName: ContinuarMusica
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_Target: {fileID: 423268877} - m_Target: {fileID: 423268877}
m_MethodName: VolverAlMenuAnterior m_MethodName: VolverAlMenuAnterior
m_Mode: 1 m_Mode: 1
...@@ -1202,6 +1215,18 @@ CanvasRenderer: ...@@ -1202,6 +1215,18 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 951091440} m_GameObject: {fileID: 951091440}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!114 &951091445
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 951091440}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30ae3737221aad74781a5782c57dcb2a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1024443105 --- !u!1 &1024443105
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1276,6 +1301,75 @@ CanvasRenderer: ...@@ -1276,6 +1301,75 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1024443105} m_GameObject: {fileID: 1024443105}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1001 &1059197209
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2114081506731414285, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_Name
value: Musica
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalPosition.x
value: -2.8107114
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.2284359
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalPosition.z
value: -161.03223
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8e30a5e6158f5374184178db3778780b, type: 3}
--- !u!1 &1244365442 --- !u!1 &1244365442
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1288,8 +1382,9 @@ GameObject: ...@@ -1288,8 +1382,9 @@ GameObject:
- component: {fileID: 1244365445} - component: {fileID: 1244365445}
- component: {fileID: 1244365444} - component: {fileID: 1244365444}
- component: {fileID: 1244365443} - component: {fileID: 1244365443}
- component: {fileID: 1244365447}
m_Layer: 5 m_Layer: 5
m_Name: Button m_Name: Reproducir
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
...@@ -1338,6 +1433,17 @@ MonoBehaviour: ...@@ -1338,6 +1433,17 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: m_Calls:
- m_Target: {fileID: 1244365447}
m_MethodName: PararMusica
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 1
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 423268877} - m_Target: {fileID: 423268877}
m_MethodName: ReproducirCancion m_MethodName: ReproducirCancion
m_Mode: 3 m_Mode: 3
...@@ -1408,6 +1514,18 @@ RectTransform: ...@@ -1408,6 +1514,18 @@ RectTransform:
m_AnchoredPosition: {x: 325, y: -31} m_AnchoredPosition: {x: 325, y: -31}
m_SizeDelta: {x: 331.95, y: 69.3} m_SizeDelta: {x: 331.95, y: 69.3}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1244365447
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1244365442}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30ae3737221aad74781a5782c57dcb2a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1316768763 --- !u!1 &1316768763
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
Videojuegos_Proyecto/Assets/Scenes/MenuInicial.unity
...@@ -348,7 +348,7 @@ PrefabInstance: ...@@ -348,7 +348,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: m_audioClip propertyPath: m_audioClip
value: value:
objectReference: {fileID: 0} objectReference: {fileID: 8300000, guid: fe3f44e0bbc4be943802896e36ceaec1, type: 3}
- target: {fileID: 2114081506731414284, guid: 8e30a5e6158f5374184178db3778780b, - target: {fileID: 2114081506731414284, guid: 8e30a5e6158f5374184178db3778780b,
type: 3} type: 3}
propertyPath: Loop propertyPath: Loop
......
Videojuegos_Proyecto/Assets/Scenes/SeleccionNivel.unity
...@@ -483,7 +483,8 @@ PrefabInstance: ...@@ -483,7 +483,8 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents:
- {fileID: 8228429523814113897, guid: c299a511f2a249142ac36667ddcf3b49, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: c299a511f2a249142ac36667ddcf3b49, type: 3} m_SourcePrefab: {fileID: 100100000, guid: c299a511f2a249142ac36667ddcf3b49, type: 3}
--- !u!114 &512889790 stripped --- !u!114 &512889790 stripped
MonoBehaviour: MonoBehaviour:
...@@ -491,7 +492,7 @@ MonoBehaviour: ...@@ -491,7 +492,7 @@ MonoBehaviour:
type: 3} type: 3}
m_PrefabInstance: {fileID: 512889789} m_PrefabInstance: {fileID: 512889789}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0} m_GameObject: {fileID: 1877790790}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 94ed2c62992ea584eb669871b1668a3c, type: 3} m_Script: {fileID: 11500000, guid: 94ed2c62992ea584eb669871b1668a3c, type: 3}
...@@ -1344,6 +1345,24 @@ CanvasRenderer: ...@@ -1344,6 +1345,24 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1756978295} m_GameObject: {fileID: 1756978295}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1 &1877790790 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7736364748447018738, guid: c299a511f2a249142ac36667ddcf3b49,
type: 3}
m_PrefabInstance: {fileID: 512889789}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1877790791
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1877790790}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 379826b7faee1344895a77dab75ab357, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1958144520 --- !u!1 &1958144520
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
Videojuegos_Proyecto/Assets/CambioCancion.cs → Videojuegos_Proyecto/Assets/Scripts/CambioCancion.cs
...@@ -7,19 +7,20 @@ public class CambioCancion : MonoBehaviour ...@@ -7,19 +7,20 @@ public class CambioCancion : MonoBehaviour
{ {
private void Awake() private void Awake()
{ {
}
// Start is called before the first frame update
void Start()
{
if (SceneManager.GetActiveScene().name == "SampleScene") if (SceneManager.GetActiveScene().name == "SampleScene")
{ {
Musica.CancionNivel1(); Musica.CancionNivel1();
}else if(SceneManager.GetActiveScene().name == "SampleScene") }
else if (SceneManager.GetActiveScene().name == "SampleScene")
{ {
Musica.CancionMenuInicial(); Musica.CancionMenuInicial();
} }
} }
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame // Update is called once per frame
void Update() void Update()
......
Videojuegos_Proyecto/Assets/Scripts/Musica.cs
...@@ -8,6 +8,7 @@ public class Musica : MonoBehaviour ...@@ -8,6 +8,7 @@ public class Musica : MonoBehaviour
{ {
//https://answers.unity.com/questions/1041174/help-playing-audio-depending-on-scene.html //https://answers.unity.com/questions/1041174/help-playing-audio-depending-on-scene.html
//https://www.youtube.com/watch?v=3mK5dD9XH_U //https://www.youtube.com/watch?v=3mK5dD9XH_U
public static Musica musica; public static Musica musica;
private void Awake() private void Awake()
...@@ -18,7 +19,8 @@ public class Musica : MonoBehaviour ...@@ -18,7 +19,8 @@ public class Musica : MonoBehaviour
{ {
musica = this; musica = this;
DontDestroyOnLoad(gameObject); DontDestroyOnLoad(gameObject);
}else if (musica != null) }
else if (musica != null)
{ {
Destroy(gameObject); Destroy(gameObject);
} }
...@@ -28,10 +30,7 @@ public class Musica : MonoBehaviour ...@@ -28,10 +30,7 @@ public class Musica : MonoBehaviour
if (SceneManager.GetActiveScene().name == "MenuInicial") if (SceneManager.GetActiveScene().name == "MenuInicial")
{ {
Debug.Log("si"); CancionMenuInicial();
audio.clip = Resources.Load("Musica/Juego/MusicTales_MenuInicial") as AudioClip;
Debug.Log(audio.clip.name);
audio.Play();
} }
else if (SceneManager.GetActiveScene().name == "SampleScene") else if (SceneManager.GetActiveScene().name == "SampleScene")
{ {
...@@ -39,26 +38,25 @@ public class Musica : MonoBehaviour ...@@ -39,26 +38,25 @@ public class Musica : MonoBehaviour
audio.Play(); audio.Play();
} }
} }
// 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
void Update() void Update()
{ {
} }
//Declaramos como estático para poder llamar desde otros scripts. //Declaramos como estático para poder llamar desde otros scripts.
public static void CancionNivel1() public static void CancionNivel1()
{ {
//Cambiamos el audio y ajustamos el volumen. //Cambiamos el audio y ajustamos el volumen.
AudioSource audio = musica.GetComponent<AudioSource>(); AudioSource audio = musica.GetComponent<AudioSource>();
audio.clip = Resources.Load("Musica/Juego/MusicTales_Nivel1") as AudioClip; audio.clip = Resources.Load("Musica/Juego/MusicTales_Nivel1") as AudioClip;
audio.volume = 0.2f; audio.volume = 0.2f;
...@@ -68,14 +66,34 @@ public class Musica : MonoBehaviour ...@@ -68,14 +66,34 @@ public class Musica : MonoBehaviour
public static void CancionMenuInicial() public static void CancionMenuInicial()
{ {
//Cambiamos el audio y ajustamos el volumen. //Cambiamos el audio y ajustamos el volumen.
AudioSource audio = musica.GetComponent<AudioSource>(); AudioSource audio = musica.GetComponent<AudioSource>();
audio.clip = Resources.Load("Musica/Juego/MusicTales_MenuInicial") as AudioClip; if (!audio.clip.name.Equals("MusicTales_MenuInicial"))
audio.volume = 0.2f; {
audio.clip = Resources.Load("Musica/Juego/MusicTales_MenuInicial") as AudioClip;
audio.volume = 1;
audio.Play(); audio.Play();
}
} }
public static void Parar()
{
//Cambiamos el audio y ajustamos el volumen.
AudioSource audio = musica.GetComponent<AudioSource>();
audio.Pause();
}
public static void Reproducir()
{
//Cambiamos el audio y ajustamos el volumen.
AudioSource audio = musica.GetComponent<AudioSource>();
audio.UnPause();
}
} }
Videojuegos_Proyecto/Assets/Scripts/ReproducirExtra.cs 0 → 100644
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class ReproducirExtra : MonoBehaviour
{
private Button reproducir;
private Button volver;
void Start()
{
reproducir = GameObject.Find("Reproducir").GetComponent<Button>();
reproducir.onClick.AddListener(PararMusica);
reproducir = GameObject.Find("ButtonBack").GetComponent<Button>();
reproducir.onClick.AddListener(ContinuarMusica);
}
public void PararMusica()
{
Musica.Parar();
}
public void ContinuarMusica()
{
Musica.Reproducir();
}
}
Videojuegos_Proyecto/Assets/Scripts/ReproducirExtra.cs.meta 0 → 100644
fileFormatVersion: 2
guid: 30ae3737221aad74781a5782c57dcb2a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Library/CurrentLayout.dwlt
...@@ -16,12 +16,12 @@ MonoBehaviour: ...@@ -16,12 +16,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 43 y: 43
width: 1920 width: 1366
height: 997 height: 685
m_ShowMode: 4 m_ShowMode: 4
m_Title: m_Title:
m_RootView: {fileID: 6} m_RootView: {fileID: 6}
m_MinSize: {x: 950, y: 394} m_MinSize: {x: 950, y: 300}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &2 --- !u!114 &2
MonoBehaviour: MonoBehaviour:
...@@ -42,12 +42,12 @@ MonoBehaviour: ...@@ -42,12 +42,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 30 y: 30
width: 1920 width: 1366
height: 947 height: 635
m_MinSize: {x: 683, y: 344} m_MinSize: {x: 683, y: 494}
m_MaxSize: {x: 12008, y: 8044} m_MaxSize: {x: 14004, y: 14044}
vertical: 0 vertical: 0
controlID: 53 controlID: 37
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -63,10 +63,10 @@ MonoBehaviour: ...@@ -63,10 +63,10 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 1616 x: 1089
y: 0 y: 0
width: 304 width: 277
height: 947 height: 635
m_MinSize: {x: 277, y: 72} m_MinSize: {x: 277, y: 72}
m_MaxSize: {x: 4002, y: 4022} m_MaxSize: {x: 4002, y: 4022}
m_ActualView: {fileID: 14} m_ActualView: {fileID: 14}
...@@ -91,10 +91,10 @@ MonoBehaviour: ...@@ -91,10 +91,10 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 215 width: 202
height: 675 height: 363
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: 15}
m_Panes: m_Panes:
- {fileID: 15} - {fileID: 15}
...@@ -116,18 +116,18 @@ MonoBehaviour: ...@@ -116,18 +116,18 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 675 y: 363
width: 1616 width: 1089
height: 272 height: 272
m_MinSize: {x: 100, y: 100} m_MinSize: {x: 232, y: 272}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 10002, y: 10022}
m_ActualView: {fileID: 18} m_ActualView: {fileID: 13}
m_Panes: m_Panes:
- {fileID: 13} - {fileID: 13}
- {fileID: 18} - {fileID: 18}
- {fileID: 12} - {fileID: 12}
m_Selected: 1 m_Selected: 0
m_LastSelected: 0 m_LastSelected: 1
--- !u!114 &6 --- !u!114 &6
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -148,8 +148,8 @@ MonoBehaviour: ...@@ -148,8 +148,8 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1920 width: 1366
height: 997 height: 685
m_MinSize: {x: 950, y: 300} m_MinSize: {x: 950, y: 300}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &7 --- !u!114 &7
...@@ -169,7 +169,7 @@ MonoBehaviour: ...@@ -169,7 +169,7 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1920 width: 1366
height: 30 height: 30
m_MinSize: {x: 0, y: 0} m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0}
...@@ -190,8 +190,8 @@ MonoBehaviour: ...@@ -190,8 +190,8 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 977 y: 665
width: 1920 width: 1366
height: 20 height: 20
m_MinSize: {x: 0, y: 0} m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0}
...@@ -214,12 +214,12 @@ MonoBehaviour: ...@@ -214,12 +214,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1616 width: 1089
height: 947 height: 635
m_MinSize: {x: 406, y: 344} m_MinSize: {x: 406, y: 494}
m_MaxSize: {x: 8006, y: 8044} 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
...@@ -239,12 +239,12 @@ MonoBehaviour: ...@@ -239,12 +239,12 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 0 y: 0
width: 1616 width: 1089
height: 675 height: 363
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
...@@ -260,10 +260,10 @@ MonoBehaviour: ...@@ -260,10 +260,10 @@ MonoBehaviour:
m_Children: [] m_Children: []
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 215 x: 202
y: 0 y: 0
width: 1401 width: 887
height: 675 height: 363
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}
...@@ -300,7 +300,7 @@ MonoBehaviour: ...@@ -300,7 +300,7 @@ MonoBehaviour:
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_LastSelectedObjectID: -51572 m_LastSelectedObjectID: -8524
--- !u!114 &13 --- !u!114 &13
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -323,8 +323,8 @@ MonoBehaviour: ...@@ -323,8 +323,8 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 748 y: 436
width: 1616 width: 1089
height: 253 height: 253
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_SearchFilter: m_SearchFilter:
...@@ -345,14 +345,14 @@ MonoBehaviour: ...@@ -345,14 +345,14 @@ MonoBehaviour:
m_LastFolders: m_LastFolders:
- Assets/Scenes - Assets/Scenes
m_LastFoldersGridSize: -1 m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\Colme\Documents\UnityProjects\ProyectoVideojuegos\Videojuegos_Proyecto m_LastProjectPath: C:\Users\alvmo\Documents\NetBeansProjects\DesarrolloDeVideojuegos_Proyecto\Videojuegos_Proyecto
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 79} scrollPos: {x: 0, y: 23}
m_SelectedIDs: 962d0000 m_SelectedIDs: 682b0000
m_LastClickedID: 11670 m_LastClickedID: 11112
m_ExpandedIDs: 00000000b22c0000123600004036000000ca9a3b m_ExpandedIDs: 00000000842a0000ec33000000ca9a3b
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: 00000000b22c000012360000 m_ExpandedIDs: 00000000842a0000ec330000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -405,8 +405,8 @@ MonoBehaviour: ...@@ -405,8 +405,8 @@ MonoBehaviour:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_ResourceFile: m_ResourceFile:
m_ListAreaState: m_ListAreaState:
m_SelectedInstanceIDs: 5a350000 m_SelectedInstanceIDs:
m_LastClickedInstanceID: 13658 m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1 m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000a83200001c2c0000462b00004afc0000a23500000000000010d50200 m_ExpandedInstanceIDs: c6230000a83200001c2c0000462b00004afc0000a23500000000000010d50200
m_RenameOverlay: m_RenameOverlay:
...@@ -456,10 +456,10 @@ MonoBehaviour: ...@@ -456,10 +456,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 1616 x: 1089
y: 73 y: 73
width: 302 width: 275
height: 928 height: 616
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_OpenAddComponentMenu: 0 m_OpenAddComponentMenu: 0
m_ObjectsLockedBeforeSerialization: [] m_ObjectsLockedBeforeSerialization: []
...@@ -494,29 +494,29 @@ MonoBehaviour: ...@@ -494,29 +494,29 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 73 y: 73
width: 215 width: 202
height: 656 height: 344
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}
m_SelectedIDs: 5a350000 m_SelectedIDs: 922a0000
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 2e1cfbffaa42fbffdabbfbff0abdfbfffcbefbffc4c0fbffcec1fbffe822fcff8c24fcffbae5fcff44e6fcffa245fdff24a6fdff8605fefff639fefffc66feff4e2affffd28effff80cbffff88f8ffff94f9ffff9640000010d30200 m_ExpandedIDs: 389cfeff729cfeffaa9cfeffdedcffffb6deffffaaefffffb6f0ffffe4f1ffffdcf2ffffe4faffff8cfbfffff4ffffff003e0000063e0000123e0000623e0000ec450000f2450000fe450000524600007a490000804900008c490000de490000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: DisparoCorchea0 m_Name:
m_OriginalName: DisparoCorchea0 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: -310622 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:
...@@ -547,10 +547,10 @@ MonoBehaviour: ...@@ -547,10 +547,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 215 x: 202
y: 73 y: 73
width: 1399 width: 885
height: 656 height: 344
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_ShowContextualTools: 0 m_ShowContextualTools: 0
m_WindowGUID: de700f5d540e3c347973605f7564e740 m_WindowGUID: de700f5d540e3c347973605f7564e740
...@@ -562,9 +562,9 @@ MonoBehaviour: ...@@ -562,9 +562,9 @@ MonoBehaviour:
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
m_Target: {x: 3.3280542, y: -0.71493274, z: -0.2722045} m_Target: {x: -3.4533415, y: 0.89867437, z: -0.96062917}
speed: 2 speed: 2
m_Value: {x: 3.3280542, y: -0.71493274, z: -0.2722045} m_Value: {x: -3.4533415, y: 0.89867437, z: -0.96062917}
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
...@@ -597,9 +597,9 @@ MonoBehaviour: ...@@ -597,9 +597,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: 7.2679896 m_Target: 24.953445
speed: 2 speed: 2
m_Value: 7.2679896 m_Value: 24.953445
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
...@@ -645,10 +645,10 @@ MonoBehaviour: ...@@ -645,10 +645,10 @@ MonoBehaviour:
m_Tooltip: m_Tooltip:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 215 x: 202
y: 73 y: 73
width: 1399 width: 885
height: 656 height: 344
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_VSyncEnabled: 0 m_VSyncEnabled: 0
m_MaximizeOnPlay: 0 m_MaximizeOnPlay: 0
...@@ -661,10 +661,10 @@ MonoBehaviour: ...@@ -661,10 +661,10 @@ MonoBehaviour:
m_VRangeLocked: 0 m_VRangeLocked: 0
hZoomLockedByDefault: 0 hZoomLockedByDefault: 0
vZoomLockedByDefault: 0 vZoomLockedByDefault: 0
m_HBaseRangeMin: -699.5 m_HBaseRangeMin: -442.5
m_HBaseRangeMax: 699.5 m_HBaseRangeMax: 442.5
m_VBaseRangeMin: -319.5 m_VBaseRangeMin: -163.5
m_VBaseRangeMax: 319.5 m_VBaseRangeMax: 163.5
m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1 m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMin: 1
...@@ -682,25 +682,25 @@ MonoBehaviour: ...@@ -682,25 +682,25 @@ MonoBehaviour:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 17 y: 17
width: 1399 width: 885
height: 639 height: 327
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Translation: {x: 699.5, y: 319.5} m_Translation: {x: 442.5, y: 163.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: -699.5 x: -442.5
y: -319.5 y: -163.5
width: 1399 width: 885
height: 639 height: 327
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: 1399, y: 656} m_LastWindowPixelSize: {x: 885, y: 344}
m_ClearInEditMode: 1 m_ClearInEditMode: 1
m_NoCameraWarning: 1 m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000 m_LowResolutionForAspectRatios: 01000000000000000000
...@@ -727,7 +727,7 @@ MonoBehaviour: ...@@ -727,7 +727,7 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 748 y: 526
width: 1616 width: 1089
height: 253 height: 163
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
Videojuegos_Proyecto/Library/LastSceneManagerSetup.txt
sceneSetups: sceneSetups:
- path: Assets/Scenes/MenuInicial.unity - path: Assets/Scenes/MenuExtras.unity
isLoaded: 1 isLoaded: 1
isActive: 1 isActive: 1
isSubScene: 0 isSubScene: 0
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":3.328054189682007,"y":-0.7149327397346497,"z":-0.2722044885158539},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":7.267989635467529,"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":-3.453341484069824,"y":0.8986743688583374,"z":-0.9606291651725769},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":24.953445434570314,"orthographic":true}
\ No newline at end of file \ 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
Videojuegos_Proyecto/ProjectSettings/TagManager.asset
...@@ -18,6 +18,7 @@ TagManager: ...@@ -18,6 +18,7 @@ TagManager:
- HitBoxMelee - HitBoxMelee
- PlataformaMovil - PlataformaMovil
- Musica - Musica
- Reproducir
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