Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit 944a28b7 by Juan Carlos
Options

Merge 'Release' into Power_Ups

parents b9c10d90 918e834f
Expand all
Inline Side-by-side
Showing with 223 additions and 11 deletions
Videojuegos_Proyecto/Assembly-CSharp.csproj
......@@ -2,8 +2,11 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LangVersion>latest</LangVersion>
<<<<<<< HEAD
<CscToolPath>C:\Program Files\Unity\Editor\Data\Tools\RoslynScripts</CscToolPath>
<CscToolExe>unity_csc.bat</CscToolExe>
=======
>>>>>>> origin/Release
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
......@@ -54,6 +57,9 @@
<UnityVersion>2019.1.11f1</UnityVersion>
</PropertyGroup>
<ItemGroup>
<Analyzer Include="C:\Program Files (x86)\Microsoft Visual Studio Tools for Unity\16.0\Analyzers\Microsoft.Unity.Analyzers.dll" />
</ItemGroup>
<ItemGroup>
<Reference Include="UnityEngine">
<HintPath>C:\Program Files\Unity\Editor\Data\Managed/UnityEngine/UnityEngine.dll</HintPath>
</Reference>
......@@ -94,6 +100,7 @@
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_Sprite.shader" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface.shader" />
<Reference Include="Unity.Timeline.Editor">
<<<<<<< HEAD
<HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
</Reference>
<Reference Include="Cinemachine">
......@@ -116,6 +123,30 @@
</Reference>
<Reference Include="Unity.Analytics.DataPrivacy">
<HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll</HintPath>
=======
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
</Reference>
<Reference Include="Cinemachine">
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Cinemachine.dll</HintPath>
</Reference>
<Reference Include="Unity.TextMeshPro.Editor">
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
</Reference>
<Reference Include="Unity.Timeline">
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
</Reference>
<Reference Include="Unity.CollabProxy.Editor">
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll</HintPath>
</Reference>
<Reference Include="com.unity.cinemachine.editor">
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/com.unity.cinemachine.editor.dll</HintPath>
</Reference>
<Reference Include="Unity.TextMeshPro">
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
</Reference>
<Reference Include="Unity.Analytics.DataPrivacy">
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll</HintPath>
>>>>>>> origin/Release
</Reference>
<Reference Include="UnityEngine.AIModule">
<HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll</HintPath>
......@@ -301,6 +332,7 @@
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Unity.Analytics.Editor">
<<<<<<< HEAD
<HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Editor.dll</HintPath>
</Reference>
<Reference Include="Unity.Analytics.StandardEvents">
......@@ -308,6 +340,15 @@
</Reference>
<Reference Include="Unity.Analytics.Tracker">
<HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Tracker.dll</HintPath>
=======
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Editor.dll</HintPath>
</Reference>
<Reference Include="Unity.Analytics.StandardEvents">
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.StandardEvents.dll</HintPath>
</Reference>
<Reference Include="Unity.Analytics.Tracker">
<HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Tracker.dll</HintPath>
>>>>>>> origin/Release
</Reference>
<Reference Include="netstandard">
<HintPath>C:/Program Files/Unity/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll</HintPath>
......
Videojuegos_Proyecto/Assets/Prefabs/LimiteCaida.prefab 0 → 100644
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5764835571609392104
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 694183434271897141}
- component: {fileID: 473257042043114732}
m_Layer: 0
m_Name: LimiteCaida
m_TagString: Caida
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &694183434271897141
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5764835571609392104}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 8, y: -6, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &473257042043114732
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5764835571609392104}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 15, y: 1}
m_EdgeRadius: 0
Videojuegos_Proyecto/Assets/Prefabs/LimiteCaida.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: 3f846f2b1ae2eab4c8681ee81bf96ca2
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Scripts/Jugador.cs
......@@ -22,22 +22,55 @@ public class Jugador : MonoBehaviour
// Update is called once per frame
void Update()
{
//Se va reduciendo el tiempo de invulnerabilidad
if (tInvulnerable >= 0)
{
tInvulnerable -= Time.deltaTime;
}
}
private void OnTriggerEnter2D(Collider2D collision)
{
<<<<<<< HEAD
if (collision.tag == "Enemigo" && tInvulnerable<=0 && powerUpInvulnerable==false)
=======
//Si colisiona con un enemigose le quita una vida
if (collision.tag == "Enemigo" && tInvulnerable<=0)
>>>>>>> origin/Release
{
Dañado();
}
if (collision.tag == "Caida")
{
Muerte();
}
//Si colisiona con un power up se comprueba cuál es y se hacen sus efectos
//if (collision.tag == "PowerUp")
//{
//}
}
void Dañado()
{
if (vidas > 1)
{
//Si el jugador es dañado se baja una vida y se le da un tiempo de invulnerabilidad
vidas--;
tInvulnerable = 1.5f;
Debug.Log("Vida actual: "+vidas+"/3");
Debug.Log("Vida actual: " + vidas + "/3");
}
else
{
//Si las vidas se reducen a cero, el jugador muere
Muerte();
}
}
public void Muerte()
{
//El jugador muere
Debug.Log("Muerte");
}
}
Videojuegos_Proyecto/Library/CurrentLayout.dwlt
......@@ -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: 79
=======
m_MinSize: {x: 679, y: 344}
m_MaxSize: {x: 12004, y: 8044}
vertical: 0
controlID: 54
>>>>>>> origin/Release
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -118,6 +125,7 @@ MonoBehaviour:
x: 0
y: 573
width: 1531
<<<<<<< HEAD
height: 374
m_MinSize: {x: 232, y: 272}
m_MaxSize: {x: 10002, y: 10022}
......@@ -126,6 +134,16 @@ MonoBehaviour:
- {fileID: 13}
- {fileID: 18}
m_Selected: 0
=======
height: 342
m_MinSize: {x: 102, y: 122}
m_MaxSize: {x: 4002, y: 4022}
m_ActualView: {fileID: 18}
m_Panes:
- {fileID: 13}
- {fileID: 18}
m_Selected: 1
>>>>>>> origin/Release
m_LastSelected: 0
--- !u!114 &6
MonoBehaviour:
......@@ -215,10 +233,15 @@ MonoBehaviour:
y: 0
width: 1531
height: 947
<<<<<<< HEAD
m_MinSize: {x: 406, y: 494}
m_MaxSize: {x: 10002, y: 14044}
=======
m_MinSize: {x: 404, y: 344}
m_MaxSize: {x: 8004, y: 8044}
>>>>>>> origin/Release
vertical: 1
controlID: 14
controlID: 55
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -243,7 +266,7 @@ MonoBehaviour:
m_MinSize: {x: 406, y: 222}
m_MaxSize: {x: 8006, y: 4022}
vertical: 0
controlID: 15
controlID: 33
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -262,9 +285,15 @@ MonoBehaviour:
x: 379
y: 0
width: 1152
<<<<<<< HEAD
height: 573
m_MinSize: {x: 204, y: 222}
m_MaxSize: {x: 4004, y: 4022}
=======
height: 605
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
>>>>>>> origin/Release
m_ActualView: {fileID: 16}
m_Panes:
- {fileID: 16}
......@@ -336,6 +365,7 @@ MonoBehaviour:
m_ShowAllHits: 0
m_SearchArea: 1
m_Folders:
<<<<<<< HEAD
- Assets/Effects
m_ViewMode: 1
m_StartGridSize: 64
......@@ -343,13 +373,28 @@ MonoBehaviour:
- Assets/Effects
m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\JC\Desktop\DesarrolloDeVideojuegos_Proyecto\Videojuegos_Proyecto
=======
- Assets/Prefabs
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Prefabs
m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\alvmo\Documents\NetBeansProjects\DesarrolloDeVideojuegos_Proyecto\Videojuegos_Proyecto
>>>>>>> origin/Release
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
<<<<<<< HEAD
m_SelectedIDs: 36330000
m_LastClickedID: 13110
m_ExpandedIDs: 00000000662a000000ca9a3b
=======
m_SelectedIDs: ac370000
m_LastClickedID: 14252
m_ExpandedIDs: 00000000642d000000ca9a3b
>>>>>>> origin/Release
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name: Scripts
......@@ -377,7 +422,11 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
<<<<<<< HEAD
m_ExpandedIDs: 00000000662a0000
=======
m_ExpandedIDs: 00000000642d0000
>>>>>>> origin/Release
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -402,8 +451,8 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_SelectedInstanceIDs: 0e440000
m_LastClickedInstanceID: 17422
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000
m_RenameOverlay:
......@@ -497,23 +546,29 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
<<<<<<< HEAD
m_SelectedIDs: aa2a0000
m_LastClickedID: 0
m_ExpandedIDs: 00f3ffff10faffff78fbffff
=======
m_SelectedIDs: 0e440000
m_LastClickedID: 17422
m_ExpandedIDs: eeefffff1cf0ffff14f8ffffdaf8ffff0e440000
>>>>>>> origin/Release
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
m_OriginalName:
m_Name: GameObject
m_OriginalName: GameObject
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: 0
m_UserData: -6684
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 11
m_OriginalEventType: 0
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 0}
m_SearchString:
......@@ -559,9 +614,15 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
<<<<<<< HEAD
m_Target: {x: -4.810031, y: -0.21807352, z: -2.0888672}
speed: 2
m_Value: {x: -4.810031, y: -0.21807352, z: -2.0888672}
=======
m_Target: {x: 18.764812, y: -2.7877026, z: -0.078125}
speed: 2
m_Value: {x: 18.764812, y: -2.7877026, z: -0.078125}
>>>>>>> origin/Release
m_RenderMode: 0
m_CameraMode:
drawMode: 0
......@@ -594,9 +655,15 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
<<<<<<< HEAD
m_Target: 5.5487404
speed: 2
m_Value: 5.5487404
=======
m_Target: 21.01
speed: 2
m_Value: 21.01
>>>>>>> origin/Release
m_Ortho:
m_Target: 1
speed: 2
......
Videojuegos_Proyecto/Library/StateCache/Hierarchy/e4f845-3f846f2b1ae2eab4c8.json 0 → 100644
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/43dad8-3f846f2b1ae2eab4c8.json 0 → 100644
{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":false,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":false,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":8.0,"y":-6.0,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":22.0,"orthographic":true}
\ No newline at end of file
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":2.6275835037231447,"y":-0.2934086322784424,"z":-0.939453125},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":11.060755729675293,"orthographic":true}
\ No newline at end of file
{"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":18.764812469482423,"y":-2.7877025604248049,"z":-0.078125},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":21.010000228881837,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/ProjectSettings/TagManager.asset
......@@ -12,6 +12,7 @@ TagManager:
- Enemigo
- BalaGuitarra
- BalaFlauta
- Caida
layers:
- Default
- TransparentFX
......
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