Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit 1c46009c by Juan Carlos
Options

Merge branch 'Menu_inicial' into Release

parents d50a9064 7a49c5df
Expand all
Inline Side-by-side
Showing with 69 additions and 24 deletions
Videojuegos_Proyecto/Assembly-CSharp.csproj
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Assets\MainMenu\Scripts\LoadMenu.cs" />
<Compile Include="Assets\MainMenu\Scripts\MainMenu.cs" /> <Compile Include="Assets\MainMenu\Scripts\MainMenu.cs" />
<Compile Include="Assets\Player\Scripts\BalaFlauta.cs" /> <Compile Include="Assets\Player\Scripts\BalaFlauta.cs" />
<Compile Include="Assets\Player\Scripts\BalaGuitarra.cs" /> <Compile Include="Assets\Player\Scripts\BalaGuitarra.cs" />
......
Videojuegos_Proyecto/Assets/MainMenu/Scripts/LoadMenu.cs 0 → 100644
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
public class LoadMenu : MonoBehaviour
{
public void BackMainMenu()
{
SceneManager.LoadScene("MenuInicial");
}
public void LoadSavedState1()
{
//Cargar partida 1
}
public void LoadSaveState2()
{
//Cargar partida 2
}
}
Videojuegos_Proyecto/Assets/MainMenu/Scripts/LoadMenu.cs.meta 0 → 100644
fileFormatVersion: 2
guid: 921e2ffaabada8447bb1cdad47959cf1
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Scenes/MenuInicial.unity
...@@ -1737,7 +1737,18 @@ MonoBehaviour: ...@@ -1737,7 +1737,18 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1775435614} m_TargetGraphic: {fileID: 1775435614}
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls:
- m_Target: {fileID: 572894596}
m_MethodName: LoadGame
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 &1775435614 --- !u!114 &1775435614
......
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: 80 controlID: 120
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -67,8 +67,8 @@ MonoBehaviour: ...@@ -67,8 +67,8 @@ MonoBehaviour:
y: 0 y: 0
width: 389 width: 389
height: 947 height: 947
m_MinSize: {x: 275, y: 50} m_MinSize: {x: 277, y: 72}
m_MaxSize: {x: 4000, y: 4000} m_MaxSize: {x: 4002, y: 4022}
m_ActualView: {fileID: 14} m_ActualView: {fileID: 14}
m_Panes: m_Panes:
- {fileID: 14} - {fileID: 14}
...@@ -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: 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: 15 controlID: 33
--- !u!114 &11 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -347,9 +347,9 @@ MonoBehaviour: ...@@ -347,9 +347,9 @@ MonoBehaviour:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: e8390000 m_SelectedIDs: 4a2b0000
m_LastClickedID: 14824 m_LastClickedID: 11082
m_ExpandedIDs: 0000000040390000683a000000ca9a3b m_ExpandedIDs: 000000007e2a00008a32000000ca9a3b
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: 0000000040390000 m_ExpandedIDs: 000000007e2a00008a320000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -497,25 +497,25 @@ MonoBehaviour: ...@@ -497,25 +497,25 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 66280000 m_SelectedIDs: 7e330000
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 94baffff0cc4ffff42410000 m_ExpandedIDs: 32c4fffff4cbffffe6ccffff20cdfffffecdffff30ceffff20d6ffff46d7ffff8cd7ffffd4d7ffffe6e5ffff14e6ffff44e6ffff0cebffff3eebffff08ecffff8aeffffff2efffff1ef0ffffeaf1ffffdef3ffff7af5ffff86f6ffffb0f6ffff2cf7ffffd2f7ffff04f8ffff38f8ffff62f8ffff9ef8ffff3efaffffe8faffff7afbffff6c3d0000a23d0000ca3d0000663e0000343f0000443f0000f63f00001e400000864000009a400000a440000082410000aa4100000a4200000e4200003a420000dc42000004430000f64300000c4400001e4400003044000000450000604500006445000076450000884500009a450000a2470000ca470000e44700003a4c00003e4c0000424c00006c4c0000864c00005a4d0000364e0000644e0000ca4f0000f24f0000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name: Text (TMP) (1)
m_OriginalName: m_OriginalName: Text (TMP) (1)
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: -7490
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: 0} m_ClientGUIView: {fileID: 4}
m_SearchString: m_SearchString:
m_ExpandedScenes: [] m_ExpandedScenes: []
m_CurrenRootInstanceID: 0 m_CurrenRootInstanceID: 0
...@@ -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: 620.61707, y: 261.557, z: -78.875} m_Target: {x: 584.82623, y: 284.74612, z: -72.25}
speed: 2 speed: 2
m_Value: {x: 620.61707, y: 261.557, z: -78.875} m_Value: {x: 584.82623, y: 284.74612, z: -72.25}
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: 676.59265 m_Target: 617.94183
speed: 2 speed: 2
m_Value: 676.59265 m_Value: 617.94183
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":620.6170654296875,"y":261.5570068359375,"z":-78.875},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":676.5926513671875,"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":584.8262329101563,"y":284.7461242675781,"z":-72.25},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":617.9418334960938,"orthographic":true}
\ No newline at end of file \ No newline at end of file
Videojuegos_Proyecto/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache
0814b05a5ba0f2d98916cb62e0f6f590d291a075 3797502974bb493a3057c5647309d7110cad13bb
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