From df375bd8c9691f70a3604b72c0dc64bd7f9873a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20G=C3=B3mez?= Date: Tue, 22 Mar 2016 20:52:25 -0500 Subject: [PATCH] =?UTF-8?q?Se=20corrigi=C3=B3=20problema=20con=20GameManag?= =?UTF-8?q?er=20en=20escenario=20peque=C3=B1o.=20Se=20configur=C3=B3=20tex?= =?UTF-8?q?turas=20para=20que=20en=20versi=C3=B3n=20WebGL=20se=20usen=20co?= =?UTF-8?q?n=20un=20menor=20tama=C3=B1o,=20permitiendo=20generar=20ejecuta?= =?UTF-8?q?bles=20WebGL=20de=20menos=20de=2050MB=20sin=20quitar=20nada=20m?= =?UTF-8?q?=C3=A1s.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Textures/BedV1_Mattress.png.meta | 13 +++- .../Textures/BedV1_Mattress_height.png.meta | 13 +++- .../Textures/BedV1_Mattress_normal.png.meta | 13 +++- .../BedV1_Mattress_occlusion.png.meta | 13 +++- .../Medieval props/Textures/BenchV1.png.meta | 13 +++- .../Textures/BenchV1_height.png.meta | 13 +++- .../Textures/BenchV1_normal.png.meta | 13 +++- .../Textures/BenchV1_occlusion.png.meta | 13 +++- .../Medieval props/Textures/CandleV1.png.meta | 13 +++- .../Textures/CandleV1_normal.png.meta | 13 +++- .../Textures/MetalV3_Tilled_difuse.png.meta | 13 +++- .../Textures/MetalV3_Tilled_height.png.meta | 13 +++- .../Textures/MetalV3_Tilled_normal.png.meta | 13 +++- .../MetalV3_Tilled_occlusion.png.meta | 13 +++- .../Textures/MugV1_normal.png.meta | 13 +++- .../Medieval props/Textures/PotV1.png.meta | 13 +++- .../Textures/PotV1_height.png.meta | 13 +++- .../Textures/PotV1_normal.png.meta | 13 +++- .../Textures/PotV1_occlusion.png.meta | 13 +++- .../Textures/WoodV3_Tilled_normal.png.meta | 13 +++- Assets/Prefabs.meta | 9 +++ Assets/Prefabs/GameManager.prefab | 60 +++++++++++++++++++ Assets/Prefabs/GameManager.prefab.meta | 8 +++ Assets/Scenes/room-pfiguero-small.unity | 58 +++++++++++++++--- .../Textures/EthanNormals.png.meta | 14 ++++- .../Textures/EthanOcclusion.png.meta | 14 ++++- ProjectSettings/EditorBuildSettings.asset | 8 +-- ProjectSettings/ProjectVersion.txt | 2 +- 28 files changed, 354 insertions(+), 79 deletions(-) create mode 100644 Assets/Prefabs.meta create mode 100644 Assets/Prefabs/GameManager.prefab create mode 100644 Assets/Prefabs/GameManager.prefab.meta diff --git a/Assets/3rdParty/Medieval props/Textures/BedV1_Mattress.png.meta b/Assets/3rdParty/Medieval props/Textures/BedV1_Mattress.png.meta index 0a27acde..d8b424b5 100644 --- a/Assets/3rdParty/Medieval props/Textures/BedV1_Mattress.png.meta +++ b/Assets/3rdParty/Medieval props/Textures/BedV1_Mattress.png.meta @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,18 +37,25 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: -1 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 256 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/3rdParty/Medieval props/Textures/BedV1_Mattress_height.png.meta b/Assets/3rdParty/Medieval props/Textures/BedV1_Mattress_height.png.meta index e8da9ce6..28d233a0 100644 --- a/Assets/3rdParty/Medieval props/Textures/BedV1_Mattress_height.png.meta +++ b/Assets/3rdParty/Medieval props/Textures/BedV1_Mattress_height.png.meta @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,18 +37,25 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: -1 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 256 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/3rdParty/Medieval props/Textures/BedV1_Mattress_normal.png.meta b/Assets/3rdParty/Medieval props/Textures/BedV1_Mattress_normal.png.meta index 46682135..f0407532 100644 --- a/Assets/3rdParty/Medieval props/Textures/BedV1_Mattress_normal.png.meta +++ b/Assets/3rdParty/Medieval props/Textures/BedV1_Mattress_normal.png.meta @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 1 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,18 +37,25 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: 1 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 256 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/3rdParty/Medieval props/Textures/BedV1_Mattress_occlusion.png.meta b/Assets/3rdParty/Medieval props/Textures/BedV1_Mattress_occlusion.png.meta index 985172b6..9c6aecc8 100644 --- a/Assets/3rdParty/Medieval props/Textures/BedV1_Mattress_occlusion.png.meta +++ b/Assets/3rdParty/Medieval props/Textures/BedV1_Mattress_occlusion.png.meta @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,18 +37,25 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: -1 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 256 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/3rdParty/Medieval props/Textures/BenchV1.png.meta b/Assets/3rdParty/Medieval props/Textures/BenchV1.png.meta index 68548e44..84b0f964 100644 --- a/Assets/3rdParty/Medieval props/Textures/BenchV1.png.meta +++ b/Assets/3rdParty/Medieval props/Textures/BenchV1.png.meta @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,18 +37,25 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: -1 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 256 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/3rdParty/Medieval props/Textures/BenchV1_height.png.meta b/Assets/3rdParty/Medieval props/Textures/BenchV1_height.png.meta index ae8c4801..9884122d 100644 --- a/Assets/3rdParty/Medieval props/Textures/BenchV1_height.png.meta +++ b/Assets/3rdParty/Medieval props/Textures/BenchV1_height.png.meta @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,18 +37,25 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: -1 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 256 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/3rdParty/Medieval props/Textures/BenchV1_normal.png.meta b/Assets/3rdParty/Medieval props/Textures/BenchV1_normal.png.meta index 6461255a..9cf95cd5 100644 --- a/Assets/3rdParty/Medieval props/Textures/BenchV1_normal.png.meta +++ b/Assets/3rdParty/Medieval props/Textures/BenchV1_normal.png.meta @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 1 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,18 +37,25 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: 1 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 256 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/3rdParty/Medieval props/Textures/BenchV1_occlusion.png.meta b/Assets/3rdParty/Medieval props/Textures/BenchV1_occlusion.png.meta index e165519f..61fefcf7 100644 --- a/Assets/3rdParty/Medieval props/Textures/BenchV1_occlusion.png.meta +++ b/Assets/3rdParty/Medieval props/Textures/BenchV1_occlusion.png.meta @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,18 +37,25 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: -1 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 256 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/3rdParty/Medieval props/Textures/CandleV1.png.meta b/Assets/3rdParty/Medieval props/Textures/CandleV1.png.meta index cac5b7c5..e5f671b0 100644 --- a/Assets/3rdParty/Medieval props/Textures/CandleV1.png.meta +++ b/Assets/3rdParty/Medieval props/Textures/CandleV1.png.meta @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,18 +37,25 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: -1 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 256 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/3rdParty/Medieval props/Textures/CandleV1_normal.png.meta b/Assets/3rdParty/Medieval props/Textures/CandleV1_normal.png.meta index d8b0b019..d3359962 100644 --- a/Assets/3rdParty/Medieval props/Textures/CandleV1_normal.png.meta +++ b/Assets/3rdParty/Medieval props/Textures/CandleV1_normal.png.meta @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 1 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,18 +37,25 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: 1 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 256 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/3rdParty/Medieval props/Textures/MetalV3_Tilled_difuse.png.meta b/Assets/3rdParty/Medieval props/Textures/MetalV3_Tilled_difuse.png.meta index d5345014..124c337d 100644 --- a/Assets/3rdParty/Medieval props/Textures/MetalV3_Tilled_difuse.png.meta +++ b/Assets/3rdParty/Medieval props/Textures/MetalV3_Tilled_difuse.png.meta @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,18 +37,25 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: -1 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 256 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/3rdParty/Medieval props/Textures/MetalV3_Tilled_height.png.meta b/Assets/3rdParty/Medieval props/Textures/MetalV3_Tilled_height.png.meta index 10cbde57..690401d8 100644 --- a/Assets/3rdParty/Medieval props/Textures/MetalV3_Tilled_height.png.meta +++ b/Assets/3rdParty/Medieval props/Textures/MetalV3_Tilled_height.png.meta @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,18 +37,25 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: -1 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 256 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/3rdParty/Medieval props/Textures/MetalV3_Tilled_normal.png.meta b/Assets/3rdParty/Medieval props/Textures/MetalV3_Tilled_normal.png.meta index f51883b2..fdc43b55 100644 --- a/Assets/3rdParty/Medieval props/Textures/MetalV3_Tilled_normal.png.meta +++ b/Assets/3rdParty/Medieval props/Textures/MetalV3_Tilled_normal.png.meta @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 1 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,18 +37,25 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: 1 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 256 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/3rdParty/Medieval props/Textures/MetalV3_Tilled_occlusion.png.meta b/Assets/3rdParty/Medieval props/Textures/MetalV3_Tilled_occlusion.png.meta index 49904d6c..84b2fa9d 100644 --- a/Assets/3rdParty/Medieval props/Textures/MetalV3_Tilled_occlusion.png.meta +++ b/Assets/3rdParty/Medieval props/Textures/MetalV3_Tilled_occlusion.png.meta @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,18 +37,25 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: -1 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 256 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/3rdParty/Medieval props/Textures/MugV1_normal.png.meta b/Assets/3rdParty/Medieval props/Textures/MugV1_normal.png.meta index ec3627e0..cbeae5ce 100644 --- a/Assets/3rdParty/Medieval props/Textures/MugV1_normal.png.meta +++ b/Assets/3rdParty/Medieval props/Textures/MugV1_normal.png.meta @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 1 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,18 +37,25 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: 1 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 256 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/3rdParty/Medieval props/Textures/PotV1.png.meta b/Assets/3rdParty/Medieval props/Textures/PotV1.png.meta index 62089106..4aa77019 100644 --- a/Assets/3rdParty/Medieval props/Textures/PotV1.png.meta +++ b/Assets/3rdParty/Medieval props/Textures/PotV1.png.meta @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,18 +37,25 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: -1 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 256 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/3rdParty/Medieval props/Textures/PotV1_height.png.meta b/Assets/3rdParty/Medieval props/Textures/PotV1_height.png.meta index efd415dd..b01d2fec 100644 --- a/Assets/3rdParty/Medieval props/Textures/PotV1_height.png.meta +++ b/Assets/3rdParty/Medieval props/Textures/PotV1_height.png.meta @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,18 +37,25 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: -1 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 256 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/3rdParty/Medieval props/Textures/PotV1_normal.png.meta b/Assets/3rdParty/Medieval props/Textures/PotV1_normal.png.meta index 15bb7979..0e0c378f 100644 --- a/Assets/3rdParty/Medieval props/Textures/PotV1_normal.png.meta +++ b/Assets/3rdParty/Medieval props/Textures/PotV1_normal.png.meta @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 1 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,18 +37,25 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: 1 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 256 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/3rdParty/Medieval props/Textures/PotV1_occlusion.png.meta b/Assets/3rdParty/Medieval props/Textures/PotV1_occlusion.png.meta index 1ddd5401..ded1473f 100644 --- a/Assets/3rdParty/Medieval props/Textures/PotV1_occlusion.png.meta +++ b/Assets/3rdParty/Medieval props/Textures/PotV1_occlusion.png.meta @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,18 +37,25 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: -1 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 256 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/3rdParty/Medieval props/Textures/WoodV3_Tilled_normal.png.meta b/Assets/3rdParty/Medieval props/Textures/WoodV3_Tilled_normal.png.meta index 76691610..8f324a1c 100644 --- a/Assets/3rdParty/Medieval props/Textures/WoodV3_Tilled_normal.png.meta +++ b/Assets/3rdParty/Medieval props/Textures/WoodV3_Tilled_normal.png.meta @@ -17,7 +17,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 1 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -37,18 +37,25 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: 1 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 256 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/Prefabs.meta b/Assets/Prefabs.meta new file mode 100644 index 00000000..e98bd61e --- /dev/null +++ b/Assets/Prefabs.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: a60a0281e3a3c0b4d81f6bc3fe7f2874 +folderAsset: yes +timeCreated: 1458692497 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/GameManager.prefab b/Assets/Prefabs/GameManager.prefab new file mode 100644 index 00000000..10b376f1 --- /dev/null +++ b/Assets/Prefabs/GameManager.prefab @@ -0,0 +1,60 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &167964 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 417462} + - 114: {fileID: 11495134} + m_Layer: 0 + m_Name: GameManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &417462 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 167964} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!114 &11495134 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 167964} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 846ebfe778ad25f40b846229700eece7, type: 3} + m_Name: + m_EditorClassIdentifier: + nombrePersonaje: + empezarTiempo: 0 + tiempo: 0 + yaHuboEarthquake: 0 + tiempoEarthquake: 180 + pitch: 1 + pitchDuringEarthquake: 0.5 + offsetSong: 0 +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 167964} + m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/GameManager.prefab.meta b/Assets/Prefabs/GameManager.prefab.meta new file mode 100644 index 00000000..0dfe79c4 --- /dev/null +++ b/Assets/Prefabs/GameManager.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e5c874fad2321d94882136e5fa3ddf9a +timeCreated: 1458692502 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/room-pfiguero-small.unity b/Assets/Scenes/room-pfiguero-small.unity index 52ff5c14..2cf7569a 100644 --- a/Assets/Scenes/room-pfiguero-small.unity +++ b/Assets/Scenes/room-pfiguero-small.unity @@ -236,7 +236,7 @@ Transform: - {fileID: 1178144275} - {fileID: 2023531263} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 4 --- !u!4 &264427629 stripped Transform: m_PrefabParentObject: {fileID: 443542, guid: 47979f026ccbc4964a1cde8ef9c819f7, type: 2} @@ -662,7 +662,7 @@ Transform: m_LocalScale: {x: 5, y: 5, z: 5} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 2 --- !u!114 &659030069 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1146,7 +1146,7 @@ Transform: m_LocalScale: {x: 0.6346366, y: 0.036568336, z: 4.0816436} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 15 --- !u!1 &928426007 GameObject: m_ObjectHideFlags: 0 @@ -1429,7 +1429,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 --- !u!1 &1083456999 GameObject: m_ObjectHideFlags: 0 @@ -1468,7 +1468,49 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 12 +--- !u!1001 &1175744552 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 417462, guid: e5c874fad2321d94882136e5fa3ddf9a, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417462, guid: e5c874fad2321d94882136e5fa3ddf9a, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417462, guid: e5c874fad2321d94882136e5fa3ddf9a, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417462, guid: e5c874fad2321d94882136e5fa3ddf9a, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417462, guid: e5c874fad2321d94882136e5fa3ddf9a, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417462, guid: e5c874fad2321d94882136e5fa3ddf9a, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417462, guid: e5c874fad2321d94882136e5fa3ddf9a, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 417462, guid: e5c874fad2321d94882136e5fa3ddf9a, type: 2} + propertyPath: m_RootOrder + value: 19 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: e5c874fad2321d94882136e5fa3ddf9a, type: 2} + m_IsPrefabParent: 0 --- !u!1 &1178144274 GameObject: m_ObjectHideFlags: 0 @@ -1618,7 +1660,7 @@ Transform: m_LocalScale: {x: 0.6346366, y: 0.036568336, z: 2.811115} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 13 --- !u!1 &1207416120 GameObject: m_ObjectHideFlags: 0 @@ -2378,7 +2420,7 @@ Transform: m_LocalScale: {x: 0.6346366, y: 0.036568336, z: 3.551545} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 16 --- !u!1 &1938836873 GameObject: m_ObjectHideFlags: 0 @@ -2928,4 +2970,4 @@ Transform: m_LocalScale: {x: 0.5, y: 0.01, z: 0.7} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 diff --git a/Assets/Standard Assets/Characters/ThirdPersonCharacter/Textures/EthanNormals.png.meta b/Assets/Standard Assets/Characters/ThirdPersonCharacter/Textures/EthanNormals.png.meta index 8ab68d49..05b933c1 100755 --- a/Assets/Standard Assets/Characters/ThirdPersonCharacter/Textures/EthanNormals.png.meta +++ b/Assets/Standard Assets/Characters/ThirdPersonCharacter/Textures/EthanNormals.png.meta @@ -15,7 +15,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 1 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -35,18 +35,26 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: 1 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 2048 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: + assetBundleVariant: diff --git a/Assets/Standard Assets/Characters/ThirdPersonCharacter/Textures/EthanOcclusion.png.meta b/Assets/Standard Assets/Characters/ThirdPersonCharacter/Textures/EthanOcclusion.png.meta index b8847de3..129cf6ec 100755 --- a/Assets/Standard Assets/Characters/ThirdPersonCharacter/Textures/EthanOcclusion.png.meta +++ b/Assets/Standard Assets/Characters/ThirdPersonCharacter/Textures/EthanOcclusion.png.meta @@ -15,7 +15,7 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 @@ -35,18 +35,26 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 0 textureType: 0 - buildTargetSettings: [] + buildTargetSettings: + - buildTarget: WebGL + maxTextureSize: 2048 + textureFormat: -1 + compressionQuality: 50 + allowsAlphaSplitting: 0 spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index d3e15f4d..a842879e 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,11 +5,11 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 0 + - enabled: 1 path: Assets/Scenes/pantallaIntro.unity - - enabled: 0 + - enabled: 1 path: Assets/Scenes/principal.unity - - enabled: 0 - path: Assets/Scenes/room-pfiguero.unity - enabled: 1 + path: Assets/Scenes/room-pfiguero.unity + - enabled: 0 path: Assets/Scenes/room-pfiguero-small.unity diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index bb60c067..961ebb93 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.3.2f1 +m_EditorVersion: 5.3.1f1 m_StandardAssetsVersion: 0