Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit 5f512eaa by David Colmenero Chica
Options

Ligeros cambios

parent 77aace5c
Expand all
Inline Side-by-side
Showing with 35 additions and 33 deletions
Videojuegos_Proyecto/Assets/Player/Scripts/Player2D.cs
...@@ -65,6 +65,7 @@ public class Player2D : MonoBehaviour ...@@ -65,6 +65,7 @@ public class Player2D : MonoBehaviour
{ {
if (Input.GetKeyDown(KeyCode.K)) { AtaqueMelee(); } if (Input.GetKeyDown(KeyCode.K)) { AtaqueMelee(); }
} }
Debug.Log(Coleccionables.niActual);
nColeccionablesCanvas.text=Coleccionables.cConseguidos[Coleccionables.niActual] + "/" + Coleccionables.cTotales[Coleccionables.niActual]; nColeccionablesCanvas.text=Coleccionables.cConseguidos[Coleccionables.niActual] + "/" + Coleccionables.cTotales[Coleccionables.niActual];
} }
......
Videojuegos_Proyecto/Assets/Scripts/Coleccionables.cs
...@@ -20,7 +20,7 @@ public class Coleccionables : MonoBehaviour ...@@ -20,7 +20,7 @@ public class Coleccionables : MonoBehaviour
public int[] enemigosDerrotados = new int[1]; public int[] enemigosDerrotados = new int[1];
public bool[] ventanaMostrada = new bool[1]; public bool[] ventanaMostrada = new bool[1];
public string[] nombreImagenPartitura = new string[1]; public string[] nombreImagenPartitura = new string[1];
public Vector3[] posicionesColecNivel1 = new Vector3[4]; //Si posicionesColecNivel1[i] = (0, 0, 0) ese coleccionable ya ha sido recogido public Vector3[] posicionesColecNivel1 = new Vector3[5]; //Si posicionesColecNivel1[i] = (0, 0, 0) ese coleccionable ya ha sido recogido
//Estas son las variables con las que trabajarán los demás scripts: //Estas son las variables con las que trabajarán los demás scripts:
public static bool iniciali = false; public static bool iniciali = false;
...@@ -52,13 +52,14 @@ public class Coleccionables : MonoBehaviour ...@@ -52,13 +52,14 @@ public class Coleccionables : MonoBehaviour
//Habria que para cada nivel completar estas variables de cada array //Habria que para cada nivel completar estas variables de cada array
// TOCAR AQUI{ // TOCAR AQUI{
enemigosTotales[0] = 2; enemigosTotales[0] = 10;
nombreImagenPartitura[0] = "Partitura-completa-1"; nombreImagenPartitura[0] = "Partitura-completa-1";
coleccTotales[0] = 5; //El ultimo coleccionable se consigue al derrotar a todos los enemigos, asi que aqui abajo hay el numero de coleccTotales - 1 de coleccionables coleccTotales[0] = 6; //El ultimo coleccionable se consigue al derrotar a todos los enemigos, asi que aqui abajo hay el numero de coleccTotales - 1 de coleccionables
posicionesColecNivel1[0] = new Vector3(-5.48f, 0.01f, 0); posicionesColecNivel1[0] = new Vector3(-5.48f, 0.01f, 0);
posicionesColecNivel1[1] = new Vector3(-3.08f, 0.01f, 0); posicionesColecNivel1[1] = new Vector3(-3.08f, 0.01f, 0);
posicionesColecNivel1[2] = new Vector3(-1.78f, -1.78f, 0); posicionesColecNivel1[2] = new Vector3(-1.78f, -1.78f, 0);
posicionesColecNivel1[3] = new Vector3( 1.48f, -1.78f, 0); posicionesColecNivel1[3] = new Vector3( 1.48f, -1.78f, 0);
posicionesColecNivel1[4] = new Vector3( 58.42f, 1.85f, 0);
// } // }
niActual = nivelActual; niActual = nivelActual;
......
Videojuegos_Proyecto/Library/CurrentLayout.dwlt
...@@ -44,10 +44,10 @@ MonoBehaviour: ...@@ -44,10 +44,10 @@ MonoBehaviour:
y: 30 y: 30
width: 1920 width: 1920
height: 947 height: 947
m_MinSize: {x: 683, 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: 146 controlID: 145
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -216,10 +216,10 @@ MonoBehaviour: ...@@ -216,10 +216,10 @@ MonoBehaviour:
y: 0 y: 0
width: 1373 width: 1373
height: 947 height: 947
m_MinSize: {x: 406, y: 494} m_MinSize: {x: 404, y: 494}
m_MaxSize: {x: 10002, y: 14044} m_MaxSize: {x: 10002, y: 14044}
vertical: 1 vertical: 1
controlID: 123 controlID: 80
--- !u!114 &10 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -241,10 +241,10 @@ MonoBehaviour: ...@@ -241,10 +241,10 @@ MonoBehaviour:
y: 0 y: 0
width: 1373 width: 1373
height: 675 height: 675
m_MinSize: {x: 406, y: 222} m_MinSize: {x: 404, y: 222}
m_MaxSize: {x: 8006, y: 4022} m_MaxSize: {x: 8004, y: 4022}
vertical: 0 vertical: 0
controlID: 124 controlID: 81
--- !u!114 &11 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -300,7 +300,7 @@ MonoBehaviour: ...@@ -300,7 +300,7 @@ MonoBehaviour:
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_LastSelectedObjectID: -5470 m_LastSelectedObjectID: -6682
--- !u!114 &13 --- !u!114 &13
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -339,20 +339,20 @@ MonoBehaviour: ...@@ -339,20 +339,20 @@ MonoBehaviour:
m_ShowAllHits: 0 m_ShowAllHits: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
- Assets/Scripts - Assets/Scenes
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: m_LastFolders:
- Assets/Scripts - Assets/Scenes
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}
m_SelectedIDs: 4c320000 m_SelectedIDs: 1a2d0000
m_LastClickedID: 12876 m_LastClickedID: 11546
m_ExpandedIDs: 00000000742a0000b633000000ca9a3b m_ExpandedIDs: 00000000422c00007c35000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -380,7 +380,7 @@ MonoBehaviour: ...@@ -380,7 +380,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 00000000742a0000b6330000 m_ExpandedIDs: 00000000422c00007c350000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -407,7 +407,7 @@ MonoBehaviour: ...@@ -407,7 +407,7 @@ MonoBehaviour:
m_ListAreaState: m_ListAreaState:
m_SelectedInstanceIDs: m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0 m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 0 m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000a83200001c2c0000 m_ExpandedInstanceIDs: c6230000a83200001c2c0000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
...@@ -500,9 +500,9 @@ MonoBehaviour: ...@@ -500,9 +500,9 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 063d0000 m_SelectedIDs:
m_LastClickedID: 15622 m_LastClickedID: 0
m_ExpandedIDs: 8cfbffff m_ExpandedIDs: bad7ffff2ce2ffffe4f9ffff
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -562,9 +562,9 @@ MonoBehaviour: ...@@ -562,9 +562,9 @@ MonoBehaviour:
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
m_Target: {x: 21.264292, y: -1.434914, z: -259.25} m_Target: {x: -1.5266032, y: -3.9162436, z: -273.43555}
speed: 2 speed: 2
m_Value: {x: 21.264292, y: -1.434914, z: -259.25} m_Value: {x: -1.5266032, y: -3.9162436, z: -273.43555}
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
...@@ -597,9 +597,9 @@ MonoBehaviour: ...@@ -597,9 +597,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: 29.002615 m_Target: 14.781819
speed: 2 speed: 2
m_Value: 27.753698 m_Value: 14.781819
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
...@@ -727,7 +727,7 @@ MonoBehaviour: ...@@ -727,7 +727,7 @@ MonoBehaviour:
m_Pos: m_Pos:
serializedVersion: 2 serializedVersion: 2
x: 0 x: 0
y: 724 y: 748
width: 1531 width: 1373
height: 277 height: 253
m_ViewDataDictionary: {fileID: 0} m_ViewDataDictionary: {fileID: 0}
Videojuegos_Proyecto/Library/StateCache/SceneView/de700f-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":21.264291763305665,"y":-1.434913992881775,"z":-259.25},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":29.002614974975587,"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":-1.5266032218933106,"y":-3.916243553161621,"z":-273.435546875},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":14.781819343566895,"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/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache
64b7f895d8feabda1ea51b5fa18d34499e2e0f1d 5677b36a787168034f6783b5b09faa2215fa34f5
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