Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit d5e59bf9 by Juan Carlos
Options

Commit antes de merge

parents 1a3ecbc5 8726b94e
Expand all
Inline Side-by-side
Showing with 670 additions and 50 deletions
Videojuegos_Proyecto/Assets/MainMenu/Scripts/MainMenu.cs
...@@ -25,7 +25,7 @@ public class MainMenu : MonoBehaviour ...@@ -25,7 +25,7 @@ public class MainMenu : MonoBehaviour
} }
public void ExtrasScreen() { public void ExtrasScreen() {
//Cargar la escena de coleccionables SceneManager.LoadScene("MenuExtras");
} }
public void CreditsScene() { public void CreditsScene() {
......
Videojuegos_Proyecto/Assets/MainMenu/Scripts/MenuExtras.cs 0 → 100644
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using TMPro;
using UnityEngine.UI;
using UnityEngine.SceneManagement;
public class MenuExtras : MonoBehaviour
{
public GameObject AS;
public Coleccionables gameManager;
public TextMeshProUGUI textNivel1;
public TextMeshProUGUI textInfoNivel1;
public TextMeshProUGUI textNumColecNivel1;
public GameObject SitioImagenPartituraNivel1;
public Button botonReproducirNivel1;
// Start is called before the first frame update
void Start()
{
GuardarYCargar.Cargar(gameManager, "slotColeccionables");
Coleccionables.CargarDatos();
//Para el nivel 1
if (Coleccionables.cConseguidos[0] < Coleccionables.cTotales[0])
{
//Aun no se ha desbloqueado la partitura
textInfoNivel1.enabled = true;
textNumColecNivel1.enabled = true;
textNumColecNivel1.text = Coleccionables.cConseguidos[0] + "/" + Coleccionables.cTotales[0];
SitioImagenPartituraNivel1.SetActive(false);
botonReproducirNivel1.gameObject.SetActive(false);
}
else {
//Ya se ha desbloqueado la partitura
textInfoNivel1.enabled = false;
textNumColecNivel1.enabled = false;
SitioImagenPartituraNivel1.SetActive(true);
botonReproducirNivel1.enabled = true;
}
}
// Update is called once per frame
void Update()
{
}
public void VolverAlMenuAnterior()
{
SceneManager.LoadScene("MenuInicial");
}
public void ReproducirCancion(int nivel) {
if (nivel == 1) {
AS.GetComponent<AudioSource>().Play();
}
}
}
Videojuegos_Proyecto/Assets/MainMenu/Scripts/MenuExtras.cs.meta 0 → 100644
fileFormatVersion: 2
guid: 6b1c1533ea3dfd84391a2e746dda07f2
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Music.meta 0 → 100644
fileFormatVersion: 2
guid: 340bc2dd96a3a13408f02ea9d9f6a36b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Music/MusicTales_MenuInicial.wav 0 → 100644
The file could not be displayed because it is too large.
Videojuegos_Proyecto/Assets/Music/MusicTales_MenuInicial.wav.meta 0 → 100644
fileFormatVersion: 2
guid: fe3f44e0bbc4be943802896e36ceaec1
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/Assets/Prefabs/GameManager.prefab
...@@ -74,4 +74,4 @@ MonoBehaviour: ...@@ -74,4 +74,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1907c97001aad5943a7c511192d2d99c, type: 3} m_Script: {fileID: 11500000, guid: 1907c97001aad5943a7c511192d2d99c, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
enemigo: {fileID: 0} enemigo: {fileID: 3326548381514800793, guid: 4cad856fb8f87054e8cb7d66b4d1e74e, type: 3}
Videojuegos_Proyecto/Assets/Prefabs/Musica.prefab 0 → 100644
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2114081506731414285
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2114081506731414287}
- component: {fileID: 2114081506731414284}
- component: {fileID: -3729884049664289227}
m_Layer: 0
m_Name: Musica
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2114081506731414287
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2114081506731414285}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2.8107114, y: -1.2284359, z: -161.03223}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &2114081506731414284
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2114081506731414285}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: fe3f44e0bbc4be943802896e36ceaec1, type: 3}
m_PlayOnAwake: 1
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!114 &-3729884049664289227
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2114081506731414285}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bc252f7a1dcca424d99046696f2f5335, type: 3}
m_Name:
m_EditorClassIdentifier:
Videojuegos_Proyecto/Assets/Prefabs/Musica.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: 8e30a5e6158f5374184178db3778780b
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Scenes/MenuExtras.unity.meta 0 → 100644
fileFormatVersion: 2
guid: 3dfab5202609ad94c944cde7669b8bd2
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Scenes/MenuInicial.unity
...@@ -277,6 +277,75 @@ CanvasRenderer: ...@@ -277,6 +277,75 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 20336598} m_GameObject: {fileID: 20336598}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1001 &380371351
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: 3
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 &395722973 --- !u!1 &395722973
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1385,7 +1454,18 @@ MonoBehaviour: ...@@ -1385,7 +1454,18 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1521503615} m_TargetGraphic: {fileID: 1521503615}
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls:
- m_Target: {fileID: 572894596}
m_MethodName: ExtrasScreen
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 &1521503615 --- !u!114 &1521503615
......
Videojuegos_Proyecto/Assets/Scenes/SampleScene.unity
...@@ -619,7 +619,7 @@ PrefabInstance: ...@@ -619,7 +619,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}
...@@ -693,7 +693,7 @@ PrefabInstance: ...@@ -693,7 +693,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}
...@@ -836,7 +836,7 @@ PrefabInstance: ...@@ -836,7 +836,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}
...@@ -1485,7 +1485,7 @@ PrefabInstance: ...@@ -1485,7 +1485,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}
...@@ -1730,7 +1730,7 @@ PrefabInstance: ...@@ -1730,7 +1730,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}
...@@ -1949,7 +1949,7 @@ Transform: ...@@ -1949,7 +1949,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!1 &859690734 --- !u!1 &859690734
GameObject: GameObject:
...@@ -2164,6 +2164,75 @@ PrefabInstance: ...@@ -2164,6 +2164,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,
...@@ -3271,7 +3340,7 @@ Transform: ...@@ -3271,7 +3340,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:
...@@ -4145,7 +4214,7 @@ RectTransform: ...@@ -4145,7 +4214,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}
...@@ -4961,10 +5030,18 @@ RectTransform: ...@@ -4961,10 +5030,18 @@ RectTransform:
m_GameObject: {fileID: 1879684539} m_GameObject: {fileID: 1879684539}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
<<<<<<< HEAD
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1648845514} m_Father: {fileID: 1648845514}
m_RootOrder: 0 m_RootOrder: 0
=======
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1891953901}
m_Father: {fileID: 0}
m_RootOrder: 12
>>>>>>> origin/Release
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: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
...@@ -6021,7 +6098,7 @@ PrefabInstance: ...@@ -6021,7 +6098,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}
...@@ -6169,7 +6246,7 @@ PrefabInstance: ...@@ -6169,7 +6246,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}
...@@ -6238,7 +6315,7 @@ PrefabInstance: ...@@ -6238,7 +6315,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}
...@@ -6413,7 +6490,7 @@ PrefabInstance: ...@@ -6413,7 +6490,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}
...@@ -6581,7 +6658,7 @@ PrefabInstance: ...@@ -6581,7 +6658,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}
...@@ -6731,7 +6808,7 @@ PrefabInstance: ...@@ -6731,7 +6808,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/Scenes/SeleccionNivel.unity
...@@ -629,6 +629,75 @@ CanvasRenderer: ...@@ -629,6 +629,75 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 687002374} m_GameObject: {fileID: 687002374}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1001 &779997739
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 &868349782 --- !u!1 &868349782
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
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/Scripts/Musica.cs 0 → 100644
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Musica : MonoBehaviour
{
public static Musica musica;
private void Awake()
{
if (musica == null)
{
musica = this;
DontDestroyOnLoad(gameObject);
}else if (musica != null)
{
Destroy(gameObject);
}
}
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}
Videojuegos_Proyecto/Assets/Scripts/Musica.cs.meta 0 → 100644
fileFormatVersion: 2
guid: bc252f7a1dcca424d99046696f2f5335
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
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
...@@ -44,10 +44,17 @@ MonoBehaviour: ...@@ -44,10 +44,17 @@ MonoBehaviour:
y: 30 y: 30
width: 1920 width: 1920
height: 947 height: 947
<<<<<<< HEAD
m_MinSize: {x: 681, y: 494} m_MinSize: {x: 681, y: 494}
m_MaxSize: {x: 14004, y: 14044} m_MaxSize: {x: 14004, y: 14044}
vertical: 0 vertical: 0
controlID: 116 controlID: 116
=======
m_MinSize: {x: 683, y: 494}
m_MaxSize: {x: 14004, y: 14044}
vertical: 0
controlID: 31
>>>>>>> origin/Release
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -92,7 +99,7 @@ MonoBehaviour: ...@@ -92,7 +99,7 @@ MonoBehaviour:
x: 0 x: 0
y: 0 y: 0
width: 379 width: 379
height: 573 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}
m_ActualView: {fileID: 15} m_ActualView: {fileID: 15}
...@@ -116,9 +123,9 @@ MonoBehaviour: ...@@ -116,9 +123,9 @@ MonoBehaviour:
m_Position: m_Position:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 573 y: 605
width: 1531 width: 1531
height: 374 height: 342
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}
...@@ -218,7 +225,11 @@ MonoBehaviour: ...@@ -218,7 +225,11 @@ MonoBehaviour:
m_MinSize: {x: 404, y: 494} m_MinSize: {x: 404, y: 494}
m_MaxSize: {x: 10002, y: 14044} m_MaxSize: {x: 10002, y: 14044}
vertical: 1 vertical: 1
<<<<<<< HEAD
controlID: 117 controlID: 117
=======
controlID: 32
>>>>>>> origin/Release
--- !u!114 &10 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -239,11 +250,19 @@ MonoBehaviour: ...@@ -239,11 +250,19 @@ MonoBehaviour:
x: 0 x: 0
y: 0 y: 0
width: 1531 width: 1531
<<<<<<< HEAD
height: 573 height: 573
m_MinSize: {x: 404, y: 222} m_MinSize: {x: 404, y: 222}
m_MaxSize: {x: 8004, y: 4022} m_MaxSize: {x: 8004, y: 4022}
vertical: 0 vertical: 0
controlID: 118 controlID: 118
=======
height: 605
m_MinSize: {x: 406, y: 222}
m_MaxSize: {x: 8006, y: 4022}
vertical: 0
controlID: 33
>>>>>>> origin/Release
--- !u!114 &11 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -262,7 +281,7 @@ MonoBehaviour: ...@@ -262,7 +281,7 @@ MonoBehaviour:
x: 379 x: 379
y: 0 y: 0
width: 1152 width: 1152
height: 573 height: 605
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}
...@@ -320,9 +339,9 @@ MonoBehaviour: ...@@ -320,9 +339,9 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 646 y: 678
width: 1531 width: 1531
height: 355 height: 323
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_SearchFilter: m_SearchFilter:
m_NameFilter: m_NameFilter:
...@@ -336,20 +355,34 @@ MonoBehaviour: ...@@ -336,20 +355,34 @@ MonoBehaviour:
m_ShowAllHits: 0 m_ShowAllHits: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
<<<<<<< HEAD
- Assets/MainMenu/Scripts - Assets/MainMenu/Scripts
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: m_LastFolders:
- Assets/MainMenu/Scripts - Assets/MainMenu/Scripts
=======
- Assets
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets
>>>>>>> origin/Release
m_LastFoldersGridSize: -1 m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\JC\Desktop\DesarrolloDeVideojuegos_Proyecto\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}
<<<<<<< HEAD
m_SelectedIDs: c2340000 m_SelectedIDs: c2340000
m_LastClickedID: 13506 m_LastClickedID: 13506
m_ExpandedIDs: 000000003a2a0000503200000833000000ca9a3b m_ExpandedIDs: 000000003a2a0000503200000833000000ca9a3b
=======
m_SelectedIDs: f62a0000
m_LastClickedID: 10998
m_ExpandedIDs: 00000000f62a00002234000000ca9a3b
>>>>>>> origin/Release
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -377,7 +410,11 @@ MonoBehaviour: ...@@ -377,7 +410,11 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
<<<<<<< HEAD
m_ExpandedIDs: 000000003a2a0000083300009a330000 m_ExpandedIDs: 000000003a2a0000083300009a330000
=======
m_ExpandedIDs: 00000000f62a0000023300002234000026340000
>>>>>>> origin/Release
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -405,7 +442,11 @@ MonoBehaviour: ...@@ -405,7 +442,11 @@ MonoBehaviour:
m_SelectedInstanceIDs: m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0 m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1 m_HadKeyboardFocusLastEvent: 1
<<<<<<< HEAD
m_ExpandedInstanceIDs: c6230000382b000000000000982a0000 m_ExpandedInstanceIDs: c6230000382b000000000000982a0000
=======
m_ExpandedInstanceIDs: c62300009a350000
>>>>>>> origin/Release
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -431,7 +472,7 @@ MonoBehaviour: ...@@ -431,7 +472,7 @@ MonoBehaviour:
m_NewAssetIndexInList: -1 m_NewAssetIndexInList: -1
m_ScrollPosition: {x: 0, y: 0} m_ScrollPosition: {x: 0, y: 0}
m_GridSize: 64 m_GridSize: 64
m_DirectoriesAreaWidth: 222 m_DirectoriesAreaWidth: 186
--- !u!114 &14 --- !u!114 &14
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -492,28 +533,32 @@ MonoBehaviour: ...@@ -492,28 +533,32 @@ MonoBehaviour:
x: 0 x: 0
y: 73 y: 73
width: 379 width: 379
height: 554 height: 586
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: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
<<<<<<< HEAD
m_ExpandedIDs: 38ddffff04deffff74fbffff6a3d0000aa3d0000526a00007a6a0000 m_ExpandedIDs: 38ddffff04deffff74fbffff6a3d0000aa3d0000526a00007a6a0000
=======
m_ExpandedIDs: a4c9ffffaad2ffff50d3ffff38faffffea4f0000ee4f0000fa4f0000385000004a500000
>>>>>>> origin/Release
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:
...@@ -522,7 +567,7 @@ MonoBehaviour: ...@@ -522,7 +567,7 @@ MonoBehaviour:
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_CurrentSortingName: TransformSorting m_CurrentSortingName: TransformSorting
m_WindowGUID: cf3b61c3a385de7479efe14818e50265 m_WindowGUID: e4f845058af2fed45a9fd11aeb1bc7f9
--- !u!114 &16 --- !u!114 &16
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -547,10 +592,10 @@ MonoBehaviour: ...@@ -547,10 +592,10 @@ MonoBehaviour:
x: 379 x: 379
y: 73 y: 73
width: 1150 width: 1150
height: 554 height: 586
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_ShowContextualTools: 0 m_ShowContextualTools: 0
m_WindowGUID: 4ba86f2f34ca3b44b989fe737b3c2e65 m_WindowGUID: 43dad88c062228f459455f7a9fa529fd
m_Gizmos: 1 m_Gizmos: 1
m_SceneIsLit: 1 m_SceneIsLit: 1
m_SceneLighting: 1 m_SceneLighting: 1
...@@ -559,9 +604,15 @@ MonoBehaviour: ...@@ -559,9 +604,15 @@ MonoBehaviour:
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
<<<<<<< HEAD
m_Target: {x: 23.56093, y: 0.9978786, z: -1191.5251} m_Target: {x: 23.56093, y: 0.9978786, z: -1191.5251}
speed: 2 speed: 2
m_Value: {x: 23.367008, y: 0.9777405, z: -1191.4423} m_Value: {x: 23.367008, y: 0.9777405, z: -1191.4423}
=======
m_Target: {x: 561.2166, y: 345.9716, z: -107.875}
speed: 2
m_Value: {x: 561.2166, y: 345.9716, z: -107.875}
>>>>>>> origin/Release
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
...@@ -594,9 +645,15 @@ MonoBehaviour: ...@@ -594,9 +645,15 @@ 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: 19.232332 m_Target: 19.232332
speed: 2 speed: 2
m_Value: 18.404146 m_Value: 18.404146
=======
m_Target: 768.7896
speed: 2
m_Value: 768.7896
>>>>>>> origin/Release
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
...@@ -645,7 +702,7 @@ MonoBehaviour: ...@@ -645,7 +702,7 @@ MonoBehaviour:
x: 379 x: 379
y: 73 y: 73
width: 1150 width: 1150
height: 554 height: 586
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_VSyncEnabled: 0 m_VSyncEnabled: 0
m_MaximizeOnPlay: 0 m_MaximizeOnPlay: 0
...@@ -660,8 +717,8 @@ MonoBehaviour: ...@@ -660,8 +717,8 @@ MonoBehaviour:
vZoomLockedByDefault: 0 vZoomLockedByDefault: 0
m_HBaseRangeMin: -575 m_HBaseRangeMin: -575
m_HBaseRangeMax: 575 m_HBaseRangeMax: 575
m_VBaseRangeMin: -268.5 m_VBaseRangeMin: -284.5
m_VBaseRangeMax: 268.5 m_VBaseRangeMax: 284.5
m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1 m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMin: 1
...@@ -680,9 +737,9 @@ MonoBehaviour: ...@@ -680,9 +737,9 @@ MonoBehaviour:
x: 0 x: 0
y: 17 y: 17
width: 1150 width: 1150
height: 537 height: 569
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Translation: {x: 575, y: 268.5} m_Translation: {x: 575, y: 284.5}
m_MarginLeft: 0 m_MarginLeft: 0
m_MarginRight: 0 m_MarginRight: 0
m_MarginTop: 0 m_MarginTop: 0
...@@ -690,14 +747,14 @@ MonoBehaviour: ...@@ -690,14 +747,14 @@ MonoBehaviour:
m_LastShownAreaInsideMargins: m_LastShownAreaInsideMargins:
serializedVersion: 2 serializedVersion: 2
x: -575 x: -575
y: -268.5 y: -284.5
width: 1150 width: 1150
height: 537 height: 569
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: 554} m_LastWindowPixelSize: {x: 1150, y: 586}
m_ClearInEditMode: 1 m_ClearInEditMode: 1
m_NoCameraWarning: 1 m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000 m_LowResolutionForAspectRatios: 01000000000000000000
...@@ -724,7 +781,7 @@ MonoBehaviour: ...@@ -724,7 +781,7 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 646 y: 678
width: 1531 width: 1531
height: 355 height: 323
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
Videojuegos_Proyecto/Library/LastSceneManagerSetup.txt
sceneSetups: sceneSetups:
- path: Assets/Scenes/SampleScene.unity - path: Assets/Scenes/MenuExtras.unity
isLoaded: 1 isLoaded: 1
isActive: 1 isActive: 1
isSubScene: 0 isSubScene: 0
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":18.764812469482423,"y":-2.7877025604248049,"z":-0.078125},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":21.010000228881837,"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/StateCache/SceneView/4ba86f-mainStage.json
<<<<<<< HEAD
{"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":23.560930252075197,"y":0.9978786110877991,"z":-1191.525146484375},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":19.232332229614259,"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":23.560930252075197,"y":0.9978786110877991,"z":-1191.525146484375},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":19.232332229614259,"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":17.94048309326172,"y":1.6945135593414307,"z":-163.5933074951172},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":31.49803352355957,"orthographic":true}
>>>>>>> origin/Release
Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe0.log
Base path: C:/Program Files/Unity/Editor/Data Base path: C:/Program Files/Unity/Hub/Editor/2019.1.11f1/Editor/Data
Cmd: initializeCompiler Cmd: initializeCompiler
Videojuegos_Proyecto/ProjectSettings/EditorBuildSettings.asset
...@@ -14,4 +14,7 @@ EditorBuildSettings: ...@@ -14,4 +14,7 @@ EditorBuildSettings:
- enabled: 1 - enabled: 1
path: Assets/Scenes/SampleScene.unity path: Assets/Scenes/SampleScene.unity
guid: 2cda990e2423bbf4892e6590ba056729 guid: 2cda990e2423bbf4892e6590ba056729
- enabled: 1
path: Assets/Scenes/MenuExtras.unity
guid: 3dfab5202609ad94c944cde7669b8bd2
m_configObjects: {} m_configObjects: {}
Videojuegos_Proyecto/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache
ffeba46d040eb84d2da74aeed6850bddc816cc90 9bb7645d24da14589dcb039782a424259830b31e
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