Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

Go to a project
Commit 88de7131 by Álvaro Morales García
Options

Merge branch 'Musica' into Release

parents 70e1c2cd 070fd30f
Inline Side-by-side
Showing with 528 additions and 160 deletions
Videojuegos_Proyecto/Assembly-CSharp.csproj
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
<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>
<CscToolPath>C:\Program Files\Unity\Editor\Data\Tools\RoslynScripts</CscToolPath>
<CscToolExe>unity_csc.bat</CscToolExe>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
...@@ -54,6 +52,9 @@ ...@@ -54,6 +52,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>
...@@ -73,6 +74,7 @@ ...@@ -73,6 +74,7 @@
<Compile Include="Assets\Scripts\Enemigo1Move.cs" /> <Compile Include="Assets\Scripts\Enemigo1Move.cs" />
<Compile Include="Assets\Scripts\GuardarYCargar.cs" /> <Compile Include="Assets\Scripts\GuardarYCargar.cs" />
<Compile Include="Assets\Scripts\Jugador.cs" /> <Compile Include="Assets\Scripts\Jugador.cs" />
<Compile Include="Assets\Scripts\Musica.cs" />
<Compile Include="Assets\Scripts\PowerUp.cs" /> <Compile Include="Assets\Scripts\PowerUp.cs" />
<Compile Include="Assets\Scripts\ZonaFinal.cs" /> <Compile Include="Assets\Scripts\ZonaFinal.cs" />
<None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface-Mobile.shader" /> <None Include="Assets\MainMenu\TextMesh Pro\Resources\Shaders\TMP_SDF-Surface-Mobile.shader" />
...@@ -94,28 +96,28 @@ ...@@ -94,28 +96,28 @@
<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">
<HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath> <HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Cinemachine"> <Reference Include="Cinemachine">
<HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Cinemachine.dll</HintPath> <HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Cinemachine.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.TextMeshPro.Editor"> <Reference Include="Unity.TextMeshPro.Editor">
<HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath> <HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.Timeline"> <Reference Include="Unity.Timeline">
<HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath> <HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Timeline.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.CollabProxy.Editor"> <Reference Include="Unity.CollabProxy.Editor">
<HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll</HintPath> <HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="com.unity.cinemachine.editor"> <Reference Include="com.unity.cinemachine.editor">
<HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/com.unity.cinemachine.editor.dll</HintPath> <HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/com.unity.cinemachine.editor.dll</HintPath>
</Reference> </Reference>
<Reference Include="Unity.TextMeshPro"> <Reference Include="Unity.TextMeshPro">
<HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath> <HintPath>C:/Users/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
</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/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/ScriptAssemblies/Unity.Analytics.DataPrivacy.dll</HintPath>
</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,13 +303,13 @@ ...@@ -301,13 +303,13 @@
<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">
<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/alvmo/Documents/NetBeansProjects/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">
<HintPath>C:/Users/JC/Desktop/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.StandardEvents.dll</HintPath> <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>
<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/alvmo/Documents/NetBeansProjects/DesarrolloDeVideojuegos_Proyecto/Videojuegos_Proyecto/Library/PackageCache/com.unity.analytics@3.3.2/Unity.Analytics.Tracker.dll</HintPath>
</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/Music.meta 0 → 100644
fileFormatVersion: 2
guid: 340bc2dd96a3a13408f02ea9d9f6a36b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Music/MusicTales_MenuInicial.wav 0 → 100644
The file could not be displayed because it is too large.
Videojuegos_Proyecto/Assets/Music/MusicTales_MenuInicial.wav.meta 0 → 100644
fileFormatVersion: 2
guid: fe3f44e0bbc4be943802896e36ceaec1
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Prefabs/Musica.prefab 0 → 100644
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2114081506731414285
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2114081506731414287}
- component: {fileID: 2114081506731414284}
- component: {fileID: -3729884049664289227}
m_Layer: 0
m_Name: Musica
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2114081506731414287
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2114081506731414285}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2.8107114, y: -1.2284359, z: -161.03223}
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!82 &2114081506731414284
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2114081506731414285}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: fe3f44e0bbc4be943802896e36ceaec1, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!114 &-3729884049664289227
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2114081506731414285}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bc252f7a1dcca424d99046696f2f5335, type: 3}
m_Name:
m_EditorClassIdentifier:
Videojuegos_Proyecto/Assets/Prefabs/Musica.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: 8e30a5e6158f5374184178db3778780b
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Scenes/MenuInicial.unity
...@@ -277,6 +277,75 @@ CanvasRenderer: ...@@ -277,6 +277,75 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 20336598} m_GameObject: {fileID: 20336598}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1001 &380371351
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2114081506731414285, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_Name
value: Musica
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalPosition.x
value: -2.8107114
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.2284359
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalPosition.z
value: -161.03223
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8e30a5e6158f5374184178db3778780b, type: 3}
--- !u!1 &395722973 --- !u!1 &395722973
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
Videojuegos_Proyecto/Assets/Scenes/SampleScene.unity
...@@ -417,7 +417,7 @@ PrefabInstance: ...@@ -417,7 +417,7 @@ PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 1405820423}
m_Modifications: m_Modifications:
- target: {fileID: 5764835571609392104, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 5764835571609392104, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
...@@ -427,32 +427,32 @@ PrefabInstance: ...@@ -427,32 +427,32 @@ PrefabInstance:
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 93.1 value: 99.00452
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: -6.08 value: -5.5772977
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: 410.0614
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
...@@ -462,7 +462,7 @@ PrefabInstance: ...@@ -462,7 +462,7 @@ PrefabInstance:
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 1 value: 26
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
...@@ -481,85 +481,6 @@ PrefabInstance: ...@@ -481,85 +481,6 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, type: 3}
--- !u!1001 &272548703
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3326548381514800793, guid: 4cad856fb8f87054e8cb7d66b4d1e74e,
type: 3}
propertyPath: m_Name
value: EnemigoEjemplo
objectReference: {fileID: 0}
- target: {fileID: 3326548381514800793, guid: 4cad856fb8f87054e8cb7d66b4d1e74e,
type: 3}
propertyPath: m_TagString
value: Enemigo
objectReference: {fileID: 0}
- target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e,
type: 3}
propertyPath: m_LocalPosition.x
value: -5.95
objectReference: {fileID: 0}
- target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.85
objectReference: {fileID: 0}
- target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e,
type: 3}
propertyPath: m_RootOrder
value: 14
objectReference: {fileID: 0}
- target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3326548381514800795, guid: 4cad856fb8f87054e8cb7d66b4d1e74e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4435491010459611782, guid: 4cad856fb8f87054e8cb7d66b4d1e74e,
type: 3}
propertyPath: speed
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4cad856fb8f87054e8cb7d66b4d1e74e, type: 3}
--- !u!1001 &279952599 --- !u!1001 &279952599
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -634,7 +555,7 @@ PrefabInstance: ...@@ -634,7 +555,7 @@ PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 1405820423}
m_Modifications: m_Modifications:
- target: {fileID: 5764835571609392104, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 5764835571609392104, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
...@@ -644,32 +565,32 @@ PrefabInstance: ...@@ -644,32 +565,32 @@ PrefabInstance:
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 34.17 value: 40.074516
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: -5.967701 value: -5.4649987
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: 410.0614
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
...@@ -679,7 +600,7 @@ PrefabInstance: ...@@ -679,7 +600,7 @@ PrefabInstance:
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 2 value: 27
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
...@@ -1015,7 +936,7 @@ PrefabInstance: ...@@ -1015,7 +936,7 @@ PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 1405820423}
m_Modifications: m_Modifications:
- target: {fileID: 5764835571609392104, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 5764835571609392104, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
...@@ -1025,32 +946,32 @@ PrefabInstance: ...@@ -1025,32 +946,32 @@ PrefabInstance:
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 8.62 value: 14.52452
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: -5.9266033 value: -5.423901
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0 value: 410.0614
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
...@@ -1060,7 +981,7 @@ PrefabInstance: ...@@ -1060,7 +981,7 @@ PrefabInstance:
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 3 value: 28
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2, - target: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3} type: 3}
...@@ -1267,7 +1188,7 @@ PrefabInstance: ...@@ -1267,7 +1188,7 @@ PrefabInstance:
- target: {fileID: 9124563920809263083, guid: b1642f1f10f959a47b1be99970c634f0, - target: {fileID: 9124563920809263083, guid: b1642f1f10f959a47b1be99970c634f0,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 5 value: 2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9124563920809263083, guid: b1642f1f10f959a47b1be99970c634f0, - target: {fileID: 9124563920809263083, guid: b1642f1f10f959a47b1be99970c634f0,
type: 3} type: 3}
...@@ -1486,7 +1407,7 @@ Transform: ...@@ -1486,7 +1407,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: 13 m_RootOrder: 10
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:
...@@ -1650,6 +1571,12 @@ PrefabInstance: ...@@ -1650,6 +1571,12 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 726f1e301bb87004cb25690c7f76df9c, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 726f1e301bb87004cb25690c7f76df9c, type: 3}
--- !u!4 &996447437 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
m_PrefabInstance: {fileID: 400101886}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1011865892 --- !u!1001 &1011865892
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -2193,6 +2120,12 @@ Transform: ...@@ -2193,6 +2120,12 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 190603104927944265} m_PrefabInstance: {fileID: 190603104927944265}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!4 &1335166810 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
m_PrefabInstance: {fileID: 729691791}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1361939978 --- !u!1001 &1361939978
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -2469,8 +2402,11 @@ Transform: ...@@ -2469,8 +2402,11 @@ Transform:
- {fileID: 642251410} - {fileID: 642251410}
- {fileID: 1288388642} - {fileID: 1288388642}
- {fileID: 1793432113} - {fileID: 1793432113}
- {fileID: 1609103705}
- {fileID: 996447437}
- {fileID: 1335166810}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 7 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1407215725 --- !u!1001 &1407215725
PrefabInstance: PrefabInstance:
...@@ -3113,7 +3049,7 @@ RectTransform: ...@@ -3113,7 +3049,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 1234913245} - {fileID: 1234913245}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 9 m_RootOrder: 6
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}
...@@ -3189,6 +3125,12 @@ PrefabInstance: ...@@ -3189,6 +3125,12 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 726f1e301bb87004cb25690c7f76df9c, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 726f1e301bb87004cb25690c7f76df9c, type: 3}
--- !u!4 &1609103705 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 694183434271897141, guid: 3f846f2b1ae2eab4c8681ee81bf96ca2,
type: 3}
m_PrefabInstance: {fileID: 94979601}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1705288832 stripped --- !u!4 &1705288832 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 4575307605474950770, guid: 8d1a822faf6ebdb4fadb73791c65c824, m_CorrespondingSourceObject: {fileID: 4575307605474950770, guid: 8d1a822faf6ebdb4fadb73791c65c824,
...@@ -3495,6 +3437,75 @@ PrefabInstance: ...@@ -3495,6 +3437,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 &1847006298
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2114081506731414285, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_Name
value: Musica
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalPosition.x
value: -2.8107114
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.2284359
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalPosition.z
value: -161.03223
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_RootOrder
value: 12
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8e30a5e6158f5374184178db3778780b, type: 3}
--- !u!1 &1861221914 --- !u!1 &1861221914
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -3587,7 +3598,7 @@ RectTransform: ...@@ -3587,7 +3598,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 1891953901} - {fileID: 1891953901}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 11 m_RootOrder: 8
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}
...@@ -4328,7 +4339,7 @@ PrefabInstance: ...@@ -4328,7 +4339,7 @@ PrefabInstance:
- target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181, - target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 10 value: 7
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181, - target: {fileID: 2321382452776497401, guid: 642ab671e3040d74096e03fcf1c4e181,
type: 3} type: 3}
...@@ -4364,6 +4375,11 @@ PrefabInstance: ...@@ -4364,6 +4375,11 @@ PrefabInstance:
propertyPath: m_TagString propertyPath: m_TagString
value: PowerUpEffect value: PowerUpEffect
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8566976512845724115, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
propertyPath: playOnAwake
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2, - target: {fileID: 6944148303612405518, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
...@@ -4419,11 +4435,6 @@ PrefabInstance: ...@@ -4419,11 +4435,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8566976512845724115, guid: 72cf9991b7b52504aacba9be3a9b93f2,
type: 3}
propertyPath: playOnAwake
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 72cf9991b7b52504aacba9be3a9b93f2, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 72cf9991b7b52504aacba9be3a9b93f2, type: 3}
--- !u!1001 &3974070068923422014 --- !u!1001 &3974070068923422014
...@@ -4476,7 +4487,7 @@ PrefabInstance: ...@@ -4476,7 +4487,7 @@ PrefabInstance:
- target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995, - target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 12 value: 9
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995, - target: {fileID: 3974070068712710303, guid: 98edecaf87d755341a1c2ecc22082995,
type: 3} type: 3}
...@@ -4545,7 +4556,7 @@ PrefabInstance: ...@@ -4545,7 +4556,7 @@ PrefabInstance:
- target: {fileID: 5415114670227481227, guid: 38c9ae1c49230e24a82e867ab13d6345, - target: {fileID: 5415114670227481227, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 4 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5415114670227481227, guid: 38c9ae1c49230e24a82e867ab13d6345, - target: {fileID: 5415114670227481227, guid: 38c9ae1c49230e24a82e867ab13d6345,
type: 3} type: 3}
...@@ -4639,7 +4650,7 @@ PrefabInstance: ...@@ -4639,7 +4650,7 @@ PrefabInstance:
- target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a, - target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 8 value: 5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a, - target: {fileID: 4353308154281813180, guid: 8c9a12bd8973bfb47aa954f2fb6efa0a,
type: 3} type: 3}
...@@ -4807,7 +4818,7 @@ PrefabInstance: ...@@ -4807,7 +4818,7 @@ PrefabInstance:
- target: {fileID: 5557318670751642272, guid: 1c5aa891e36cd44419d73b6cb11aa315, - target: {fileID: 5557318670751642272, guid: 1c5aa891e36cd44419d73b6cb11aa315,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 6 value: 3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5557318670751642272, guid: 1c5aa891e36cd44419d73b6cb11aa315, - target: {fileID: 5557318670751642272, guid: 1c5aa891e36cd44419d73b6cb11aa315,
type: 3} type: 3}
...@@ -4957,7 +4968,7 @@ PrefabInstance: ...@@ -4957,7 +4968,7 @@ PrefabInstance:
- target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0, - target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 15 value: 11
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0, - target: {fileID: 8319826604163745470, guid: 9365b94df04b8da4d9758178654c30c0,
type: 3} type: 3}
......
Videojuegos_Proyecto/Assets/Scenes/SeleccionNivel.unity
...@@ -629,6 +629,75 @@ CanvasRenderer: ...@@ -629,6 +629,75 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 687002374} m_GameObject: {fileID: 687002374}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1001 &779997739
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2114081506731414285, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_Name
value: Musica
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalPosition.x
value: -2.8107114
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.2284359
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalPosition.z
value: -161.03223
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2114081506731414287, guid: 8e30a5e6158f5374184178db3778780b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8e30a5e6158f5374184178db3778780b, type: 3}
--- !u!1 &868349782 --- !u!1 &868349782
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
Videojuegos_Proyecto/Assets/Scripts/Musica.cs 0 → 100644
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Musica : MonoBehaviour
{
public static Musica musica;
private void Awake()
{
if (musica == null)
{
musica = this;
DontDestroyOnLoad(gameObject);
}else if (musica != null)
{
Destroy(gameObject);
}
}
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
}
}
Videojuegos_Proyecto/Assets/Scripts/Musica.cs.meta 0 → 100644
fileFormatVersion: 2
guid: bc252f7a1dcca424d99046696f2f5335
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Library/CurrentLayout.dwlt
...@@ -44,10 +44,10 @@ MonoBehaviour: ...@@ -44,10 +44,10 @@ MonoBehaviour:
y: 30 y: 30
width: 1920 width: 1920
height: 947 height: 947
m_MinSize: {x: 681, y: 494} m_MinSize: {x: 679, y: 494}
m_MaxSize: {x: 14002, y: 14044} m_MaxSize: {x: 14002, y: 14044}
vertical: 0 vertical: 0
controlID: 120 controlID: 99
--- !u!114 &3 --- !u!114 &3
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -215,10 +215,10 @@ MonoBehaviour: ...@@ -215,10 +215,10 @@ MonoBehaviour:
y: 0 y: 0
width: 1531 width: 1531
height: 947 height: 947
m_MinSize: {x: 406, y: 494} m_MinSize: {x: 404, y: 494}
m_MaxSize: {x: 10002, y: 14044} m_MaxSize: {x: 10002, y: 14044}
vertical: 1 vertical: 1
controlID: 121 controlID: 34
--- !u!114 &10 --- !u!114 &10
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -240,10 +240,10 @@ MonoBehaviour: ...@@ -240,10 +240,10 @@ MonoBehaviour:
y: 0 y: 0
width: 1531 width: 1531
height: 573 height: 573
m_MinSize: {x: 406, y: 222} m_MinSize: {x: 404, y: 222}
m_MaxSize: {x: 8006, y: 4022} m_MaxSize: {x: 8004, y: 4022}
vertical: 0 vertical: 0
controlID: 122 controlID: 35
--- !u!114 &11 --- !u!114 &11
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 52 m_ObjectHideFlags: 52
...@@ -336,20 +336,20 @@ MonoBehaviour: ...@@ -336,20 +336,20 @@ MonoBehaviour:
m_ShowAllHits: 0 m_ShowAllHits: 0
m_SearchArea: 1 m_SearchArea: 1
m_Folders: m_Folders:
- Assets/MainMenu - Assets/Prefabs
m_ViewMode: 1 m_ViewMode: 1
m_StartGridSize: 64 m_StartGridSize: 64
m_LastFolders: m_LastFolders:
- Assets/MainMenu - Assets/Prefabs
m_LastFoldersGridSize: -1 m_LastFoldersGridSize: -1
m_LastProjectPath: C:\Users\JC\Desktop\DesarrolloDeVideojuegos_Proyecto\Videojuegos_Proyecto m_LastProjectPath: C:\Users\alvmo\Documents\NetBeansProjects\DesarrolloDeVideojuegos_Proyecto\Videojuegos_Proyecto
m_LockTracker: m_LockTracker:
m_IsLocked: 0 m_IsLocked: 0
m_FolderTreeState: m_FolderTreeState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: 52320000 m_SelectedIDs: f4360000
m_LastClickedID: 12882 m_LastClickedID: 14068
m_ExpandedIDs: 000000003a2a00000a33000000ca9a3b m_ExpandedIDs: 00000000502c00001835000000ca9a3b
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -377,7 +377,7 @@ MonoBehaviour: ...@@ -377,7 +377,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: m_SelectedIDs:
m_LastClickedID: 0 m_LastClickedID: 0
m_ExpandedIDs: 000000003a2a0000 m_ExpandedIDs: 00000000502c000018350000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -404,7 +404,7 @@ MonoBehaviour: ...@@ -404,7 +404,7 @@ MonoBehaviour:
m_ListAreaState: m_ListAreaState:
m_SelectedInstanceIDs: m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0 m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 0 m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000382b000000000000 m_ExpandedInstanceIDs: c6230000382b000000000000
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
...@@ -497,9 +497,9 @@ MonoBehaviour: ...@@ -497,9 +497,9 @@ MonoBehaviour:
m_SceneHierarchy: m_SceneHierarchy:
m_TreeViewState: m_TreeViewState:
scrollPos: {x: 0, y: 0} scrollPos: {x: 0, y: 0}
m_SelectedIDs: da88ffff m_SelectedIDs:
m_LastClickedID: -30502 m_LastClickedID: 0
m_ExpandedIDs: 74fbffff m_ExpandedIDs: 48ddffffc2ddffff36deffff68deffff9adeffffc4e6ffffd4f9ffff82faffff
m_RenameOverlay: m_RenameOverlay:
m_UserAcceptedRename: 0 m_UserAcceptedRename: 0
m_Name: m_Name:
...@@ -559,9 +559,9 @@ MonoBehaviour: ...@@ -559,9 +559,9 @@ MonoBehaviour:
m_PlayAudio: 0 m_PlayAudio: 0
m_AudioPlay: 0 m_AudioPlay: 0
m_Position: m_Position:
m_Target: {x: -8.045736, y: 1.2080817, z: -161.03267} m_Target: {x: 17.940483, y: 1.6945136, z: -163.5933}
speed: 2 speed: 2
m_Value: {x: -8.045736, y: 1.2080817, z: -161.03267} m_Value: {x: 17.185574, y: 1.5686953, z: -163.45775}
m_RenderMode: 0 m_RenderMode: 0
m_CameraMode: m_CameraMode:
drawMode: 0 drawMode: 0
...@@ -594,9 +594,9 @@ MonoBehaviour: ...@@ -594,9 +594,9 @@ MonoBehaviour:
speed: 2 speed: 2
m_Value: {x: 0, y: 0, z: 0, w: 1} m_Value: {x: 0, y: 0, z: 0, w: 1}
m_Size: m_Size:
m_Target: 7.7299104 m_Target: 31.498034
speed: 2 speed: 2
m_Value: 7.7299104 m_Value: 30.141659
m_Ortho: m_Ortho:
m_Target: 1 m_Target: 1
speed: 2 speed: 2
......
Videojuegos_Proyecto/Library/StateCache/SceneView/4ba86f-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":-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} {"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}
\ No newline at end of file \ No newline at end of file
Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe0.log
Base path: C:/Program Files/Unity/Editor/Data Base path: C:/Program Files/Unity/Editor/Data
Cmd: initializeCompiler 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
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