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
Inline Side-by-side
Showing with 443 additions and 24 deletions
Videojuegos_Proyecto/Assembly-CSharp.csproj
...@@ -2,8 +2,11 @@ ...@@ -2,8 +2,11 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<<<<<<< HEAD
<CscToolPath>C:\Program Files\Unity\Editor\Data\Tools\RoslynScripts</CscToolPath> <CscToolPath>C:\Program Files\Unity\Editor\Data\Tools\RoslynScripts</CscToolPath>
<CscToolExe>unity_csc.bat</CscToolExe> <CscToolExe>unity_csc.bat</CscToolExe>
=======
>>>>>>> origin/Release
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
...@@ -54,6 +57,9 @@ ...@@ -54,6 +57,9 @@
<UnityVersion>2019.1.11f1</UnityVersion> <UnityVersion>2019.1.11f1</UnityVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <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"> <Reference Include="UnityEngine">
<HintPath>C:\Program Files\Unity\Editor\Data\Managed/UnityEngine/UnityEngine.dll</HintPath> <HintPath>C:\Program Files\Unity\Editor\Data\Managed/UnityEngine/UnityEngine.dll</HintPath>
</Reference> </Reference>
...@@ -94,6 +100,7 @@ ...@@ -94,6 +100,7 @@
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_Sprite.shader" /> <None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_Sprite.shader" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface.shader" /> <None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface.shader" />
<Reference Include="Unity.Timeline.Editor"> <Reference Include="Unity.Timeline.Editor">
<<<<<<< HEAD
<HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath> <HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Cinemachine"> <Reference Include="Cinemachine">
...@@ -116,6 +123,30 @@ ...@@ -116,6 +123,30 @@
</Reference> </Reference>
<Reference Include="Unity.Analytics.DataPrivacy"> <Reference Include="Unity.Analytics.DataPrivacy">
<HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll</HintPath> <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>
<Reference Include="UnityEngine.AIModule"> <Reference Include="UnityEngine.AIModule">
<HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll</HintPath> <HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll</HintPath>
...@@ -301,6 +332,7 @@ ...@@ -301,6 +332,7 @@
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath> <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Analytics.Editor"> <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> <HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Analytics.StandardEvents"> <Reference Include="Unity.Analytics.StandardEvents">
...@@ -308,6 +340,15 @@ ...@@ -308,6 +340,15 @@
</Reference> </Reference>
<Reference Include="Unity.Analytics.Tracker"> <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/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>
<Reference Include="netstandard"> <Reference Include="netstandard">
<HintPath>C:/Program Files/Unity/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll</HintPath> <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/Scenes/SampleScene.unity
...@@ -412,6 +412,75 @@ Transform: ...@@ -412,6 +412,75 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 558445664} m_PrefabInstance: {fileID: 558445664}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &94979601
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5764835571609392104, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_Name
value: LimiteCaida (2)
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalPosition.x
value: 93.1
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalPosition.y
value: -6.08
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, type: 3}
--- !u!1001 &272548703 --- !u!1001 &272548703
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -467,7 +536,7 @@ PrefabInstance: ...@@ -467,7 +536,7 @@ PrefabInstance:
- target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e, - target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 11 value: 14
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e, - target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e,
type: 3} type: 3}
...@@ -560,6 +629,75 @@ PrefabInstance: ...@@ -560,6 +629,75 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8d1a822faf6ebdb4fadb73791c65c824, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 8d1a822faf6ebdb4fadb73791c65c824, type: 3}
--- !u!1001 &400101886
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5764835571609392104, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_Name
value: LimiteCaida (1)
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalPosition.x
value: 34.17
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalPosition.y
value: -5.967701
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, type: 3}
--- !u!4 &492210452 stripped --- !u!4 &492210452 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 8560335152735241775, guid: 021ba06bc654c1a49a28c3e7b61b833a, m_CorrespondingSourceObject: {fileID: 8560335152735241775, guid: 021ba06bc654c1a49a28c3e7b61b833a,
...@@ -872,6 +1010,75 @@ Transform: ...@@ -872,6 +1010,75 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 1584440313} m_PrefabInstance: {fileID: 1584440313}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &729691791
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5764835571609392104, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_Name
value: LimiteCaida
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalPosition.x
value: 8.62
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalPosition.y
value: -5.9266033
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, type: 3}
--- !u!1001 &731199908 --- !u!1001 &731199908
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1060,7 +1267,7 @@ PrefabInstance: ...@@ -1060,7 +1267,7 @@ PrefabInstance:
- target: {fileID: 9124563920809263083, guid: b1642f1f10f959a47b1be99970c634f0, - target: {fileID: 9124563920809263083, guid: b1642f1f10f959a47b1be99970c634f0,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 2 value: 5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9124563920809263083, guid: b1642f1f10f959a47b1be99970c634f0, - target: {fileID: 9124563920809263083, guid: b1642f1f10f959a47b1be99970c634f0,
type: 3} type: 3}
...@@ -1279,7 +1486,7 @@ Transform: ...@@ -1279,7 +1486,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 7 m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &893567866 stripped --- !u!114 &893567866 stripped
MonoBehaviour: MonoBehaviour:
...@@ -2263,7 +2470,7 @@ Transform: ...@@ -2263,7 +2470,7 @@ Transform:
- {fileID: 1288388642} - {fileID: 1288388642}
- {fileID: 1793432113} - {fileID: 1793432113}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 4 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1407215725 --- !u!1001 &1407215725
PrefabInstance: PrefabInstance:
...@@ -2804,7 +3011,7 @@ RectTransform: ...@@ -2804,7 +3011,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 1234913245} - {fileID: 1234913245}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 5 m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
...@@ -3278,7 +3485,7 @@ RectTransform: ...@@ -3278,7 +3485,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 1891953901} - {fileID: 1891953901}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 6 m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
...@@ -4003,7 +4210,7 @@ PrefabInstance: ...@@ -4003,7 +4210,7 @@ PrefabInstance:
- target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181, - target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 9 value: 10
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181, - target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181,
type: 3} type: 3}
...@@ -4072,7 +4279,7 @@ PrefabInstance: ...@@ -4072,7 +4279,7 @@ PrefabInstance:
- target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995, - target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 10 value: 12
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995, - target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
type: 3} type: 3}
...@@ -4141,7 +4348,7 @@ PrefabInstance: ...@@ -4141,7 +4348,7 @@ PrefabInstance:
- target: {fileID: 5415114670227481227, guid: 38c9ae1c49230e24a82e867ab13d6345, - target: {fileID: 5415114670227481227, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 1 value: 4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5415114670227481227, guid: 38c9ae1c49230e24a82e867ab13d6345, - target: {fileID: 5415114670227481227, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3} type: 3}
...@@ -4393,7 +4600,7 @@ PrefabInstance: ...@@ -4393,7 +4600,7 @@ PrefabInstance:
- target: {fileID: 5557318670751642272, guid: 1c5aa891e36cd44419d73b6cb11aa315, - target: {fileID: 5557318670751642272, guid: 1c5aa891e36cd44419d73b6cb11aa315,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 3 value: 6
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5557318670751642272, guid: 1c5aa891e36cd44419d73b6cb11aa315, - target: {fileID: 5557318670751642272, guid: 1c5aa891e36cd44419d73b6cb11aa315,
type: 3} type: 3}
......
Videojuegos_Proyecto/Assets/Scripts/Jugador.cs
...@@ -22,22 +22,55 @@ public class Jugador : MonoBehaviour ...@@ -22,22 +22,55 @@ public class Jugador : MonoBehaviour
// Update is called once per frame // Update is called once per frame
void Update() void Update()
{ {
tInvulnerable -= Time.deltaTime; //Se va reduciendo el tiempo de invulnerabilidad
if (tInvulnerable >= 0)
{
tInvulnerable -= Time.deltaTime;
}
} }
private void OnTriggerEnter2D(Collider2D collision) private void OnTriggerEnter2D(Collider2D collision)
{ {
<<<<<<< HEAD
if (collision.tag == "Enemigo" && tInvulnerable<=0 && powerUpInvulnerable==false) 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(); 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() void Dañado()
{ {
vidas--; if (vidas > 1)
tInvulnerable = 1.5f; {
Debug.Log("Vida actual: "+vidas+"/3"); //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");
}
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: ...@@ -44,10 +44,17 @@ MonoBehaviour:
y: 30 y: 30
width: 1920 width: 1920
height: 947 height: 947
<<<<<<< HEAD
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: 79 controlID: 79
=======
m_MinSize: {x: 679, y: 344}
m_MaxSize: {x: 12004, y: 8044}
vertical: 0
controlID: 54
>>>>>>> origin/Release
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -118,6 +125,7 @@ MonoBehaviour: ...@@ -118,6 +125,7 @@ MonoBehaviour:
x: 0 x: 0
y: 573 y: 573
width: 1531 width: 1531
<<<<<<< HEAD
height: 374 height: 374
m_MinSize: {x: 232, y: 272} m_MinSize: {x: 232, y: 272}
m_MaxSize: {x: 10002, y: 10022} m_MaxSize: {x: 10002, y: 10022}
...@@ -126,6 +134,16 @@ MonoBehaviour: ...@@ -126,6 +134,16 @@ MonoBehaviour:
- {fileID: 13} - {fileID: 13}
- {fileID: 18} - {fileID: 18}
m_Selected: 0 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 m_LastSelected: 0
--- !u!114 &6 --- !u!114 &6
MonoBehaviour: MonoBehaviour:
...@@ -215,10 +233,15 @@ MonoBehaviour: ...@@ -215,10 +233,15 @@ MonoBehaviour:
y: 0 y: 0
width: 1531 width: 1531
height: 947 height: 947
<<<<<<< HEAD
m_MinSize: {x: 406, y: 494} m_MinSize: {x: 406, y: 494}
m_MaxSize: {x: 10002, y: 14044} m_MaxSize: {x: 10002, y: 14044}
=======
m_MinSize: {x: 404, y: 344}
m_MaxSize: {x: 8004, y: 8044}
>>>>>>> origin/Release
vertical: 1 vertical: 1
controlID: 14 controlID: 55
--- !u!114 &10 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -243,7 +266,7 @@ MonoBehaviour: ...@@ -243,7 +266,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
...@@ -262,9 +285,15 @@ MonoBehaviour: ...@@ -262,9 +285,15 @@ MonoBehaviour:
x: 379 x: 379
y: 0 y: 0
width: 1152 width: 1152
<<<<<<< HEAD
height: 573 height: 573
m_MinSize: {x: 204, y: 222} m_MinSize: {x: 204, y: 222}
m_MaxSize: {x: 4004, y: 4022} 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_ActualView: {fileID: 16}
m_Panes: m_Panes:
- {fileID: 16} - {fileID: 16}
...@@ -336,6 +365,7 @@ MonoBehaviour: ...@@ -336,6 +365,7 @@ MonoBehaviour:
m_ShowAllHits: 0 m_ShowAllHits: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
<<<<<<< HEAD
- Assets/Effects - Assets/Effects
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
...@@ -343,13 +373,28 @@ MonoBehaviour: ...@@ -343,13 +373,28 @@ MonoBehaviour:
- Assets/Effects - Assets/Effects
m_LastFoldersGridSize: -1 m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\JC\Desktop\DesarrolloDeVideojuegos_Proyecto\Videojuegos_Proyecto 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_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
<<<<<<< HEAD
m_SelectedIDs: 36330000 m_SelectedIDs: 36330000
m_LastClickedID: 13110 m_LastClickedID: 13110
m_ExpandedIDs: 00000000662a000000ca9a3b m_ExpandedIDs: 00000000662a000000ca9a3b
=======
m_SelectedIDs: ac370000
m_LastClickedID: 14252
m_ExpandedIDs: 00000000642d000000ca9a3b
>>>>>>> origin/Release
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: Scripts m_Name: Scripts
...@@ -377,7 +422,11 @@ MonoBehaviour: ...@@ -377,7 +422,11 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
<<<<<<< HEAD
m_ExpandedIDs: 00000000662a0000 m_ExpandedIDs: 00000000662a0000
=======
m_ExpandedIDs: 00000000642d0000
>>>>>>> origin/Release
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -402,8 +451,8 @@ MonoBehaviour: ...@@ -402,8 +451,8 @@ MonoBehaviour:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_ResourceFile: m_ResourceFile:
m_ListAreaState: m_ListAreaState:
m_SelectedInstanceIDs: m_SelectedInstanceIDs: 0e440000
m_LastClickedInstanceID: 0 m_LastClickedInstanceID: 17422
m_HadKeyboardFocusLastEvent: 1 m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000 m_ExpandedInstanceIDs: c6230000
m_RenameOverlay: m_RenameOverlay:
...@@ -497,23 +546,29 @@ MonoBehaviour: ...@@ -497,23 +546,29 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
<<<<<<< HEAD
m_SelectedIDs: aa2a0000 m_SelectedIDs: aa2a0000
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 00f3ffff10faffff78fbffff m_ExpandedIDs: 00f3ffff10faffff78fbffff
=======
m_SelectedIDs: 0e440000
m_LastClickedID: 17422
m_ExpandedIDs: eeefffff1cf0ffff14f8ffffdaf8ffff0e440000
>>>>>>> origin/Release
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name: GameObject
m_OriginalName: m_OriginalName: GameObject
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: -6684
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: 0}
m_SearchString: m_SearchString:
...@@ -559,9 +614,15 @@ MonoBehaviour: ...@@ -559,9 +614,15 @@ MonoBehaviour:
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
<<<<<<< HEAD
m_Target: {x: -4.810031, y: -0.21807352, z: -2.0888672} m_Target: {x: -4.810031, y: -0.21807352, z: -2.0888672}
speed: 2 speed: 2
m_Value: {x: -4.810031, y: -0.21807352, z: -2.0888672} 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_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
...@@ -594,9 +655,15 @@ MonoBehaviour: ...@@ -594,9 +655,15 @@ 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:
<<<<<<< HEAD
m_Target: 5.5487404 m_Target: 5.5487404
speed: 2 speed: 2
m_Value: 5.5487404 m_Value: 5.5487404
=======
m_Target: 21.01
speed: 2
m_Value: 21.01
>>>>>>> origin/Release
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 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} {"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 \ No newline at end of file
Videojuegos_Proyecto/ProjectSettings/TagManager.asset
...@@ -12,6 +12,7 @@ TagManager: ...@@ -12,6 +12,7 @@ TagManager:
- Enemigo - Enemigo
- BalaGuitarra - BalaGuitarra
- BalaFlauta - BalaFlauta
- Caida
layers: layers:
- Default - Default
- TransparentFX - 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