Merge branch 'Release' into Ataque_melee_y_creditos

Videojuegos_Proyecto/Assembly-CSharp.csproj

@@ -64,6 +64,7 @@
   <ItemGroup>
     <Compile Include="Assets\MainMenu\Scripts\MainMenu.cs" />
     <Compile Include="Assets\MainMenu\Scripts\MenuExtras.cs" />
+    <Compile Include="Assets\MainMenu\Scripts\MenusCreditos.cs" />
     <Compile Include="Assets\MainMenu\Scripts\SeleccionNivel.cs" />
     <Compile Include="Assets\Player\Scripts\BalaFlauta.cs" />
     <Compile Include="Assets\Player\Scripts\BalaGuitarra.cs" />

Videojuegos_Proyecto/Assets/MainMenu/Scripts/MenusCreditos.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class MenusCreditos : MonoBehaviour
+{
+    public void VolverAlMenuAnterior()
+    {
+        SceneManager.LoadScene("MenuInicial");
+    }
+}

Videojuegos_Proyecto/Assets/MainMenu/Scripts/MenusCreditos.cs.meta

+fileFormatVersion: 2
+guid: 2781a48f48b33cc4f893a8e99a79b334
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Videojuegos_Proyecto/Assets/Scenes/MenuCreditos.unity

@@ -1186,16 +1186,9 @@ MonoBehaviour:
   m_GameObject: {fileID: 1708784599}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6b1c1533ea3dfd84391a2e746dda07f2, type: 3}
+  m_Script: {fileID: 11500000, guid: 2781a48f48b33cc4f893a8e99a79b334, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  AS: {fileID: 997892034}
-  gameManager: {fileID: 0}
-  textNivel1: {fileID: 954643050}
-  textInfoNivel1: {fileID: 1024863311}
-  textNumColecNivel1: {fileID: 0}
-  SitioImagenPartituraNivel1: {fileID: 0}
-  botonReproducirNivel1: {fileID: 0}
 --- !u!114 &1708784601
 MonoBehaviour:
   m_ObjectHideFlags: 0

Videojuegos_Proyecto/Library/CurrentLayout.dwlt

@@ -21,7 +21,7 @@ MonoBehaviour:
   m_ShowMode: 4
   m_Title: 
   m_RootView: {fileID: 6}
-  m_MinSize: {x: 950, y: 544}
+  m_MinSize: {x: 950, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
 --- !u!114 &2
 MonoBehaviour:
@@ -47,7 +47,7 @@ MonoBehaviour:
   m_MinSize: {x: 683, y: 494}
   m_MaxSize: {x: 14004, y: 14044}
   vertical: 0
-  controlID: 147
+  controlID: 13
 --- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -127,7 +127,7 @@ MonoBehaviour:
   - {fileID: 19}
   - {fileID: 12}
   m_Selected: 0
-  m_LastSelected: 1
+  m_LastSelected: 2
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -219,7 +219,7 @@ MonoBehaviour:
   m_MinSize: {x: 406, y: 494}
   m_MaxSize: {x: 10002, y: 14044}
   vertical: 1
-  controlID: 59
+  controlID: 14
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -244,7 +244,7 @@ MonoBehaviour:
   m_MinSize: {x: 406, y: 222}
   m_MaxSize: {x: 8006, y: 4022}
   vertical: 0
-  controlID: 60
+  controlID: 15
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -301,7 +301,7 @@ MonoBehaviour:
   m_ViewDataDictionary: {fileID: 0}
   m_LockTracker:
     m_IsLocked: 0
-  m_LastSelectedObjectID: -2996
+  m_LastSelectedObjectID: 15890
 --- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -377,9 +377,9 @@ MonoBehaviour:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 482b0000
-    m_LastClickedID: 11080
-    m_ExpandedIDs: 000000006e2a00008a320000ac330000d633000000ca9a3b
+    m_SelectedIDs: 922c0000
+    m_LastClickedID: 11410
+    m_ExpandedIDs: 00000000e02b0000c6330000be34000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -407,7 +407,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000006e2a0000ac330000
+    m_ExpandedIDs: 00000000e02b0000be340000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -527,9 +527,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: f6320000
+      m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: f2d9ffff3cdaffffa2dcffffc4dffffff0dfffff24e1ffff68e9ffff88e9ffffa4e9ffff12f1ffff26f1ffff28f1ffff2af1ffff60f1ffffe4f1ffffc6f2ffff8cfbffffca410000184600003a46000058460000544700007c470000
+      m_ExpandedIDs: 5cdcffffccdffffff0faffff964b0000b84b0000d64b0000e24b00000a4e0000324e0000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 

Videojuegos_Proyecto/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache

-8a1474c563568aff66194b84a96b4d180f8f9ffa
+bd4977dc556ee78d367aa7d458ceb6a267e5ee8e