Skip to content

Álvaro Morales García / DesarrolloDeVideojuegos_Proyecto

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

Merge branch 'Release' into Cambio_musica

parents 2ab60259 fa6ee123
Expand all
Inline Side-by-side
Showing with 612 additions and 191 deletions
Videojuegos_Proyecto/Assets/CambioCancion.cs
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.SceneManagement;
public class CambioCancion : MonoBehaviour public class CambioCancion : MonoBehaviour
{ {
private void Awake() private void Awake()
{ {
Musica.CambiarCancion(); if (SceneManager.GetActiveScene().name == "SampleScene")
{
Musica.CancionNivel1();
}else if(SceneManager.GetActiveScene().name == "SampleScene")
{
Musica.CancionMenuInicial();
}
} }
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
......
Videojuegos_Proyecto/Assets/Player/Prefabs/DisparoBlanca.prefab
...@@ -71,7 +71,7 @@ SpriteRenderer: ...@@ -71,7 +71,7 @@ SpriteRenderer:
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: e9c06e11f5d9bcc44921792ff353b4d1, type: 3} m_Sprite: {fileID: 21300000, guid: 8a239ba9e303e21428ca79f5c55f41bb, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0
......
Videojuegos_Proyecto/Assets/Player/Prefabs/DisparosCorcheas.prefab
...@@ -28,7 +28,7 @@ Transform: ...@@ -28,7 +28,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6213653337795431907} m_GameObject: {fileID: 6213653337795431907}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.435, y: -0.37, z: 0.19049238} m_LocalPosition: {x: 0.269, y: -0.37, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 6213653338870641997} m_Father: {fileID: 6213653338870641997}
...@@ -71,7 +71,7 @@ SpriteRenderer: ...@@ -71,7 +71,7 @@ SpriteRenderer:
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 331db871b21c0e345bb9835b86ffe195, type: 3} m_Sprite: {fileID: 21300000, guid: e643b1b5a428e6544aedf31a76d77ce3, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0
...@@ -95,7 +95,7 @@ CircleCollider2D: ...@@ -95,7 +95,7 @@ CircleCollider2D:
m_IsTrigger: 1 m_IsTrigger: 1
m_UsedByEffector: 0 m_UsedByEffector: 0
m_UsedByComposite: 0 m_UsedByComposite: 0
m_Offset: {x: -0.14091825, y: -0.19} m_Offset: {x: 0.02, y: -0.13}
serializedVersion: 2 serializedVersion: 2
m_Radius: 0.22293472 m_Radius: 0.22293472
--- !u!50 &6213653337795431837 --- !u!50 &6213653337795431837
...@@ -131,8 +131,6 @@ MonoBehaviour: ...@@ -131,8 +131,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9e842bc08877b954da64c1162f355a16, type: 3} m_Script: {fileID: 11500000, guid: 9e842bc08877b954da64c1162f355a16, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
prefabColeccionable: {fileID: 6914436123365519657, guid: bb9f2d39e14ac4c4493c44a6cc1ddc3b,
type: 3}
--- !u!1 &6213653338870642002 --- !u!1 &6213653338870642002
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -159,7 +157,7 @@ Transform: ...@@ -159,7 +157,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6213653338870642002} m_GameObject: {fileID: 6213653338870642002}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -6.648, y: 0.46, z: -0.19049238} m_LocalPosition: {x: -6.648, y: 0.46, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 8947049118033219703} - {fileID: 8947049118033219703}
...@@ -210,7 +208,7 @@ SpriteRenderer: ...@@ -210,7 +208,7 @@ SpriteRenderer:
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0
m_DrawMode: 0 m_DrawMode: 0
m_Size: {x: 1, y: 1} m_Size: {x: 1.2, y: 1.04}
m_AdaptiveModeThreshold: 0.5 m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0 m_SpriteTileMode: 0
m_WasSpriteAssigned: 0 m_WasSpriteAssigned: 0
...@@ -261,7 +259,7 @@ Transform: ...@@ -261,7 +259,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7049028587734106852} m_GameObject: {fileID: 7049028587734106852}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.44, y: 0.127, z: 0.19049238} m_LocalPosition: {x: 0.263, y: 0.127, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 6213653338870641997} m_Father: {fileID: 6213653338870641997}
...@@ -304,7 +302,7 @@ SpriteRenderer: ...@@ -304,7 +302,7 @@ SpriteRenderer:
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 331db871b21c0e345bb9835b86ffe195, type: 3} m_Sprite: {fileID: 21300000, guid: e643b1b5a428e6544aedf31a76d77ce3, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0
...@@ -328,9 +326,9 @@ CircleCollider2D: ...@@ -328,9 +326,9 @@ CircleCollider2D:
m_IsTrigger: 1 m_IsTrigger: 1
m_UsedByEffector: 0 m_UsedByEffector: 0
m_UsedByComposite: 0 m_UsedByComposite: 0
m_Offset: {x: -0.14091825, y: -0.19} m_Offset: {x: 0.024651527, y: -0.1397379}
serializedVersion: 2 serializedVersion: 2
m_Radius: 0.22293472 m_Radius: 0.17267275
--- !u!50 &3335880786866950795 --- !u!50 &3335880786866950795
Rigidbody2D: Rigidbody2D:
serializedVersion: 4 serializedVersion: 4
...@@ -364,8 +362,6 @@ MonoBehaviour: ...@@ -364,8 +362,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9e842bc08877b954da64c1162f355a16, type: 3} m_Script: {fileID: 11500000, guid: 9e842bc08877b954da64c1162f355a16, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
prefabColeccionable: {fileID: 6914436123365519657, guid: bb9f2d39e14ac4c4493c44a6cc1ddc3b,
type: 3}
--- !u!1 &8566419871933135904 --- !u!1 &8566419871933135904
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -394,7 +390,7 @@ Transform: ...@@ -394,7 +390,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8566419871933135904} m_GameObject: {fileID: 8566419871933135904}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.445, y: 0.593, z: 0.19049238} m_LocalPosition: {x: 0.262, y: 0.593, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 6213653338870641997} m_Father: {fileID: 6213653338870641997}
...@@ -436,8 +432,8 @@ SpriteRenderer: ...@@ -436,8 +432,8 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 2
m_Sprite: {fileID: 21300000, guid: 331db871b21c0e345bb9835b86ffe195, type: 3} m_Sprite: {fileID: 21300000, guid: e643b1b5a428e6544aedf31a76d77ce3, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0
...@@ -461,9 +457,9 @@ CircleCollider2D: ...@@ -461,9 +457,9 @@ CircleCollider2D:
m_IsTrigger: 1 m_IsTrigger: 1
m_UsedByEffector: 0 m_UsedByEffector: 0
m_UsedByComposite: 0 m_UsedByComposite: 0
m_Offset: {x: -0.14091825, y: -0.19} m_Offset: {x: 0.027607918, y: -0.12}
serializedVersion: 2 serializedVersion: 2
m_Radius: 0.22293472 m_Radius: 0.19041204
--- !u!50 &7499365014849002184 --- !u!50 &7499365014849002184
Rigidbody2D: Rigidbody2D:
serializedVersion: 4 serializedVersion: 4
...@@ -497,5 +493,3 @@ MonoBehaviour: ...@@ -497,5 +493,3 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9e842bc08877b954da64c1162f355a16, type: 3} m_Script: {fileID: 11500000, guid: 9e842bc08877b954da64c1162f355a16, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
prefabColeccionable: {fileID: 6914436123365519657, guid: bb9f2d39e14ac4c4493c44a6cc1ddc3b,
type: 3}
Videojuegos_Proyecto/Assets/Player/Scripts/Player2D.cs
...@@ -65,7 +65,7 @@ public class Player2D : MonoBehaviour ...@@ -65,7 +65,7 @@ public class Player2D : MonoBehaviour
{ {
if (Input.GetKeyDown(KeyCode.K)) { AtaqueMelee(); } if (Input.GetKeyDown(KeyCode.K)) { AtaqueMelee(); }
} }
Debug.Log(Coleccionables.niActual);
nColeccionablesCanvas.text=Coleccionables.cConseguidos[Coleccionables.niActual] + "/" + Coleccionables.cTotales[Coleccionables.niActual]; nColeccionablesCanvas.text=Coleccionables.cConseguidos[Coleccionables.niActual] + "/" + Coleccionables.cTotales[Coleccionables.niActual];
} }
......
Videojuegos_Proyecto/Assets/Player/Sprites/Ataque Blanca.png.meta 0 → 100644
fileFormatVersion: 2
guid: 46c6868677b157f4c8a90cb1dbd0ac41
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: 1700
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
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Windows Store Apps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: WebGL
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: ec53fc940b137394aa915df65a7e47af
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Player/Sprites/blancaAmarilla.png.meta 0 → 100644
fileFormatVersion: 2
guid: 8a239ba9e303e21428ca79f5c55f41bb
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: 1700
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
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Windows Store Apps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: WebGL
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: 41e0248556f3f7b40b35a3dbe3903ea1
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Player/Sprites/corcheasRojas.png.meta 0 → 100644
fileFormatVersion: 2
guid: e643b1b5a428e6544aedf31a76d77ce3
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: 1000
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
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Windows Store Apps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: WebGL
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: f75064775e032f84d9110a169c301f7a
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
Videojuegos_Proyecto/Assets/Prefabs/Fondo.prefab
...@@ -11,7 +11,6 @@ GameObject: ...@@ -11,7 +11,6 @@ GameObject:
- component: {fileID: 2429914073156678199} - component: {fileID: 2429914073156678199}
- component: {fileID: 2429914073156678198} - component: {fileID: 2429914073156678198}
- component: {fileID: 2429914073156678216} - component: {fileID: 2429914073156678216}
- component: {fileID: 2429914073156678217}
m_Layer: 0 m_Layer: 0
m_Name: Fondo m_Name: Fondo
m_TagString: Untagged m_TagString: Untagged
...@@ -78,18 +77,3 @@ MeshRenderer: ...@@ -78,18 +77,3 @@ MeshRenderer:
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 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/GameManager.prefab
...@@ -10,7 +10,6 @@ GameObject: ...@@ -10,7 +10,6 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 7736364748447018736} - component: {fileID: 7736364748447018736}
- component: {fileID: 3174322665456641310} - component: {fileID: 3174322665456641310}
- component: {fileID: 1646803205624574402}
- component: {fileID: 8228429523814113897} - component: {fileID: 8228429523814113897}
m_Layer: 0 m_Layer: 0
m_Name: GameManager m_Name: GameManager
...@@ -63,19 +62,7 @@ MonoBehaviour: ...@@ -63,19 +62,7 @@ MonoBehaviour:
- {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0}
--- !u!114 &1646803205624574402 - {x: 0, y: 0, z: 0}
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7736364748447018738}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1907c97001aad5943a7c511192d2d99c, type: 3}
m_Name:
m_EditorClassIdentifier:
enemigo: {fileID: 3326548381514800793, guid: 4cad856fb8f87054e8cb7d66b4d1e74e, type: 3}
--- !u!114 &8228429523814113897 --- !u!114 &8228429523814113897
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
Videojuegos_Proyecto/Assets/Scenes/MenuInicial.unity
...@@ -546,6 +546,49 @@ MonoBehaviour: ...@@ -546,6 +546,49 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 58d5adfa0c93ba04d92e7b5bd7b4a679, type: 3} m_Script: {fileID: 11500000, guid: 58d5adfa0c93ba04d92e7b5bd7b4a679, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!1 &581815968
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 581815970}
- component: {fileID: 581815969}
m_Layer: 0
m_Name: GameManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &581815969
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 581815968}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 379826b7faee1344895a77dab75ab357, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &581815970
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 581815968}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 28.230677, y: -5.145041, z: -82.35156}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &667592360 --- !u!1 &667592360
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
Videojuegos_Proyecto/Assets/Scenes/SampleScene.unity
...@@ -680,28 +680,6 @@ PrefabInstance: ...@@ -680,28 +680,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!1 &114766502 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5882668262686217671, guid: b1642f1f10f959a47b1be99970c634f0,
type: 3}
m_PrefabInstance: {fileID: 835272209}
m_PrefabAsset: {fileID: 0}
--- !u!114 &114766507
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 114766502}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3118c4ba59ead7c4eb535adfa14c088a, type: 3}
m_Name:
m_EditorClassIdentifier:
levels:
- {fileID: 2099000709}
choke: 0.25
scrollSpeed: 0
--- !u!1 &115912474 --- !u!1 &115912474
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -9577,12 +9555,6 @@ CanvasRenderer: ...@@ -9577,12 +9555,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2081132387} m_GameObject: {fileID: 2081132387}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1 &2099000709 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2429914073156678197, guid: 4417f8144e464bb45814010dc6a47282,
type: 3}
m_PrefabInstance: {fileID: 959049066}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2099000713 stripped --- !u!4 &2099000713 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 2429914073156678199, guid: 4417f8144e464bb45814010dc6a47282, m_CorrespondingSourceObject: {fileID: 2429914073156678199, guid: 4417f8144e464bb45814010dc6a47282,
......
Videojuegos_Proyecto/Assets/Scripts/Coleccionables.cs
...@@ -52,7 +52,8 @@ public class Coleccionables : MonoBehaviour ...@@ -52,7 +52,8 @@ public class Coleccionables : MonoBehaviour
//Habria que para cada nivel completar estas variables de cada array //Habria que para cada nivel completar estas variables de cada array
// TOCAR AQUI{ // TOCAR AQUI{
enemigosTotales[0] = GameObject.Find("Enemigos").transform.childCount; if (niActual == 0 && SceneManager.GetActiveScene().name != "SeleccionNivel" && SceneManager.GetActiveScene().name != "MenuExtras")
{ enemigosTotales[0] = GameObject.Find("Enemigos").transform.childCount; }
nombreImagenPartitura[0] = "Partitura-completa-1"; nombreImagenPartitura[0] = "Partitura-completa-1";
coleccTotales[0] = 6; //El ultimo coleccionable se consigue al derrotar a todos los enemigos, asi que aqui abajo hay el numero de coleccTotales - 1 de coleccionables coleccTotales[0] = 6; //El ultimo coleccionable se consigue al derrotar a todos los enemigos, asi que aqui abajo hay el numero de coleccTotales - 1 de coleccionables
posicionesColecNivel1[0] = new Vector3(-5.48f, 0.01f, 0); posicionesColecNivel1[0] = new Vector3(-5.48f, 0.01f, 0);
......
Videojuegos_Proyecto/Assets/Scripts/Musica.cs
...@@ -55,7 +55,7 @@ public class Musica : MonoBehaviour ...@@ -55,7 +55,7 @@ public class Musica : MonoBehaviour
} }
//Declaramos como estático para poder llamar desde otros scripts. //Declaramos como estático para poder llamar desde otros scripts.
public static void CambiarCancion() public static void CancionNivel1()
{ {
//Cambiamos el audio y ajustamos el volumen. //Cambiamos el audio y ajustamos el volumen.
AudioSource audio = musica.GetComponent<AudioSource>(); AudioSource audio = musica.GetComponent<AudioSource>();
...@@ -66,5 +66,16 @@ public class Musica : MonoBehaviour ...@@ -66,5 +66,16 @@ public class Musica : MonoBehaviour
audio.Play(); audio.Play();
} }
public static void CancionMenuInicial()
{
//Cambiamos el audio y ajustamos el volumen.
AudioSource audio = musica.GetComponent<AudioSource>();
audio.clip = Resources.Load("Musica/Juego/MusicTales_MenuInicial") as AudioClip;
audio.volume = 0.2f;
audio.Play();
}
} }
Videojuegos_Proyecto/Library/StateCache/Hierarchy/defd79-1f95e6a67b369a549b.json 0 → 100644
{"m_ExpandedPrefabGameObjectFileIDs":[6213653338870642002],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/Hierarchy/defd79-4417f8144e464bb458.json 0 → 100644
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":2429914073156678197,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/Hierarchy/defd79-4eada546b3029f24ea.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/Hierarchy/defd79-b1642f1f10f959a47b.json 0 → 100644
{"m_ExpandedPrefabGameObjectFileIDs":[7293530335538204619],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/Hierarchy/defd79-c299a511f2a249142a.json 0 → 100644
{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[],"m_ScrollY":0.0,"m_LastClickedFileID":7736364748447018738,"m_LastClickedInstanceID":0}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/de700f-1f95e6a67b369a549b.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":-6.057436943054199,"y":0.5859655737876892,"z":-0.08586958050727844},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":4.033257961273193,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/de700f-4417f8144e464bb458.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":14.000000953674317,"y":6.0,"z":0.10000000149011612},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":96.50963592529297,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/de700f-4eada546b3029f24ea.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":1.5761827230453492,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/de700f-b1642f1f10f959a47b.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.6135504841804504,"y":0.07508689165115357,"z":-3.634765625},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":22.0,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/de700f-c299a511f2a249142a.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":-14.600000381469727,"y":-0.04816645011305809,"z":-0.708984375},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":22.0,"orthographic":true}
\ No newline at end of file
Videojuegos_Proyecto/Library/StateCache/SceneView/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":28.230676651000978,"y":-5.145040988922119,"z":-82.3515625},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":56.66680145263672,"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":3.328054189682007,"y":-0.7149327397346497,"z":-0.2722044885158539},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":7.267989635467529,"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/Hub/Editor/2019.1.11f1/Editor/Data
Cmd: initializeCompiler Cmd: initializeCompiler
Videojuegos_Proyecto/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache
5677b36a787168034f6783b5b09faa2215fa34f5 ce645e206ec2202807a47845b14e4a701aad2fea
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