Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit fa916bb5 by Juan Carlos
Options

Revert "Commit interfaz hecha" 

This reverts commit 1a3ecbc5.

# Conflicts:
#	Videojuegos_Proyecto/Assets/Scenes/SampleScene.unity
#	Videojuegos_Proyecto/Library/CurrentLayout.dwlt
#	Videojuegos_Proyecto/Library/SceneVisibilityState.asset
#	Videojuegos_Proyecto/Library/ScriptAssemblies/Assembly-CSharp.dll
#	Videojuegos_Proyecto/Library/ScriptAssemblies/Assembly-CSharp.pdb
#	Videojuegos_Proyecto/Library/StateCache/SceneView/4ba86f-mainStage.json
#	Videojuegos_Proyecto/Library/assetDatabase3
#	Videojuegos_Proyecto/Library/metadata/58/58d5adfa0c93ba04d92e7b5bd7b4a679
parent 9989e706
Expand all
Inline Side-by-side
Showing with 81 additions and 46 deletions
Videojuegos_Proyecto/Assets/MainMenu/Scripts/MainMenu.cs
......@@ -8,7 +8,6 @@ public class MainMenu : MonoBehaviour
{
public void NewGame() {
Time.timeScale = 1;
Coleccionables.iniciali = false;
Coleccionables.niActual = 0;
Coleccionables.Modificado();
......@@ -31,9 +30,4 @@ public class MainMenu : MonoBehaviour
public void CreditsScene() {
//Cargar pantalla creditos
}
public void MainMenuScreen() {
Time.timeScale = 1;
SceneManager.LoadScene("MenuInicial");
}
}
Videojuegos_Proyecto/Assets/Player/Scripts/Player2D.cs
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using TMPro;
public class Player2D : MonoBehaviour
{
......@@ -29,8 +27,6 @@ public class Player2D : MonoBehaviour
public ParticleSystem efectoInvulnerabilidad;
public ParticleSystem efectoAtaque;
public TextMeshProUGUI nColeccionablesCanvas;
// Start is called before the first frame update
void Start()
{
......@@ -60,7 +56,6 @@ public class Player2D : MonoBehaviour
{
if (Input.GetKeyDown(KeyCode.K)) { AtaqueMelee(); }
}
nColeccionablesCanvas.text=Coleccionables.cConseguidos[Coleccionables.niActual] + "/" + Coleccionables.cTotales[Coleccionables.niActual];
}
......@@ -247,6 +242,4 @@ public class Player2D : MonoBehaviour
{
efectoAtaque.Stop();
}
}
Videojuegos_Proyecto/Assets/Scripts/Jugador.cs
......@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System;
using UnityEngine;
using UnityEngine.UI;
public class Jugador : MonoBehaviour
{
......@@ -12,19 +11,12 @@ public class Jugador : MonoBehaviour
public bool powerUpInvulnerable;
public Image corazon1, corazon2, corazon3;
public Sprite corazonLleno;
public Sprite corazonVacio;
public Canvas canvasMuerte;
// Start is called before the first frame update
void Start()
{
vidas = 3;
tInvulnerable = 0;
powerUpInvulnerable = false;
canvasMuerte.gameObject.SetActive(false);
}
// Update is called once per frame
......@@ -35,24 +27,6 @@ public class Jugador : MonoBehaviour
{
tInvulnerable -= Time.deltaTime;
}
if (vidas <= 0)
{
corazon1.sprite = corazon2.sprite = corazon3.sprite = corazonVacio;
}
else if (vidas == 1)
{
corazon1.sprite = corazonLleno;
corazon2.sprite = corazon3.sprite = corazonVacio;
}
else if (vidas == 2)
{
corazon1.sprite = corazon2.sprite = corazonLleno;
corazon3.sprite = corazonVacio;
}
else if (vidas == 3) {
corazon1.sprite = corazon2.sprite = corazon3.sprite = corazonLleno;
}
}
private void OnTriggerEnter2D(Collider2D collision)
......@@ -85,7 +59,6 @@ public class Jugador : MonoBehaviour
else
{
//Si las vidas se reducen a cero, el jugador muere
vidas--;
Muerte();
}
}
......@@ -93,9 +66,6 @@ public class Jugador : MonoBehaviour
public void Muerte()
{
//El jugador muere
Time.timeScale = 0;
canvasMuerte.gameObject.SetActive(true);
Debug.Log("Muerte");
}
}
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:
......@@ -44,10 +44,17 @@ MonoBehaviour:
y: 30
width: 1920
height: 947
<<<<<<< HEAD
m_MinSize: {x: 683, y: 494}
m_MaxSize: {x: 14004, y: 14044}
vertical: 0
controlID: 14
=======
m_MinSize: {x: 681, y: 494}
m_MaxSize: {x: 14002, y: 14044}
vertical: 0
controlID: 120
>>>>>>> parent of 1a3ecbc5... Commit interfaz hecha
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -67,8 +74,8 @@ MonoBehaviour:
y: 0
width: 389
height: 947
m_MinSize: {x: 277, y: 72}
m_MaxSize: {x: 4002, y: 4022}
m_MinSize: {x: 275, y: 50}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 14}
m_Panes:
- {fileID: 14}
......@@ -218,7 +225,11 @@ MonoBehaviour:
m_MinSize: {x: 406, y: 494}
m_MaxSize: {x: 10002, y: 14044}
vertical: 1
<<<<<<< HEAD
controlID: 20
=======
controlID: 121
>>>>>>> parent of 1a3ecbc5... Commit interfaz hecha
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -243,7 +254,11 @@ MonoBehaviour:
m_MinSize: {x: 406, y: 222}
m_MaxSize: {x: 8006, y: 4022}
vertical: 0
<<<<<<< HEAD
controlID: 21
=======
controlID: 122
>>>>>>> parent of 1a3ecbc5... Commit interfaz hecha
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -336,20 +351,34 @@ MonoBehaviour:
m_ShowAllHits: 0
m_SearchArea: 1
m_Folders:
<<<<<<< HEAD
- Assets/Scenes
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Scenes
=======
- Assets/MainMenu
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/MainMenu
>>>>>>> parent of 1a3ecbc5... Commit interfaz hecha
m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\JC\Desktop\DesarrolloDeVideojuegos_Proyecto\Videojuegos_Proyecto
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
<<<<<<< HEAD
m_SelectedIDs: 462b0000
m_LastClickedID: 11078
m_ExpandedIDs: 000000006c2a000088320000aa33000000ca9a3b
=======
m_SelectedIDs: 52320000
m_LastClickedID: 12882
m_ExpandedIDs: 000000003a2a00000a33000000ca9a3b
>>>>>>> parent of 1a3ecbc5... Commit interfaz hecha
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -377,7 +406,11 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
<<<<<<< HEAD
m_ExpandedIDs: 000000006c2a000088320000aa330000
=======
m_ExpandedIDs: 000000003a2a0000
>>>>>>> parent of 1a3ecbc5... Commit interfaz hecha
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -404,8 +437,13 @@ MonoBehaviour:
m_ListAreaState:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
<<<<<<< HEAD
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000
=======
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000382b000000000000
>>>>>>> parent of 1a3ecbc5... Commit interfaz hecha
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -497,9 +535,15 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
<<<<<<< HEAD
m_SelectedIDs: 00350000
m_LastClickedID: 0
m_ExpandedIDs: f6faffff8cfbffff
=======
m_SelectedIDs: da88ffff
m_LastClickedID: -30502
m_ExpandedIDs: 74fbffff
>>>>>>> parent of 1a3ecbc5... Commit interfaz hecha
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -515,7 +559,11 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
<<<<<<< HEAD
m_ClientGUIView: {fileID: 0}
=======
m_ClientGUIView: {fileID: 3}
>>>>>>> parent of 1a3ecbc5... Commit interfaz hecha
m_SearchString:
m_ExpandedScenes: []
m_CurrenRootInstanceID: 0
......@@ -559,9 +607,15 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
<<<<<<< HEAD
m_Target: {x: 2.6215565, y: -1.190158, z: -0.9352167}
speed: 2
m_Value: {x: 2.6215565, y: -1.190158, z: -0.9352167}
=======
m_Target: {x: -8.045736, y: 1.2080817, z: -161.03267}
speed: 2
m_Value: {x: -8.045736, y: 1.2080817, z: -161.03267}
>>>>>>> parent of 1a3ecbc5... Commit interfaz hecha
m_RenderMode: 0
m_CameraMode:
drawMode: 0
......@@ -594,9 +648,15 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
<<<<<<< HEAD
m_Target: 19.352823
speed: 2
m_Value: 19.352823
=======
m_Target: 7.7299104
speed: 2
m_Value: 7.7299104
>>>>>>> parent of 1a3ecbc5... Commit interfaz hecha
m_Ortho:
m_Target: 1
speed: 2
......
Videojuegos_Proyecto/Library/StateCache/SceneView/4ba86f-mainStage.json
<<<<<<< HEAD
<<<<<<< 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":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
=======
{"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":-8.045736312866211,"y":1.2080817222595215,"z":-161.0326690673828},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":7.729910373687744,"orthographic":true}
>>>>>>> parent of 1a3ecbc5... Commit interfaz hecha
Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe0.log
Base path: C:/Program Files/Unity/Editor/Data
Cmd: initializeCompiler
Cmd: compileSnippet
api=4 type=0 insize=1596 outsize=1638 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
Cmd: compileSnippet
api=4 type=1 insize=1596 outsize=5590 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe1.log
Base path: C:/Program Files/Unity/Editor/Data
Cmd: initializeCompiler
Cmd: compileSnippet
api=4 type=0 insize=1152 outsize=2770 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH PROCEDURAL_INSTANCING_ON _ALPHABLEND_ON pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
Cmd: compileSnippet
api=4 type=1 insize=1396 outsize=422 kw=UNITY_PASS_FORWARDBASE _ALPHABLEND_ON pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
Cmd: compileSnippet
api=4 type=0 insize=934 outsize=818 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe2.log
Base path: C:/Program Files/Unity/Editor/Data
Cmd: initializeCompiler
Cmd: compileSnippet
api=4 type=1 insize=1152 outsize=638 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH PROCEDURAL_INSTANCING_ON _ALPHABLEND_ON pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
Cmd: compileSnippet
api=4 type=1 insize=934 outsize=282 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
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