Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit c290fa8d by David Colmenero Chica
Options

Ya solo queda que suene la cancion :D

parent c45580fa
Expand all
Inline Side-by-side
Showing with 63 additions and 23 deletions
Videojuegos_Proyecto/Assets/MainMenu/Scripts/MainMenu.cs
...@@ -24,7 +24,7 @@ public class MainMenu : MonoBehaviour ...@@ -24,7 +24,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
...@@ -2,13 +2,20 @@ ...@@ -2,13 +2,20 @@
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using TMPro; using TMPro;
using UnityEngine.UI;
using UnityEngine.SceneManagement;
public class MenuExtras : MonoBehaviour public class MenuExtras : MonoBehaviour
{ {
public Coleccionables gameManager; public Coleccionables gameManager;
public TextMeshProUGUI textNivel1;
public TextMeshProUGUI textInfoNivel1; public TextMeshProUGUI textInfoNivel1;
public TextMeshProUGUI textNumColecNivel1; public TextMeshProUGUI textNumColecNivel1;
public GameObject SitioImagenPartituraNivel1; public GameObject SitioImagenPartituraNivel1;
public Button botonReproducirNivel1;
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
...@@ -19,12 +26,21 @@ public class MenuExtras : MonoBehaviour ...@@ -19,12 +26,21 @@ public class MenuExtras : MonoBehaviour
//Para el nivel 1 //Para el nivel 1
if (Coleccionables.cConseguidos[0] < Coleccionables.cTotales[0]) 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]; textNumColecNivel1.text = Coleccionables.cConseguidos[0] + "/" + Coleccionables.cTotales[0];
SitioImagenPartituraNivel1.SetActive(false);
botonReproducirNivel1.gameObject.SetActive(false);
} }
else { else {
//Ya se ha desbloqueado la partitura
textInfoNivel1.enabled = false;
textNumColecNivel1.enabled = false;
SitioImagenPartituraNivel1.SetActive(true);
botonReproducirNivel1.enabled = true;
} }
} }
...@@ -34,4 +50,14 @@ public class MenuExtras : MonoBehaviour ...@@ -34,4 +50,14 @@ public class MenuExtras : MonoBehaviour
{ {
} }
public void VolverAlMenuAnterior()
{
SceneManager.LoadScene("MenuInicial");
}
public void ReproducirCancion() {
}
} }
Videojuegos_Proyecto/Assets/Scenes/MenuInicial.unity
...@@ -1385,7 +1385,18 @@ MonoBehaviour: ...@@ -1385,7 +1385,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/Library/CurrentLayout.dwlt
...@@ -47,7 +47,7 @@ MonoBehaviour: ...@@ -47,7 +47,7 @@ MonoBehaviour:
m_MinSize: {x: 683, y: 494} m_MinSize: {x: 683, y: 494}
m_MaxSize: {x: 14004, y: 14044} m_MaxSize: {x: 14004, y: 14044}
vertical: 0 vertical: 0
controlID: 13 controlID: 53
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -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: 14 controlID: 54
--- !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: 15 controlID: 55
--- !u!114 &11 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -346,10 +346,10 @@ MonoBehaviour: ...@@ -346,10 +346,10 @@ MonoBehaviour:
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 17}
m_SelectedIDs: aa350000 m_SelectedIDs: 9a330000
m_LastClickedID: 13738 m_LastClickedID: 13210
m_ExpandedIDs: 00000000022d0000ee340000e2350000e635000000ca9a3b m_ExpandedIDs: 00000000a62a0000b6320000d4330000d833000000ca9a3b
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: 00000000022d0000 m_ExpandedIDs: 00000000a62a0000b6320000d4330000d8330000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -431,7 +431,7 @@ MonoBehaviour: ...@@ -431,7 +431,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: 115 m_DirectoriesAreaWidth: 186
--- !u!114 &14 --- !u!114 &14
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -497,9 +497,9 @@ MonoBehaviour: ...@@ -497,9 +497,9 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 804d0000 m_SelectedIDs:
m_LastClickedID: 19840 m_LastClickedID: 0
m_ExpandedIDs: b6c0ffffb8caffff66d3ffff62dbffff94dbffffeadbffff42ddffffb8dfffff9ae0ffff0cfaffff204a0000244a0000304a00006e4a0000a64c0000564d00005a4d00006e4d0000ac4d0000 m_ExpandedIDs: 80b8ffff80c2ffff88ccffff94ceffff56f2ffff50fbffff003d0000043d0000103d0000563d0000ae4c0000d64c00002c5c0000305c00003c5c00008c5c0000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -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: 535.283, y: 355.7328, z: -161.14014} m_Target: {x: 612.8882, y: 306.9994, z: -48.75}
speed: 2 speed: 2
m_Value: {x: 535.283, y: 355.7328, z: -161.14014} m_Value: {x: 612.8882, y: 306.9994, z: -48.75}
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: 521.232 m_Target: 746.1416
speed: 2 speed: 2
m_Value: 521.232 m_Value: 746.1416
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
...@@ -670,7 +670,7 @@ MonoBehaviour: ...@@ -670,7 +670,7 @@ MonoBehaviour:
m_HSlider: 0 m_HSlider: 0
m_VSlider: 0 m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0 m_IgnoreScrollWheelUntilClicked: 0
m_EnableMouseInput: 1 m_EnableMouseInput: 0
m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0 m_EnableSliderZoomVertical: 0
m_UniformScale: 1 m_UniformScale: 1
......
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":535.2830200195313,"y":355.7327880859375,"z":-161.14013671875},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":521.2319946289063,"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":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}
\ 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/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: {}
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