Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit 1e96615f by David Colmenero Chica
Options

Añadida la cancion

parent 862b0750
Inline Side-by-side
Showing with 244 additions and 53 deletions
Videojuegos_Proyecto/Assets/MainMenu/Scripts/MenuExtras.cs
...@@ -7,6 +7,8 @@ using UnityEngine.SceneManagement; ...@@ -7,6 +7,8 @@ using UnityEngine.SceneManagement;
public class MenuExtras : MonoBehaviour public class MenuExtras : MonoBehaviour
{ {
public GameObject AS;
public Coleccionables gameManager; public Coleccionables gameManager;
public TextMeshProUGUI textNivel1; public TextMeshProUGUI textNivel1;
...@@ -56,7 +58,11 @@ public class MenuExtras : MonoBehaviour ...@@ -56,7 +58,11 @@ public class MenuExtras : MonoBehaviour
SceneManager.LoadScene("MenuInicial"); SceneManager.LoadScene("MenuInicial");
} }
public void ReproducirCancion() { public void ReproducirCancion(int nivel) {
if (nivel == 1) {
AS.GetComponent<AudioSource>().Play();
}
} }
......
Videojuegos_Proyecto/Assets/Scenes/MenuExtras.unity
...@@ -212,6 +212,7 @@ GameObject: ...@@ -212,6 +212,7 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 178962359} - component: {fileID: 178962359}
- component: {fileID: 178962360}
m_Layer: 5 m_Layer: 5
m_Name: Extra nivel 1 m_Name: Extra nivel 1
m_TagString: Untagged m_TagString: Untagged
...@@ -239,6 +240,102 @@ RectTransform: ...@@ -239,6 +240,102 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!82 &178962360
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 178962358}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 446fa550884091d4fa3b6f010b11c93f, type: 3}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &423268876 --- !u!1 &423268876
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -271,6 +368,7 @@ MonoBehaviour: ...@@ -271,6 +368,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6b1c1533ea3dfd84391a2e746dda07f2, type: 3} m_Script: {fileID: 11500000, guid: 6b1c1533ea3dfd84391a2e746dda07f2, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
AS: {fileID: 178962358}
gameManager: {fileID: 804031676} gameManager: {fileID: 804031676}
textNivel1: {fileID: 790585237} textNivel1: {fileID: 790585237}
textInfoNivel1: {fileID: 1316768765} textInfoNivel1: {fileID: 1316768765}
...@@ -1242,11 +1340,11 @@ MonoBehaviour: ...@@ -1242,11 +1340,11 @@ MonoBehaviour:
m_Calls: m_Calls:
- m_Target: {fileID: 423268877} - m_Target: {fileID: 423268877}
m_MethodName: ReproducirCancion m_MethodName: ReproducirCancion
m_Mode: 1 m_Mode: 3
m_Arguments: m_Arguments:
m_ObjectArgument: {fileID: 0} m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0 m_IntArgument: 1
m_FloatArgument: 0 m_FloatArgument: 0
m_StringArgument: m_StringArgument:
m_BoolArgument: 0 m_BoolArgument: 0
......
Videojuegos_Proyecto/Assets/Scenes/SampleScene.unity
...@@ -462,7 +462,7 @@ PrefabInstance: ...@@ -462,7 +462,7 @@ PrefabInstance:
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 1 value: 2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
...@@ -536,7 +536,7 @@ PrefabInstance: ...@@ -536,7 +536,7 @@ PrefabInstance:
- target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e, - target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 14 value: 15
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e, - target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e,
type: 3} type: 3}
...@@ -679,7 +679,7 @@ PrefabInstance: ...@@ -679,7 +679,7 @@ PrefabInstance:
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 2 value: 3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
...@@ -1060,7 +1060,7 @@ PrefabInstance: ...@@ -1060,7 +1060,7 @@ PrefabInstance:
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 3 value: 4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
...@@ -1267,7 +1267,7 @@ PrefabInstance: ...@@ -1267,7 +1267,7 @@ PrefabInstance:
- target: {fileID: 9124563920809263083, guid: b1642f1f10f959a47b1be99970c634f0, - target: {fileID: 9124563920809263083, guid: b1642f1f10f959a47b1be99970c634f0,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 5 value: 6
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9124563920809263083, guid: b1642f1f10f959a47b1be99970c634f0, - target: {fileID: 9124563920809263083, guid: b1642f1f10f959a47b1be99970c634f0,
type: 3} type: 3}
...@@ -1486,7 +1486,7 @@ Transform: ...@@ -1486,7 +1486,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: 13 m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &893567866 stripped --- !u!114 &893567866 stripped
MonoBehaviour: MonoBehaviour:
...@@ -1569,6 +1569,75 @@ PrefabInstance: ...@@ -1569,6 +1569,75 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4a60d0ff4cd58a9409b0c9e6090f8691, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4a60d0ff4cd58a9409b0c9e6090f8691, type: 3}
--- !u!1001 &904399244
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5764835571609392104, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_Name
value: LimiteCaida (3)
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalPosition.x
value: -12.49
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalPosition.y
value: -5.9266033
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, type: 3}
--- !u!198 &907822432 stripped --- !u!198 &907822432 stripped
ParticleSystem: ParticleSystem:
m_CorrespondingSourceObject: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531, m_CorrespondingSourceObject: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
...@@ -2470,7 +2539,7 @@ Transform: ...@@ -2470,7 +2539,7 @@ Transform:
- {fileID: 1288388642} - {fileID: 1288388642}
- {fileID: 1793432113} - {fileID: 1793432113}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 7 m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1407215725 --- !u!1001 &1407215725
PrefabInstance: PrefabInstance:
...@@ -3113,7 +3182,7 @@ RectTransform: ...@@ -3113,7 +3182,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 1234913245} - {fileID: 1234913245}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 9 m_RootOrder: 10
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}
...@@ -3587,7 +3656,7 @@ RectTransform: ...@@ -3587,7 +3656,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 1891953901} - {fileID: 1891953901}
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}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
...@@ -4328,7 +4397,7 @@ PrefabInstance: ...@@ -4328,7 +4397,7 @@ PrefabInstance:
- target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181, - target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 10 value: 11
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181, - target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181,
type: 3} type: 3}
...@@ -4364,6 +4433,11 @@ PrefabInstance: ...@@ -4364,6 +4433,11 @@ PrefabInstance:
propertyPath: m_TagString propertyPath: m_TagString
value: PowerUpEffect value: PowerUpEffect
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8566976512845724115, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
propertyPath: playOnAwake
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2, - target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
...@@ -4419,11 +4493,6 @@ PrefabInstance: ...@@ -4419,11 +4493,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8566976512845724115, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
propertyPath: playOnAwake
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 72cf9991b7b52504aacba9be3a9b93f2, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 72cf9991b7b52504aacba9be3a9b93f2, type: 3}
--- !u!1001 &3974070068923422014 --- !u!1001 &3974070068923422014
...@@ -4476,7 +4545,7 @@ PrefabInstance: ...@@ -4476,7 +4545,7 @@ PrefabInstance:
- target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995, - target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 12 value: 13
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995, - target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
type: 3} type: 3}
...@@ -4545,7 +4614,7 @@ PrefabInstance: ...@@ -4545,7 +4614,7 @@ PrefabInstance:
- target: {fileID: 5415114670227481227, guid: 38c9ae1c49230e24a82e867ab13d6345, - target: {fileID: 5415114670227481227, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 4 value: 5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5415114670227481227, guid: 38c9ae1c49230e24a82e867ab13d6345, - target: {fileID: 5415114670227481227, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3} type: 3}
...@@ -4639,7 +4708,7 @@ PrefabInstance: ...@@ -4639,7 +4708,7 @@ PrefabInstance:
- target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a, - target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 8 value: 9
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a, - target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a,
type: 3} type: 3}
...@@ -4807,7 +4876,7 @@ PrefabInstance: ...@@ -4807,7 +4876,7 @@ PrefabInstance:
- target: {fileID: 5557318670751642272, guid: 1c5aa891e36cd44419d73b6cb11aa315, - target: {fileID: 5557318670751642272, guid: 1c5aa891e36cd44419d73b6cb11aa315,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 6 value: 7
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5557318670751642272, guid: 1c5aa891e36cd44419d73b6cb11aa315, - target: {fileID: 5557318670751642272, guid: 1c5aa891e36cd44419d73b6cb11aa315,
type: 3} type: 3}
...@@ -4957,7 +5026,7 @@ PrefabInstance: ...@@ -4957,7 +5026,7 @@ PrefabInstance:
- target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0, - target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 15 value: 16
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0, - target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
type: 3} type: 3}
......
Videojuegos_Proyecto/Assets/Scripts/Coleccionables.cs
...@@ -76,7 +76,7 @@ public class Coleccionables : MonoBehaviour ...@@ -76,7 +76,7 @@ public class Coleccionables : MonoBehaviour
private void Start() private void Start()
{ {
if (niActual == 0 && SceneManager.GetActiveScene().name != "SeleccionNivel") { if (niActual == 0 && SceneManager.GetActiveScene().name != "SeleccionNivel" && SceneManager.GetActiveScene().name != "MenuExtras") {
for (int i = 0; i < pColecNivel1.Length; i++) for (int i = 0; i < pColecNivel1.Length; i++)
{ {
if (pColecNivel1[i] != new Vector3(0, 0, 0)) if (pColecNivel1[i] != new Vector3(0, 0, 0))
......
Videojuegos_Proyecto/Assets/Scripts/CrearEnemigos.cs
...@@ -12,7 +12,7 @@ public class CrearEnemigos : MonoBehaviour ...@@ -12,7 +12,7 @@ public class CrearEnemigos : MonoBehaviour
void Start() void Start()
{ {
if (SceneManager.GetActiveScene().name != "SeleccionNivel") { if (SceneManager.GetActiveScene().name != "SeleccionNivel" && SceneManager.GetActiveScene().name != "MenuExtras") {
Instantiate(enemigo, new Vector3(13, -1.5f, 0), Quaternion.identity); Instantiate(enemigo, new Vector3(13, -1.5f, 0), Quaternion.identity);
//Instantiate(enemigo, new Vector3(20, 0.5f, 0), Quaternion.identity); //Instantiate(enemigo, new Vector3(20, 0.5f, 0), Quaternion.identity);
//Instantiate(enemigo, new Vector3(43, 0.5f, 0), Quaternion.identity); //Instantiate(enemigo, new Vector3(43, 0.5f, 0), Quaternion.identity);
......
Videojuegos_Proyecto/Assets/himno-a-la-alegria-instrumental.mp3.meta 0 → 100644
fileFormatVersion: 2
guid: 446fa550884091d4fa3b6f010b11c93f
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Library/CurrentLayout.dwlt
...@@ -21,7 +21,7 @@ MonoBehaviour: ...@@ -21,7 +21,7 @@ MonoBehaviour:
m_ShowMode: 4 m_ShowMode: 4
m_Title: m_Title:
m_RootView: {fileID: 6} m_RootView: {fileID: 6}
m_MinSize: {x: 950, y: 300} m_MinSize: {x: 950, y: 544}
m_MaxSize: {x: 10000, y: 10000} m_MaxSize: {x: 10000, y: 10000}
--- !u!114 &2 --- !u!114 &2
MonoBehaviour: MonoBehaviour:
...@@ -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: 53 controlID: 31
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -93,8 +93,8 @@ MonoBehaviour: ...@@ -93,8 +93,8 @@ MonoBehaviour:
y: 0 y: 0
width: 379 width: 379
height: 605 height: 605
m_MinSize: {x: 202, y: 222} m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4002, y: 4022} m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 15} m_ActualView: {fileID: 15}
m_Panes: m_Panes:
- {fileID: 15} - {fileID: 15}
...@@ -218,7 +218,7 @@ MonoBehaviour: ...@@ -218,7 +218,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: 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: 55 controlID: 33
--- !u!114 &11 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -336,20 +336,20 @@ MonoBehaviour: ...@@ -336,20 +336,20 @@ MonoBehaviour:
m_ShowAllHits: 0 m_ShowAllHits: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
- Assets/Sprites/ColeccionablesSprites/Resources - Assets
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: m_LastFolders:
- Assets/Sprites/ColeccionablesSprites/Resources - Assets
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: 17} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 9a330000 m_SelectedIDs: f62a0000
m_LastClickedID: 13210 m_LastClickedID: 10998
m_ExpandedIDs: 00000000a62a0000b6320000d4330000d833000000ca9a3b m_ExpandedIDs: 00000000f62a00002234000000ca9a3b
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: 00000000a62a0000b6320000d4330000d8330000 m_ExpandedIDs: 00000000f62a0000023300002234000026340000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -499,21 +499,21 @@ MonoBehaviour: ...@@ -499,21 +499,21 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 80b8ffff80c2ffff88ccffff94ceffff56f2ffff50fbffff003d0000043d0000103d0000563d0000ae4c0000d64c00002c5c0000305c00003c5c00008c5c0000 m_ExpandedIDs: a4c9ffffaad2ffff50d3ffff38faffffea4f0000ee4f0000fa4f0000385000004a500000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name: LimiteCaida (3)
m_OriginalName: m_OriginalName: LimiteCaida (3)
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: -13824
m_IsWaitingForDelay: 0 m_IsWaitingForDelay: 0
m_IsRenaming: 0 m_IsRenaming: 0
m_OriginalEventType: 11 m_OriginalEventType: 0
m_IsRenamingFilename: 0 m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 4} m_ClientGUIView: {fileID: 4}
m_SearchString: m_SearchString:
...@@ -559,9 +559,9 @@ MonoBehaviour: ...@@ -559,9 +559,9 @@ MonoBehaviour:
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
m_Target: {x: 612.8882, y: 306.9994, z: -48.75} m_Target: {x: 561.2166, y: 345.9716, z: -107.875}
speed: 2 speed: 2
m_Value: {x: 612.8882, y: 306.9994, z: -48.75} m_Value: {x: 561.2166, y: 345.9716, z: -107.875}
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
...@@ -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: 746.1416 m_Target: 768.7896
speed: 2 speed: 2
m_Value: 746.1416 m_Value: 768.7896
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
......
Videojuegos_Proyecto/Library/StateCache/SceneView/43dad8-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":612.88818359375,"y":306.9993896484375,"z":-48.75},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":746.1416015625,"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":561.2166137695313,"y":345.9715881347656,"z":-107.875},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":768.7896118164063,"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/Hub/Editor/2019.1.11f1/Editor/Data
Cmd: initializeCompiler Cmd: initializeCompiler
Cmd: compileSnippet
api=4 type=0 insize=1596 outsize=1638 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL 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=1596 outsize=5590 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL 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
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