Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit 70e1c2cd by Juan Carlos
Options

Merge branch 'Power_Ups' into Release

parents c5c6d1bf 8cf47d52
Inline Side-by-side
Showing with 504 additions and 471 deletions
Videojuegos_Proyecto/Assembly-CSharp.csproj
......@@ -2,11 +2,8 @@
<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>
......@@ -57,9 +54,6 @@
<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>
......@@ -100,7 +94,6 @@
<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">
......@@ -123,30 +116,6 @@
</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>
......@@ -332,7 +301,6 @@
<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">
......@@ -340,15 +308,6 @@
</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/Effects/PickAttack.prefab 0 → 100644
This diff could not be displayed because it is too large.
Videojuegos_Proyecto/Assets/Sprites/PowerUps.meta → Videojuegos_Proyecto/Assets/Effects/PickAttack.prefab.meta
fileFormatVersion: 2
guid: d344f8beb905eef4f9e03de1de88342f
folderAsset: yes
DefaultImporter:
guid: 72cf9991b7b52504aacba9be3a9b93f2
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
......
Videojuegos_Proyecto/Assets/Effects/PickInvulnerability.prefab
......@@ -26,7 +26,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 712684995694393650}
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
......@@ -804,7 +804,7 @@ ParticleSystem:
m_RotationOrder: 4
arc:
value: 360
mode: 0
mode: 2
spread: 0
speed:
serializedVersion: 2
......
Videojuegos_Proyecto/Assets/Effects/PickLife.prefab
......@@ -26,7 +26,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2346756237646661404}
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: -1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
......
Videojuegos_Proyecto/Assets/Player/Scripts/Player2D.cs
......@@ -25,6 +25,7 @@ public class Player2D : MonoBehaviour
public ParticleSystem efectoVida;
public ParticleSystem efectoVelocidad;
public ParticleSystem efectoInvulnerabilidad;
public ParticleSystem efectoAtaque;
// Start is called before the first frame update
void Start()
......@@ -231,4 +232,14 @@ public class Player2D : MonoBehaviour
{
efectoInvulnerabilidad.Stop();
}
public void EmpezarAnimacionAtaque()
{
efectoAtaque.Play();
}
public void AcabarAnimacionAtaque()
{
efectoAtaque.Stop();
}
}
Videojuegos_Proyecto/Assets/Prefabs/Ataque.prefab 0 → 100644
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8319826604163745464
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8319826604163745470}
- component: {fileID: 8319826604163745471}
- component: {fileID: 8124161828312065322}
- component: {fileID: 949298270689518643}
m_Layer: 0
m_Name: Ataque
m_TagString: PU_Ataque
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8319826604163745470
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8319826604163745464}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -7.13402, y: 0.97681314, 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!212 &8319826604163745471
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8319826604163745464}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 1591816466183293685, guid: 05935f63555950743bc5b132fe4a28b0,
type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.7, y: 0.7}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &8124161828312065322
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8319826604163745464}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d17f5df61c8d24f4aa460b500b46a5ac, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!61 &949298270689518643
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8319826604163745464}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.005110979, y: -0.15844202}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 0.7, y: 0.7}
newSize: {x: 0.7, y: 0.7}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.5262246, y: 0.3831159}
m_EdgeRadius: 0
Videojuegos_Proyecto/Assets/Prefabs/Ataque.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: 9365b94df04b8da4d9758178654c30c0
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Scenes/SampleScene.unity
......@@ -2718,20 +2718,92 @@ PrefabInstance:
propertyPath: m_Name
value: PickInvulnerability
objectReference: {fileID: 0}
- target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
propertyPath: ShapeModule.type
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
propertyPath: ShapeModule.m_Sprite
value:
objectReference: {fileID: 303064485153503272, guid: 05935f63555950743bc5b132fe4a28b0,
type: 3}
- target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
propertyPath: ShapeModule.placementMode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
propertyPath: InitialModule.startSize.scalar
value: 0.4
objectReference: {fileID: 0}
- target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
propertyPath: InitialModule.rotation3D
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
propertyPath: ShapeModule.radiusThickness
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
propertyPath: ShapeModule.m_MeshNormalOffset
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
propertyPath: UVModule.enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
propertyPath: UVModule.mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
propertyPath: UVModule.sprites.Array.data[0].sprite
value:
objectReference: {fileID: 303064485153503272, guid: 05935f63555950743bc5b132fe4a28b0,
type: 3}
- target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
propertyPath: ShapeModule.arc.mode
value: 2
objectReference: {fileID: 0}
- target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
propertyPath: InitialModule.startSpeed.scalar
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
propertyPath: InitialModule.startLifetime.scalar
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 6795832239293039480, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
propertyPath: ShapeModule.radius.value
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7207253405088338279, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
propertyPath: m_LocalPosition.x
value: -0.116
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7207253405088338279, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.912
value: 0.75
objectReference: {fileID: 0}
- target: {fileID: 7207253405088338279, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
propertyPath: m_LocalPosition.z
value: -4.03125
value: -1
objectReference: {fileID: 0}
- target: {fileID: 7207253405088338279, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
......@@ -2773,6 +2845,21 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4470096071008591614, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
- target: {fileID: 4470096071008591614, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4470096071008591614, guid: 537a38f03ae37734e8fe833077f59531,
type: 3}
propertyPath: m_MaxParticleSize
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 537a38f03ae37734e8fe833077f59531, type: 3}
--- !u!1001 &1519695202
......@@ -2787,15 +2874,30 @@ PrefabInstance:
propertyPath: m_Name
value: PickLife
objectReference: {fileID: 0}
- target: {fileID: 1631923658231038020, guid: be8437e4aefd8004ebc5d004b4ac4798,
type: 3}
propertyPath: InitialModule.startSize.scalar
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 1631923658231038020, guid: be8437e4aefd8004ebc5d004b4ac4798,
type: 3}
propertyPath: InitialModule.startLifetime.scalar
value: 0.7
objectReference: {fileID: 0}
- target: {fileID: 1631923658231038020, guid: be8437e4aefd8004ebc5d004b4ac4798,
type: 3}
propertyPath: InitialModule.startSpeed.scalar
value: 0.7
objectReference: {fileID: 0}
- target: {fileID: 6156087301233190797, guid: be8437e4aefd8004ebc5d004b4ac4798,
type: 3}
propertyPath: m_LocalPosition.x
value: -0.126
value: -0.112
objectReference: {fileID: 0}
- target: {fileID: 6156087301233190797, guid: be8437e4aefd8004ebc5d004b4ac4798,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.875
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6156087301233190797, guid: be8437e4aefd8004ebc5d004b4ac4798,
type: 3}
......@@ -3651,6 +3753,12 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8d1a822faf6ebdb4fadb73791c65c824, type: 3}
--- !u!198 &1935859694 stripped
ParticleSystem:
m_CorrespondingSourceObject: {fileID: 8566976512845724115, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
m_PrefabInstance: {fileID: 3638040982261033222}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1936763700
GameObject:
m_ObjectHideFlags: 0
......@@ -3965,20 +4073,25 @@ PrefabInstance:
propertyPath: m_Name
value: PickVelocity
objectReference: {fileID: 0}
- target: {fileID: 3127738502141577965, guid: 47e6ce82743488e40a8b3bb0615e28d9,
type: 3}
propertyPath: InitialModule.startSize.scalar
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 6564038301720355843, guid: 47e6ce82743488e40a8b3bb0615e28d9,
type: 3}
propertyPath: m_LocalPosition.x
value: -0.096
value: -0.084
objectReference: {fileID: 0}
- target: {fileID: 6564038301720355843, guid: 47e6ce82743488e40a8b3bb0615e28d9,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.063
value: 0.08
objectReference: {fileID: 0}
- target: {fileID: 6564038301720355843, guid: 47e6ce82743488e40a8b3bb0615e28d9,
type: 3}
propertyPath: m_LocalPosition.z
value: -4.03125
value: -1
objectReference: {fileID: 0}
- target: {fileID: 6564038301720355843, guid: 47e6ce82743488e40a8b3bb0615e28d9,
type: 3}
......@@ -4020,6 +4133,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6564038301720355843, guid: 47e6ce82743488e40a8b3bb0615e28d9,
type: 3}
propertyPath: m_LocalScale.x
value: 0.6
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 47e6ce82743488e40a8b3bb0615e28d9, type: 3}
--- !u!1001 &190603104927944265
......@@ -4229,6 +4347,85 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 642ab671e3040d74096e03fcf1c4e181, type: 3}
--- !u!1001 &3638040982261033222
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8077010286852682689}
m_Modifications:
- target: {fileID: 8792321243693318521, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
propertyPath: m_Name
value: PickAttack
objectReference: {fileID: 0}
- target: {fileID: 8792321243693318521, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
propertyPath: m_TagString
value: PowerUpEffect
objectReference: {fileID: 0}
- target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
propertyPath: m_LocalPosition.x
value: -0.08
objectReference: {fileID: 0}
- target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.8
objectReference: {fileID: 0}
- target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
propertyPath: m_LocalPosition.z
value: -1
objectReference: {fileID: 0}
- target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8566976512845724115, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
propertyPath: playOnAwake
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 72cf9991b7b52504aacba9be3a9b93f2, type: 3}
--- !u!1001 &3974070068923422014
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -4380,6 +4577,16 @@ PrefabInstance:
propertyPath: efectoInvulnerabilidad
value:
objectReference: {fileID: 907822432}
- target: {fileID: 5415114670227481231, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3}
propertyPath: ratioAtaqueFlauta
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5415114670227481231, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3}
propertyPath: efectoAtaque
value:
objectReference: {fileID: 1935859694}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 38c9ae1c49230e24a82e867ab13d6345, type: 3}
--- !u!1001 &4353308155033112225
......@@ -4700,3 +4907,72 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 4265212405810581834}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8319826604127891867
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8319826604163745464, guid: 9365b94df04b8da4d9758178654c30c0,
type: 3}
propertyPath: m_Name
value: Ataque
objectReference: {fileID: 0}
- target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
type: 3}
propertyPath: m_LocalPosition.x
value: -7.13402
objectReference: {fileID: 0}
- target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.97681314
objectReference: {fileID: 0}
- target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
type: 3}
propertyPath: m_RootOrder
value: 15
objectReference: {fileID: 0}
- target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9365b94df04b8da4d9758178654c30c0, type: 3}
Videojuegos_Proyecto/Assets/Scripts/Jugador.cs
......@@ -31,13 +31,8 @@ public class Jugador : MonoBehaviour
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
if (collision.tag == "Enemigo" && tInvulnerable<=0 && powerUpInvulnerable==false)
{
Dañado();
}
......
Videojuegos_Proyecto/Assets/Scripts/PowerUp.cs
......@@ -40,6 +40,15 @@ public class PowerUp : MonoBehaviour
Debug.Log("Las vidas del jugador son:"+ other.GetComponent<Jugador>().vidas);
Destroy(gameObject);
}
if (this.CompareTag("PU_Ataque"))
{
Debug.Log("El jugador ha chocado con el power up de ataque");
other.GetComponent<Player2D>().ratioAtaqueFlauta = 4.0f;
other.GetComponent<Player2D>().ratioAtaqueGuitarra = 4.0f;
other.GetComponent<Player2D>().ratioAtaqueMelee = 2.0f;
other.GetComponent<Player2D>().EmpezarAnimacionAtaque();
StartCoroutine(CogerAtaque(other));
}
}
}
......@@ -50,7 +59,7 @@ public class PowerUp : MonoBehaviour
IEnumerator CogerVelocidad(Collider2D player) {
DesactivarObjeto();
yield return new WaitForSeconds(5.0f);
yield return new WaitForSeconds(8.0f);
player.GetComponent<Player2D>().velocidadAlAndar = 3.0f;
player.GetComponent<Player2D>().AcabarAnimacionVelocidad();
Destroy(gameObject);
......@@ -59,9 +68,21 @@ public class PowerUp : MonoBehaviour
IEnumerator CogerInvulnerabilidad(Collider2D player)
{
DesactivarObjeto();
yield return new WaitForSeconds(5.0f);
yield return new WaitForSeconds(12.0f);
player.GetComponent<Jugador>().powerUpInvulnerable = false;
player.GetComponent<Player2D>().AcabarAnimacionInvulnerabilidad();
Destroy(gameObject);
}
IEnumerator CogerAtaque(Collider2D player)
{
DesactivarObjeto();
yield return new WaitForSeconds(10.0f);
player.GetComponent<Jugador>().powerUpInvulnerable = false;
player.GetComponent<Player2D>().AcabarAnimacionAtaque();
player.GetComponent<Player2D>().ratioAtaqueFlauta = 2.0f;
player.GetComponent<Player2D>().ratioAtaqueGuitarra = 2.0f;
player.GetComponent<Player2D>().ratioAtaqueMelee = 1.0f;
Destroy(gameObject);
}
}
Videojuegos_Proyecto/Assets/Sprites/PowerUps/Invincible.png.meta deleted 100644 → 0
fileFormatVersion: 2
guid: 64b323039f7dc22428fb7e08664ab46e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 3
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 4
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline:
- - {x: 0, y: 2}
- {x: -1.7320509, y: 0.99999994}
- {x: -1.7320508, y: -1.0000001}
- {x: 0.00000017484555, y: -2}
- {x: 1.7320509, y: -0.9999998}
- {x: 1.7320509, y: 0.9999998}
physicsShape:
- - {x: 0, y: 2}
- {x: -1.7320509, y: 0.99999994}
- {x: -1.7320508, y: -1.0000001}
- {x: 0.00000017484555, y: -2}
- {x: 1.7320509, y: -0.9999998}
- {x: 1.7320509, y: 0.9999998}
bones: []
spriteID: 02af9a0245567c940b7adbdbce1a493f
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Sprites/PowerUps/MoveFaster.png.meta deleted 100644 → 0
fileFormatVersion: 2
guid: c114eead74e12a24d85c97170e4065a4
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 3
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 4
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline:
- - {x: 0, y: 2}
- {x: -1.7320508, y: -1.0000001}
- {x: 1.7320509, y: -0.9999998}
physicsShape:
- - {x: 0, y: 2}
- {x: -1.7320508, y: -1.0000001}
- {x: 1.7320509, y: -0.9999998}
bones: []
spriteID: 48bf205162e2d0d4481c022df72264bb
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Sprites/PowerUps/RecoverLife.png.meta deleted 100644 → 0
fileFormatVersion: 2
guid: 31a885f785940fa4faf757a7d0cb3c2e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 3
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 4
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 4
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline:
- - {x: -2, y: -2}
- {x: -2, y: 2}
- {x: 2, y: 2}
- {x: 2, y: -2}
physicsShape:
- - {x: -2, y: -2}
- {x: -2, y: 2}
- {x: 2, y: 2}
- {x: 2, y: -2}
bones: []
spriteID: 62b0704109fa1554da27b37e501c87d2
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Library/CurrentLayout.dwlt
......@@ -44,17 +44,10 @@ MonoBehaviour:
y: 30
width: 1920
height: 947
<<<<<<< HEAD
m_MinSize: {x: 683, y: 494}
m_MaxSize: {x: 14004, y: 14044}
m_MinSize: {x: 681, y: 494}
m_MaxSize: {x: 14002, y: 14044}
vertical: 0
controlID: 79
=======
m_MinSize: {x: 679, y: 344}
m_MaxSize: {x: 12004, y: 8044}
vertical: 0
controlID: 54
>>>>>>> origin/Release
controlID: 120
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -74,8 +67,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}
......@@ -125,7 +118,6 @@ MonoBehaviour:
x: 0
y: 573
width: 1531
<<<<<<< HEAD
height: 374
m_MinSize: {x: 232, y: 272}
m_MaxSize: {x: 10002, y: 10022}
......@@ -134,17 +126,7 @@ 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
m_LastSelected: 1
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -233,15 +215,10 @@ 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: 55
controlID: 121
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -266,7 +243,7 @@ MonoBehaviour:
m_MinSize: {x: 406, y: 222}
m_MaxSize: {x: 8006, y: 4022}
vertical: 0
controlID: 33
controlID: 122
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -285,15 +262,9 @@ 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}
......@@ -365,52 +336,36 @@ MonoBehaviour:
m_ShowAllHits: 0
m_SearchArea: 1
m_Folders:
<<<<<<< HEAD
- Assets/Effects
- Assets/MainMenu
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- Assets/Effects
- Assets/MainMenu
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_SelectedIDs: 52320000
m_LastClickedID: 12882
m_ExpandedIDs: 000000003a2a00000a33000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name: Scripts
m_OriginalName: Scripts
m_Name:
m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: 12856
m_UserData: 0
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 5}
m_ClientGUIView: {fileID: 0}
m_SearchString:
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
......@@ -422,11 +377,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
<<<<<<< HEAD
m_ExpandedIDs: 00000000662a0000
=======
m_ExpandedIDs: 00000000642d0000
>>>>>>> origin/Release
m_ExpandedIDs: 000000003a2a0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -451,10 +402,10 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
m_SelectedInstanceIDs: 0e440000
m_LastClickedInstanceID: 17422
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000382b000000000000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
......@@ -470,7 +421,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 0}
m_ClientGUIView: {fileID: 5}
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
m_InstanceID: 0
......@@ -480,7 +431,7 @@ MonoBehaviour:
m_NewAssetIndexInList: -1
m_ScrollPosition: {x: 0, y: 0}
m_GridSize: 64
m_DirectoriesAreaWidth: 115
m_DirectoriesAreaWidth: 222
--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -546,38 +497,32 @@ 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_SelectedIDs: da88ffff
m_LastClickedID: -30502
m_ExpandedIDs: 74fbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name: GameObject
m_OriginalName: GameObject
m_Name:
m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: -6684
m_UserData: 0
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 0}
m_ClientGUIView: {fileID: 3}
m_SearchString:
m_ExpandedScenes: []
m_CurrenRootInstanceID: 0
m_LockTracker:
m_IsLocked: 0
m_CurrentSortingName: TransformSorting
m_WindowGUID: 29a1ae5ed2e786e46ab464313a854c6e
m_WindowGUID: cf3b61c3a385de7479efe14818e50265
--- !u!114 &16
MonoBehaviour:
m_ObjectHideFlags: 52
......@@ -605,7 +550,7 @@ MonoBehaviour:
height: 554
m_ViewDataDictionary: {fileID: 0}
m_ShowContextualTools: 0
m_WindowGUID: d2fa7bccd99ad644c90c32d37501e809
m_WindowGUID: 4ba86f2f34ca3b44b989fe737b3c2e65
m_Gizmos: 1
m_SceneIsLit: 1
m_SceneLighting: 1
......@@ -614,15 +559,9 @@ 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}
m_Target: {x: -8.045736, y: 1.2080817, z: -161.03267}
speed: 2
m_Value: {x: 18.764812, y: -2.7877026, z: -0.078125}
>>>>>>> origin/Release
m_Value: {x: -8.045736, y: 1.2080817, z: -161.03267}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
......@@ -655,15 +594,9 @@ MonoBehaviour:
speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size:
<<<<<<< HEAD
m_Target: 5.5487404
m_Target: 7.7299104
speed: 2
m_Value: 5.5487404
=======
m_Target: 21.01
speed: 2
m_Value: 21.01
>>>>>>> origin/Release
m_Value: 7.7299104
m_Ortho:
m_Target: 1
speed: 2
......@@ -790,8 +723,8 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
x: 8
y: 718
width: 1366
height: 308
x: 0
y: 646
width: 1531
height: 355
m_ViewDataDictionary: {fileID: 0}
Videojuegos_Proyecto/Library/StateCache/Hierarchy/cf3b61-mainStage.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/4ba86f-mainStage.json 0 → 100644
{"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}
\ No newline at end of file
Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe0.log
Base path: C:/Program Files/Unity/Editor/Data
Cmd: initializeCompiler
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
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=934 outsize=250 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
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/ProjectSettings/TagManager.asset
......@@ -13,6 +13,8 @@ TagManager:
- BalaGuitarra
- BalaFlauta
- Caida
- PowerUpEffect
- PU_Ataque
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