Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

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

Merge branch 'Diseño_mejorado' into Release

parents fad6e199 55aa1d9d
Expand all
Inline Side-by-side
Showing with 389 additions and 16 deletions
Videojuegos_Proyecto/Assets/Materials.meta 0 → 100644
fileFormatVersion: 2
guid: ed5f47b0fda209146a5c298ecda531c1
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Materials/wallpaperbetter.com_1366x768.mat 0 → 100644
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: wallpaperbetter.com_1366x768
m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 67b94d9e10814f04084ec3bb1a296b99, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats: []
m_Colors: []
Videojuegos_Proyecto/Assets/Materials/wallpaperbetter.com_1366x768.mat.meta 0 → 100644
fileFormatVersion: 2
guid: 189bcdfa712167949a3e318f8b59b573
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Prefabs/Fondo.prefab 0 → 100644
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2429914073156678197
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2429914073156678199}
- component: {fileID: 2429914073156678198}
- component: {fileID: 2429914073156678216}
- component: {fileID: 2429914073156678217}
m_Layer: 0
m_Name: Fondo
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2429914073156678199
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2429914073156678197}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 14, y: 6, z: 0.1}
m_LocalScale: {x: 49.600002, y: 31, z: 31}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2429914073156678198
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2429914073156678197}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &2429914073156678216
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2429914073156678197}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 189bcdfa712167949a3e318f8b59b573, type: 2}
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: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!114 &2429914073156678217
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2429914073156678197}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3118c4ba59ead7c4eb535adfa14c088a, type: 3}
m_Name:
m_EditorClassIdentifier:
levels: []
choke: 0
scrollSpeed: 0
Videojuegos_Proyecto/Assets/Prefabs/Fondo.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: 4417f8144e464bb45814010dc6a47282
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Prefabs/bird2.prefab
......@@ -12,7 +12,7 @@ GameObject:
- component: {fileID: 106141263786386001}
- component: {fileID: 2873141825811658310}
- component: {fileID: 7291139446204041945}
m_Layer: 0
m_Layer: 8
m_Name: bird2
m_TagString: Enemigo
m_Icon: {fileID: 0}
......@@ -27,7 +27,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5491812872805336305}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 3.36, y: -1.94, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.25, y: 0.25, z: 1}
m_Children:
- {fileID: 6640576014206970634}
......@@ -70,7 +70,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingOrder: 6
m_Sprite: {fileID: 21300000, guid: de16d06edc034c049867de6e82b887a6, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 1
......@@ -134,7 +134,7 @@ GameObject:
m_Component:
- component: {fileID: 6640576014206970634}
- component: {fileID: 6640576014206970635}
m_Layer: 0
m_Layer: 8
m_Name: Target
m_TagString: Untagged
m_Icon: {fileID: 0}
......
Videojuegos_Proyecto/Assets/Prefabs/pl3x3(1) 1.prefab 0 → 100644
This diff could not be displayed because it is too large.
Videojuegos_Proyecto/Assets/Prefabs/pl3x3(1) 1.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: 573c59ed5a8ffa64fa2ddeb0cf02cab9
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Prefabs/pl3x3(1) 2.prefab 0 → 100644
This diff could not be displayed because it is too large.
Videojuegos_Proyecto/Assets/Prefabs/pl3x3(1) 2.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: ee276679859a70a45a44cc48e82e2088
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Prefabs/pl3x3(1).prefab.meta 0 → 100644
fileFormatVersion: 2
guid: 8e45a959aca065e4fadcde679461c558
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Scenes/SampleScene.unity
This diff could not be displayed because it is too large.
Videojuegos_Proyecto/Assets/Sprites/alfa.jpg.meta 0 → 100644
fileFormatVersion: 2
guid: f1e0e1ff91cf7f44db0eb1eff4f4771d
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 0
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: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: b3d05f2422d4afc469c672ff98d20123
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Sprites/wallpaperbetter.com_1366x768.jpg.meta 0 → 100644
fileFormatVersion: 2
guid: 67b94d9e10814f04084ec3bb1a296b99
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: -1
aniso: -1
mipBias: -100
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 0
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 069f3b30b2f2ae645bb472bddf01e16a
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Library/StateCache/Hierarchy/defd79-1d200f52dbbece14eb.json
{"m_ExpandedPrefabGameObjectFileIDs":[5491812872805336305],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
{"m_ExpandedPrefabGameObjectFileIDs":[5491812872805336305],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":5491812872805336305,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/Hierarchy/defd79-4a60d0ff4cd58a9409.json 0 → 100644
{"m_ExpandedPrefabGameObjectFileIDs":[3076439168672476359],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/Hierarchy/defd79-573c59ed5a8ffa64fa.json 0 → 100644
{"m_ExpandedPrefabGameObjectFileIDs":[9134560115837856740],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":154.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/Hierarchy/defd79-8d1a822faf6ebdb4fa.json
{"m_ExpandedPrefabGameObjectFileIDs":[9134560115837856740],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":9134560115837856740,"m_LastClickedInstanceID":0}
\ No newline at end of file
{"m_ExpandedPrefabGameObjectFileIDs":[9134560115837856740],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/Hierarchy/defd79-8e45a959aca065e4fa.json 0 → 100644
{"m_ExpandedPrefabGameObjectFileIDs":[9134560115837856740],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/Hierarchy/defd79-b26aa03f0b39dd64fb.json
{"m_ExpandedPrefabGameObjectFileIDs":[3200009508600319088],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":3200009508600319088,"m_LastClickedInstanceID":0}
\ No newline at end of file
{"m_ExpandedPrefabGameObjectFileIDs":[3200009508600319088],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/de700f-1d200f52dbbece14eb.json
{"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":3.5231449604034426,"y":-2.028820037841797,"z":-0.06494140625},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":3.291092872619629,"orthographic":true}
\ No newline at end of file
{"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":4.751542568206787,"y":-1.8054749965667725,"z":-0.665290355682373},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":6.866568088531494,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/de700f-4a60d0ff4cd58a9409.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":0.0,"y":0.0,"z":0.0},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":11.671928405761719,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/de700f-573c59ed5a8ffa64fa.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":3.6335129737854006,"y":-5.673349380493164,"z":-3.36328125},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":27.097248077392579,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/de700f-8e45a959aca065e4fa.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":0.28029128909111025,"y":-0.8055163025856018,"z":-0.384765625},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":4.825357437133789,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/de700f-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":24.73242950439453,"y":11.006038665771485,"z":-421.9140625},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":35.5428352355957,"orthographic":true}
\ No newline at end of file
{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":5.620826244354248,"y":-4.125052452087402,"z":-82.35240173339844},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":56.66680145263672,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe1.log
Base path: C:/Program Files/Unity/Hub/Editor/2019.1.11f1/Editor/Data
Base path: C:/Program Files/Unity/Editor/Data
Cmd: initializeCompiler
Cmd: compileSnippet
api=4 type=0 insize=1693 outsize=690 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
Videojuegos_Proyecto/Library/shadercompiler-UnityShaderCompiler.exe2.log
Base path: C:/Program Files/Unity/Hub/Editor/2019.1.11f1/Editor/Data
Base path: C:/Program Files/Unity/Editor/Data
Cmd: initializeCompiler
Cmd: compileSnippet
api=4 type=1 insize=1693 outsize=346 kw= pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment