diff --git a/Assets/Images/Sandia.png b/Assets/Images/Sandia.png deleted file mode 100644 index 90142e6..0000000 --- a/Assets/Images/Sandia.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a69b07b3f6e33e5946dd403db66b2c4909d1901532ce0edd720910069901724 -size 1611260 diff --git a/Assets/Images/Sandia.png.meta b/Assets/Images/Sandia.png.meta deleted file mode 100644 index 1cb1d46..0000000 --- a/Assets/Images/Sandia.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 8030fbbd9ca82f344a5497a6156f645b -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - 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: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Images/Sandia_Bright.png b/Assets/Images/Sandia_Bright.png deleted file mode 100644 index 5b5f840..0000000 --- a/Assets/Images/Sandia_Bright.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d70cb564ec133561b4ca1096511b1b5b1cf7a415c5f08ebc74afb81303766766 -size 1442414 diff --git a/Assets/Images/Sandia_Bright.png.meta b/Assets/Images/Sandia_Bright.png.meta deleted file mode 100644 index fa18a61..0000000 --- a/Assets/Images/Sandia_Bright.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 0fb1c9560f0972149a1b8d00f9990e68 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - 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: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Images/Sandia_Brighter.png b/Assets/Images/Sandia_Brighter.png deleted file mode 100644 index 127df4b..0000000 --- a/Assets/Images/Sandia_Brighter.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a1562b243213a87fdc31f5b7e47ae4b121cb681ea7778bae9430f23da2eaec6a -size 1451000 diff --git a/Assets/Images/Sandia_Brighter.png.meta b/Assets/Images/Sandia_Brighter.png.meta deleted file mode 100644 index ad0c275..0000000 --- a/Assets/Images/Sandia_Brighter.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 173b0925f1f52714a8a3db2ca056f762 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - 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: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Images/Sandia_Original.png b/Assets/Images/Sandia_Original.png index 7c18624..5b5f840 100644 --- a/Assets/Images/Sandia_Original.png +++ b/Assets/Images/Sandia_Original.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c4630caa4330552b0883dff13ae76feb7e5a8fdc1debcf686f8963a0b753165 -size 662855 +oid sha256:d70cb564ec133561b4ca1096511b1b5b1cf7a415c5f08ebc74afb81303766766 +size 1442414 diff --git a/Assets/Materials/Sandia/B.meta b/Assets/Materials/Cleo.meta similarity index 77% rename from Assets/Materials/Sandia/B.meta rename to Assets/Materials/Cleo.meta index 62bd5f8..2f8815d 100644 --- a/Assets/Materials/Sandia/B.meta +++ b/Assets/Materials/Cleo.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d1056c4984f2b404faaac2347c084e57 +guid: b6c8b69ebc60783498c9f1e8b8d69c69 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Materials/Sandia/B/Velvet.003.mat b/Assets/Materials/Cleo/Capitalino tan.mat similarity index 90% rename from Assets/Materials/Sandia/B/Velvet.003.mat rename to Assets/Materials/Cleo/Capitalino tan.mat index 98cbe35..03927c4 100644 --- a/Assets/Materials/Sandia/B/Velvet.003.mat +++ b/Assets/Materials/Cleo/Capitalino tan.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Velvet.003 + m_Name: Capitalino tan m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -29,7 +29,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: - m_Texture: {fileID: 2800000, guid: 48713b9532fa3094cb4fd7657ba3fce3, type: 3} + m_Texture: {fileID: 2800000, guid: 95cfea40be0ee1942a937f13de58e577, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailMask: @@ -45,7 +45,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 48713b9532fa3094cb4fd7657ba3fce3, type: 3} + m_Texture: {fileID: 2800000, guid: 95cfea40be0ee1942a937f13de58e577, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -67,7 +67,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0 + - _Glossiness: 0.1 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 diff --git a/Assets/Materials/Sandia/B/FUR FF.007.mat.meta b/Assets/Materials/Cleo/Capitalino tan.mat.meta similarity index 79% rename from Assets/Materials/Sandia/B/FUR FF.007.mat.meta rename to Assets/Materials/Cleo/Capitalino tan.mat.meta index 96ec77e..0212d21 100644 --- a/Assets/Materials/Sandia/B/FUR FF.007.mat.meta +++ b/Assets/Materials/Cleo/Capitalino tan.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f9a4ce3b3f154d943ab5236a9f4ccf18 +guid: 178d8f2ea75fc3a4db5cd670fe5022ce NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Materials/Sandia/B/PALMBEACH WHITE LOGO.007.mat b/Assets/Materials/Cleo/Chocolate stained Wood Logo.mat similarity index 94% rename from Assets/Materials/Sandia/B/PALMBEACH WHITE LOGO.007.mat rename to Assets/Materials/Cleo/Chocolate stained Wood Logo.mat index 681469c..93434bb 100644 --- a/Assets/Materials/Sandia/B/PALMBEACH WHITE LOGO.007.mat +++ b/Assets/Materials/Cleo/Chocolate stained Wood Logo.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: PALMBEACH WHITE LOGO.007 + m_Name: Chocolate stained Wood Logo m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: d174d1c6f3c912345a410420843aedd2, type: 3} + m_Texture: {fileID: 2800000, guid: 519630f1e9eef6c4fb0c1641af6c7de8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Sandia/B/CALLE STRIPE_CACAO & CINNAMON.007.mat.meta b/Assets/Materials/Cleo/Chocolate stained Wood Logo.mat.meta similarity index 79% rename from Assets/Materials/Sandia/B/CALLE STRIPE_CACAO & CINNAMON.007.mat.meta rename to Assets/Materials/Cleo/Chocolate stained Wood Logo.mat.meta index 258b6bf..e9e72ec 100644 --- a/Assets/Materials/Sandia/B/CALLE STRIPE_CACAO & CINNAMON.007.mat.meta +++ b/Assets/Materials/Cleo/Chocolate stained Wood Logo.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 949a8c912c35d8c419c6d17dd57cb66f +guid: b65eab9eae9e8ea48b9b24566470cea2 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Materials/Cleo/Chocolate stained Wood.mat b/Assets/Materials/Cleo/Chocolate stained Wood.mat new file mode 100644 index 0000000..3380223 --- /dev/null +++ b/Assets/Materials/Cleo/Chocolate stained Wood.mat @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Chocolate stained Wood + m_Shader: {fileID: 10708, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _DETAIL_MULX2 + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 2800000, guid: e31b85f8a0c10d64e9683cc40e07a728, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: e31b85f8a0c10d64e9683cc40e07a728, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Sandia/B/CUSHION BORDER.007.mat.meta b/Assets/Materials/Cleo/Chocolate stained Wood.mat.meta similarity index 79% rename from Assets/Materials/Sandia/B/CUSHION BORDER.007.mat.meta rename to Assets/Materials/Cleo/Chocolate stained Wood.mat.meta index fb9f6ae..30963c1 100644 --- a/Assets/Materials/Sandia/B/CUSHION BORDER.007.mat.meta +++ b/Assets/Materials/Cleo/Chocolate stained Wood.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 183470dc2d072e240b6a75da75f36f89 +guid: f9732f00251d93142bc1a3e9470385cb NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Materials/Sandia/Bright/FUR FF.005.mat b/Assets/Materials/Cleo/Filicudi white.mat similarity index 94% rename from Assets/Materials/Sandia/Bright/FUR FF.005.mat rename to Assets/Materials/Cleo/Filicudi white.mat index 7531d5f..7809c29 100644 --- a/Assets/Materials/Sandia/Bright/FUR FF.005.mat +++ b/Assets/Materials/Cleo/Filicudi white.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: FUR FF.005 + m_Name: Filicudi white m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 32eefca5193988d4b93b688419db2bb6, type: 3} + m_Texture: {fileID: 2800000, guid: 591cf74094498cc4f90bd22baff87d65, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -66,7 +66,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.1 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 diff --git a/Assets/Materials/Sandia/B/FILICUDI CINNAMON.007.mat.meta b/Assets/Materials/Cleo/Filicudi white.mat.meta similarity index 79% rename from Assets/Materials/Sandia/B/FILICUDI CINNAMON.007.mat.meta rename to Assets/Materials/Cleo/Filicudi white.mat.meta index bc9c7d4..f8260d7 100644 --- a/Assets/Materials/Sandia/B/FILICUDI CINNAMON.007.mat.meta +++ b/Assets/Materials/Cleo/Filicudi white.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 50414cb99349cf342b381f88b79bd369 +guid: 610c0a734e82f034c904143633707566 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Materials/Sandia/B/PALMBEACH WHITE LOGO.007.mat.meta b/Assets/Materials/Sandia/B/PALMBEACH WHITE LOGO.007.mat.meta deleted file mode 100644 index 34922bc..0000000 --- a/Assets/Materials/Sandia/B/PALMBEACH WHITE LOGO.007.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 324bda6e9f4fa0149b03207b981e0196 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/B/Velvet.003.mat.meta b/Assets/Materials/Sandia/B/Velvet.003.mat.meta deleted file mode 100644 index 0b0376b..0000000 --- a/Assets/Materials/Sandia/B/Velvet.003.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f85eb4fff16903a49ac02bd82c4b946f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Bright/CALLE STRIPE_CACAO & CINNAMON.005.mat b/Assets/Materials/Sandia/Bright/CALLE STRIPE_CACAO & CINNAMON.005.mat deleted file mode 100644 index 07b636e..0000000 --- a/Assets/Materials/Sandia/Bright/CALLE STRIPE_CACAO & CINNAMON.005.mat +++ /dev/null @@ -1,83 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CALLE STRIPE_CACAO & CINNAMON.005 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 3e21ab4907d9be2499cc9fdfef058907, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Materials/Sandia/Bright/CALLE STRIPE_CACAO & CINNAMON.005.mat.meta b/Assets/Materials/Sandia/Bright/CALLE STRIPE_CACAO & CINNAMON.005.mat.meta deleted file mode 100644 index 40467ff..0000000 --- a/Assets/Materials/Sandia/Bright/CALLE STRIPE_CACAO & CINNAMON.005.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2185fabe043f2ab4db77eb242375c3d3 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Bright/CUSHION BORDER.005.mat b/Assets/Materials/Sandia/Bright/CUSHION BORDER.005.mat deleted file mode 100644 index 3712f56..0000000 --- a/Assets/Materials/Sandia/Bright/CUSHION BORDER.005.mat +++ /dev/null @@ -1,83 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CUSHION BORDER.005 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: e2e95d223f64d4c4ea054f4e40d06d2c, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Materials/Sandia/Bright/CUSHION BORDER.005.mat.meta b/Assets/Materials/Sandia/Bright/CUSHION BORDER.005.mat.meta deleted file mode 100644 index ebb1203..0000000 --- a/Assets/Materials/Sandia/Bright/CUSHION BORDER.005.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 980dbe02dff9c4840a3be2d0a01c4493 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Bright/FILICUDI CINNAMON.005.mat b/Assets/Materials/Sandia/Bright/FILICUDI CINNAMON.005.mat deleted file mode 100644 index 742440d..0000000 --- a/Assets/Materials/Sandia/Bright/FILICUDI CINNAMON.005.mat +++ /dev/null @@ -1,83 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FILICUDI CINNAMON.005 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 63fb0949c8649fb45844af865086df41, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Materials/Sandia/Bright/FILICUDI CINNAMON.005.mat.meta b/Assets/Materials/Sandia/Bright/FILICUDI CINNAMON.005.mat.meta deleted file mode 100644 index 068a671..0000000 --- a/Assets/Materials/Sandia/Bright/FILICUDI CINNAMON.005.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bcab187081de6f94a8b39d9e4f2bd097 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Bright/FUR FF.005.mat.meta b/Assets/Materials/Sandia/Bright/FUR FF.005.mat.meta deleted file mode 100644 index 00e7d63..0000000 --- a/Assets/Materials/Sandia/Bright/FUR FF.005.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 50ccb7800881edb4089451602b850473 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Bright/PALMBEACH WHITE LOGO.005.mat b/Assets/Materials/Sandia/Bright/PALMBEACH WHITE LOGO.005.mat deleted file mode 100644 index 856b3c1..0000000 --- a/Assets/Materials/Sandia/Bright/PALMBEACH WHITE LOGO.005.mat +++ /dev/null @@ -1,83 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: PALMBEACH WHITE LOGO.005 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: b8eb323035064704bb65e9371f695a02, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Materials/Sandia/Bright/PALMBEACH WHITE LOGO.005.mat.meta b/Assets/Materials/Sandia/Bright/PALMBEACH WHITE LOGO.005.mat.meta deleted file mode 100644 index c26fc0f..0000000 --- a/Assets/Materials/Sandia/Bright/PALMBEACH WHITE LOGO.005.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3c286f1dce9ffea46a686fb669af7b9f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Bright/Ponza grape.003.mat b/Assets/Materials/Sandia/Bright/Ponza grape.003.mat deleted file mode 100644 index c370945..0000000 --- a/Assets/Materials/Sandia/Bright/Ponza grape.003.mat +++ /dev/null @@ -1,91 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Ponza grape.003 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ALPHABLEND_ON - - _DETAIL_MULX2 - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 2800000, guid: 0133394b1b5f6364798f483e3f092307, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 0133394b1b5f6364798f483e3f092307, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _GlossMapScale: 0 - - _Glossiness: 0.1 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 2 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 5 - - _UVSec: 0 - - _ZWrite: 0 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Materials/Sandia/Bright/Ponza grape.003.mat.meta b/Assets/Materials/Sandia/Bright/Ponza grape.003.mat.meta deleted file mode 100644 index dd84794..0000000 --- a/Assets/Materials/Sandia/Bright/Ponza grape.003.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 59827c12397b23347afdd7e03f0d1ea6 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Brighter.meta b/Assets/Materials/Sandia/Brighter.meta deleted file mode 100644 index 56d26c7..0000000 --- a/Assets/Materials/Sandia/Brighter.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7dbebcf56cf99ea4899f8e37ad8442d9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Brighter/Bangkok Rock.001.mat b/Assets/Materials/Sandia/Original/Bangkok Rock.001.mat similarity index 92% rename from Assets/Materials/Sandia/Brighter/Bangkok Rock.001.mat rename to Assets/Materials/Sandia/Original/Bangkok Rock.001.mat index 662fbe5..06d0251 100644 --- a/Assets/Materials/Sandia/Brighter/Bangkok Rock.001.mat +++ b/Assets/Materials/Sandia/Original/Bangkok Rock.001.mat @@ -29,7 +29,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: - m_Texture: {fileID: 2800000, guid: e281a2272552ae54e8eccf47e40222d0, type: 3} + m_Texture: {fileID: 2800000, guid: cea2a355dd2460d40ac4334f6698e0c5, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailMask: @@ -45,7 +45,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: e281a2272552ae54e8eccf47e40222d0, type: 3} + m_Texture: {fileID: 2800000, guid: cea2a355dd2460d40ac4334f6698e0c5, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Sandia/Brighter/Bangkok Rock.001.mat.meta b/Assets/Materials/Sandia/Original/Bangkok Rock.001.mat.meta similarity index 79% rename from Assets/Materials/Sandia/Brighter/Bangkok Rock.001.mat.meta rename to Assets/Materials/Sandia/Original/Bangkok Rock.001.mat.meta index 81691c8..edd76c0 100644 --- a/Assets/Materials/Sandia/Brighter/Bangkok Rock.001.mat.meta +++ b/Assets/Materials/Sandia/Original/Bangkok Rock.001.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1278b108e46b04642a8ccb3e9f55dd62 +guid: 9e246a7c69bcb7c4a9498073e33f552f NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Materials/Sandia/Original/CALLE STRIPE_CACAO & CINNAMON.003.mat b/Assets/Materials/Sandia/Original/CALLE STRIPE_CACAO & CINNAMON.003.mat deleted file mode 100644 index 8fb576b..0000000 --- a/Assets/Materials/Sandia/Original/CALLE STRIPE_CACAO & CINNAMON.003.mat +++ /dev/null @@ -1,83 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CALLE STRIPE_CACAO & CINNAMON.003 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: a3177095530f11542b102ed1308d9988, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Materials/Sandia/Original/CALLE STRIPE_CACAO & CINNAMON.003.mat.meta b/Assets/Materials/Sandia/Original/CALLE STRIPE_CACAO & CINNAMON.003.mat.meta deleted file mode 100644 index 3d289ed..0000000 --- a/Assets/Materials/Sandia/Original/CALLE STRIPE_CACAO & CINNAMON.003.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2c9a98a7651d590449e00029b472f8c3 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Brighter/CALLE STRIPE_CACAO & CINNAMON.006.mat b/Assets/Materials/Sandia/Original/CALLE STRIPE_CACAO & CINNAMON.006.mat similarity index 96% rename from Assets/Materials/Sandia/Brighter/CALLE STRIPE_CACAO & CINNAMON.006.mat rename to Assets/Materials/Sandia/Original/CALLE STRIPE_CACAO & CINNAMON.006.mat index 9002b57..3cb2772 100644 --- a/Assets/Materials/Sandia/Brighter/CALLE STRIPE_CACAO & CINNAMON.006.mat +++ b/Assets/Materials/Sandia/Original/CALLE STRIPE_CACAO & CINNAMON.006.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 2b441b5cb9c568b4ba32936b0aeaf73f, type: 3} + m_Texture: {fileID: 2800000, guid: 3916f7cdba1d2b842b175ae2230f612a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Sandia/Brighter/CALLE STRIPE_CACAO & CINNAMON.006.mat.meta b/Assets/Materials/Sandia/Original/CALLE STRIPE_CACAO & CINNAMON.006.mat.meta similarity index 79% rename from Assets/Materials/Sandia/Brighter/CALLE STRIPE_CACAO & CINNAMON.006.mat.meta rename to Assets/Materials/Sandia/Original/CALLE STRIPE_CACAO & CINNAMON.006.mat.meta index b3ba5dd..93cb108 100644 --- a/Assets/Materials/Sandia/Brighter/CALLE STRIPE_CACAO & CINNAMON.006.mat.meta +++ b/Assets/Materials/Sandia/Original/CALLE STRIPE_CACAO & CINNAMON.006.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 724cfd87fd317254d90b687e33f8914e +guid: f91739b7c1f0daf4396c2ad9c0672e11 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Materials/Sandia/Original/CUSHION BORDER.003.mat b/Assets/Materials/Sandia/Original/CUSHION BORDER.003.mat deleted file mode 100644 index b3e84d0..0000000 --- a/Assets/Materials/Sandia/Original/CUSHION BORDER.003.mat +++ /dev/null @@ -1,83 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CUSHION BORDER.003 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: d6bafc0a5d1590d49816576034293052, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Materials/Sandia/Original/CUSHION BORDER.003.mat.meta b/Assets/Materials/Sandia/Original/CUSHION BORDER.003.mat.meta deleted file mode 100644 index 96d1932..0000000 --- a/Assets/Materials/Sandia/Original/CUSHION BORDER.003.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8b2ab604b13924c4dab4a9211c727eae -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Brighter/CUSHION BORDER.006.mat b/Assets/Materials/Sandia/Original/CUSHION BORDER.006.mat similarity index 96% rename from Assets/Materials/Sandia/Brighter/CUSHION BORDER.006.mat rename to Assets/Materials/Sandia/Original/CUSHION BORDER.006.mat index bfdcef4..4315129 100644 --- a/Assets/Materials/Sandia/Brighter/CUSHION BORDER.006.mat +++ b/Assets/Materials/Sandia/Original/CUSHION BORDER.006.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 011b3bf961655a2438c902d22bdde7e2, type: 3} + m_Texture: {fileID: 2800000, guid: 1862a96a6c318214cab372af66207a19, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Sandia/Brighter/CUSHION BORDER.006.mat.meta b/Assets/Materials/Sandia/Original/CUSHION BORDER.006.mat.meta similarity index 79% rename from Assets/Materials/Sandia/Brighter/CUSHION BORDER.006.mat.meta rename to Assets/Materials/Sandia/Original/CUSHION BORDER.006.mat.meta index 40f61a0..df0b5cb 100644 --- a/Assets/Materials/Sandia/Brighter/CUSHION BORDER.006.mat.meta +++ b/Assets/Materials/Sandia/Original/CUSHION BORDER.006.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2feb8d7c44c24c941924e43070717cc3 +guid: 27be645857766a14ab87a014487fabb4 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Materials/Sandia/Original/FILICUDI CINNAMON.003.mat b/Assets/Materials/Sandia/Original/FILICUDI CINNAMON.003.mat deleted file mode 100644 index 71d6b38..0000000 --- a/Assets/Materials/Sandia/Original/FILICUDI CINNAMON.003.mat +++ /dev/null @@ -1,83 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FILICUDI CINNAMON.003 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 1b43ae9747e07ee45a717cd4439898bf, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Materials/Sandia/Original/FILICUDI CINNAMON.003.mat.meta b/Assets/Materials/Sandia/Original/FILICUDI CINNAMON.003.mat.meta deleted file mode 100644 index 8641cb9..0000000 --- a/Assets/Materials/Sandia/Original/FILICUDI CINNAMON.003.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1a0d427563153b64d96b7fd9e35d8c2c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Brighter/FILICUDI CINNAMON.006.mat b/Assets/Materials/Sandia/Original/FILICUDI CINNAMON.006.mat similarity index 96% rename from Assets/Materials/Sandia/Brighter/FILICUDI CINNAMON.006.mat rename to Assets/Materials/Sandia/Original/FILICUDI CINNAMON.006.mat index cd1ba3c..d77d5c6 100644 --- a/Assets/Materials/Sandia/Brighter/FILICUDI CINNAMON.006.mat +++ b/Assets/Materials/Sandia/Original/FILICUDI CINNAMON.006.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 4e13ef0be6b12944aa49c225ef469641, type: 3} + m_Texture: {fileID: 2800000, guid: 1104d09dfb5c7944fb4f29423b410f07, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Sandia/Brighter/FILICUDI CINNAMON.006.mat.meta b/Assets/Materials/Sandia/Original/FILICUDI CINNAMON.006.mat.meta similarity index 79% rename from Assets/Materials/Sandia/Brighter/FILICUDI CINNAMON.006.mat.meta rename to Assets/Materials/Sandia/Original/FILICUDI CINNAMON.006.mat.meta index 4d78c0f..51550d1 100644 --- a/Assets/Materials/Sandia/Brighter/FILICUDI CINNAMON.006.mat.meta +++ b/Assets/Materials/Sandia/Original/FILICUDI CINNAMON.006.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 982116dd037729d43b86e16d15a2736f +guid: f6edbdac7bac95b4f99a82ddc1b9fd7d NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Materials/Sandia/Original/FUR FF.003.mat.meta b/Assets/Materials/Sandia/Original/FUR FF.003.mat.meta deleted file mode 100644 index e6384fa..0000000 --- a/Assets/Materials/Sandia/Original/FUR FF.003.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3526fc9216fb2b04bb6ee6d8994a0982 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Brighter/FUR FF.006.mat b/Assets/Materials/Sandia/Original/FUR FF.006.mat similarity index 96% rename from Assets/Materials/Sandia/Brighter/FUR FF.006.mat rename to Assets/Materials/Sandia/Original/FUR FF.006.mat index 5b3b26a..c4ac7df 100644 --- a/Assets/Materials/Sandia/Brighter/FUR FF.006.mat +++ b/Assets/Materials/Sandia/Original/FUR FF.006.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 51fef9cea37422c48b1360c6c625d4f5, type: 3} + m_Texture: {fileID: 2800000, guid: 8bbc9ae782a51f84a83f59078b70dd82, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Sandia/Brighter/FUR FF.006.mat.meta b/Assets/Materials/Sandia/Original/FUR FF.006.mat.meta similarity index 79% rename from Assets/Materials/Sandia/Brighter/FUR FF.006.mat.meta rename to Assets/Materials/Sandia/Original/FUR FF.006.mat.meta index 62007d0..9976972 100644 --- a/Assets/Materials/Sandia/Brighter/FUR FF.006.mat.meta +++ b/Assets/Materials/Sandia/Original/FUR FF.006.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5ce16d658ef2d0349a325249a1434269 +guid: 35e568169b3da0a41be65deed67f53c2 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.003.mat b/Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.003.mat deleted file mode 100644 index fd9fb3b..0000000 --- a/Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.003.mat +++ /dev/null @@ -1,83 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: PALMBEACH WHITE LOGO.003 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 167a317a221436648a3f927a496f2bb5, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.003.mat.meta b/Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.003.mat.meta deleted file mode 100644 index 520d8e6..0000000 --- a/Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.003.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 52b28e6a7667cf948a88ed252703414d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Brighter/PALMBEACH WHITE LOGO.006.mat b/Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.006.mat similarity index 96% rename from Assets/Materials/Sandia/Brighter/PALMBEACH WHITE LOGO.006.mat rename to Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.006.mat index 6a15fc1..05a674a 100644 --- a/Assets/Materials/Sandia/Brighter/PALMBEACH WHITE LOGO.006.mat +++ b/Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.006.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 50d7b25c3255eb4428ea3813e57bcc4b, type: 3} + m_Texture: {fileID: 2800000, guid: 50709a532da857643aaf28177f49bcbb, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Sandia/Brighter/PALMBEACH WHITE LOGO.006.mat.meta b/Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.006.mat.meta similarity index 79% rename from Assets/Materials/Sandia/Brighter/PALMBEACH WHITE LOGO.006.mat.meta rename to Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.006.mat.meta index e0b73af..8d554a0 100644 --- a/Assets/Materials/Sandia/Brighter/PALMBEACH WHITE LOGO.006.mat.meta +++ b/Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.006.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a25ba151d6322054a8448c95675897e3 +guid: e9972da832ea3d042bf590e936d53cc6 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Materials/Sandia/Original/Velvet.002.mat b/Assets/Materials/Sandia/Original/Velvet.002.mat deleted file mode 100644 index 26c9c7c..0000000 --- a/Assets/Materials/Sandia/Original/Velvet.002.mat +++ /dev/null @@ -1,86 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Velvet.002 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ALPHABLEND_ON - - _DETAIL_MULX2 - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 2800000, guid: e95daee9af353b847a34197da77a182c, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: e95daee9af353b847a34197da77a182c, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _GlossMapScale: 0 - - _Glossiness: 0.1 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 2 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 5 - - _UVSec: 0 - - _ZWrite: 0 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Materials/Sandia/Original/Velvet.002.mat.meta b/Assets/Materials/Sandia/Original/Velvet.002.mat.meta deleted file mode 100644 index aa36e61..0000000 --- a/Assets/Materials/Sandia/Original/Velvet.002.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 32820d39cef2cd9458f3d8addb94574b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Seoul/CALLE STRIPE_CACAO & CINNAMON.004.mat b/Assets/Materials/Sandia/Seoul/CALLE STRIPE_CACAO & CINNAMON.004.mat deleted file mode 100644 index da50b72..0000000 --- a/Assets/Materials/Sandia/Seoul/CALLE STRIPE_CACAO & CINNAMON.004.mat +++ /dev/null @@ -1,83 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CALLE STRIPE_CACAO & CINNAMON.004 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 8cb86c2198e491b4fb11b45f4421678a, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Materials/Sandia/Seoul/CALLE STRIPE_CACAO & CINNAMON.004.mat.meta b/Assets/Materials/Sandia/Seoul/CALLE STRIPE_CACAO & CINNAMON.004.mat.meta deleted file mode 100644 index 9f441a1..0000000 --- a/Assets/Materials/Sandia/Seoul/CALLE STRIPE_CACAO & CINNAMON.004.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c401684f541b82d4a9a0174dd10446ae -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/B/CALLE STRIPE_CACAO & CINNAMON.007.mat b/Assets/Materials/Sandia/Seoul/CALLE STRIPE_CACAO & CINNAMON.006.mat similarity index 94% rename from Assets/Materials/Sandia/B/CALLE STRIPE_CACAO & CINNAMON.007.mat rename to Assets/Materials/Sandia/Seoul/CALLE STRIPE_CACAO & CINNAMON.006.mat index 241ccee..f7c2c83 100644 --- a/Assets/Materials/Sandia/B/CALLE STRIPE_CACAO & CINNAMON.007.mat +++ b/Assets/Materials/Sandia/Seoul/CALLE STRIPE_CACAO & CINNAMON.006.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: CALLE STRIPE_CACAO & CINNAMON.007 + m_Name: CALLE STRIPE_CACAO & CINNAMON.006 m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 0ba4f9f7ca6af6b45b28c7bd906ecd6b, type: 3} + m_Texture: {fileID: 2800000, guid: 8440f429174eb594482ea567c5a68ebc, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Sandia/Seoul/CALLE STRIPE_CACAO & CINNAMON.006.mat.meta b/Assets/Materials/Sandia/Seoul/CALLE STRIPE_CACAO & CINNAMON.006.mat.meta new file mode 100644 index 0000000..c9e8b68 --- /dev/null +++ b/Assets/Materials/Sandia/Seoul/CALLE STRIPE_CACAO & CINNAMON.006.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 94fc3a471c53d694f913eed186047d8a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Sandia/Seoul/CUSHION BORDER.004.mat b/Assets/Materials/Sandia/Seoul/CUSHION BORDER.004.mat deleted file mode 100644 index 2a785de..0000000 --- a/Assets/Materials/Sandia/Seoul/CUSHION BORDER.004.mat +++ /dev/null @@ -1,83 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CUSHION BORDER.004 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 2266c4518bb1f2747920a24898418330, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Materials/Sandia/Seoul/CUSHION BORDER.004.mat.meta b/Assets/Materials/Sandia/Seoul/CUSHION BORDER.004.mat.meta deleted file mode 100644 index 5ce42b0..0000000 --- a/Assets/Materials/Sandia/Seoul/CUSHION BORDER.004.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2c2eb75222877944696bffe67cdcc69c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/B/CUSHION BORDER.007.mat b/Assets/Materials/Sandia/Seoul/CUSHION BORDER.006.mat similarity index 94% rename from Assets/Materials/Sandia/B/CUSHION BORDER.007.mat rename to Assets/Materials/Sandia/Seoul/CUSHION BORDER.006.mat index a0ae1d8..b680539 100644 --- a/Assets/Materials/Sandia/B/CUSHION BORDER.007.mat +++ b/Assets/Materials/Sandia/Seoul/CUSHION BORDER.006.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: CUSHION BORDER.007 + m_Name: CUSHION BORDER.006 m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: ac63c25eaa8c2d742993eeea30ebb64a, type: 3} + m_Texture: {fileID: 2800000, guid: afaa54413e58bf64ebd3b8256436f83d, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Sandia/Seoul/CUSHION BORDER.006.mat.meta b/Assets/Materials/Sandia/Seoul/CUSHION BORDER.006.mat.meta new file mode 100644 index 0000000..10ba3ba --- /dev/null +++ b/Assets/Materials/Sandia/Seoul/CUSHION BORDER.006.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aca0170be85c3004b91d62003bece021 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Sandia/Seoul/FILICUDI CINNAMON.004.mat b/Assets/Materials/Sandia/Seoul/FILICUDI CINNAMON.004.mat deleted file mode 100644 index a143efd..0000000 --- a/Assets/Materials/Sandia/Seoul/FILICUDI CINNAMON.004.mat +++ /dev/null @@ -1,83 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FILICUDI CINNAMON.004 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: d544f0a425e2b88498bd3624e113468b, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Materials/Sandia/Seoul/FILICUDI CINNAMON.004.mat.meta b/Assets/Materials/Sandia/Seoul/FILICUDI CINNAMON.004.mat.meta deleted file mode 100644 index df9d091..0000000 --- a/Assets/Materials/Sandia/Seoul/FILICUDI CINNAMON.004.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bbc94fdc03821414b852bddec3d647da -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/B/FILICUDI CINNAMON.007.mat b/Assets/Materials/Sandia/Seoul/FILICUDI CINNAMON.006.mat similarity index 94% rename from Assets/Materials/Sandia/B/FILICUDI CINNAMON.007.mat rename to Assets/Materials/Sandia/Seoul/FILICUDI CINNAMON.006.mat index e7b0acc..2b855a9 100644 --- a/Assets/Materials/Sandia/B/FILICUDI CINNAMON.007.mat +++ b/Assets/Materials/Sandia/Seoul/FILICUDI CINNAMON.006.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: FILICUDI CINNAMON.007 + m_Name: FILICUDI CINNAMON.006 m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 8e39c557773c0794595094c068165aa7, type: 3} + m_Texture: {fileID: 2800000, guid: 4fdb4dc07460a9c4898bc8fee4020e73, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Sandia/Seoul/FILICUDI CINNAMON.006.mat.meta b/Assets/Materials/Sandia/Seoul/FILICUDI CINNAMON.006.mat.meta new file mode 100644 index 0000000..e565ef3 --- /dev/null +++ b/Assets/Materials/Sandia/Seoul/FILICUDI CINNAMON.006.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c60e46cb965c92843a3477b2c14c38bb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Sandia/Seoul/FUR FF.004.mat b/Assets/Materials/Sandia/Seoul/FUR FF.004.mat deleted file mode 100644 index 6a00a92..0000000 --- a/Assets/Materials/Sandia/Seoul/FUR FF.004.mat +++ /dev/null @@ -1,83 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FUR FF.004 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: bee84f07ea83f5a4ca964947b75e9878, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Materials/Sandia/Seoul/FUR FF.004.mat.meta b/Assets/Materials/Sandia/Seoul/FUR FF.004.mat.meta deleted file mode 100644 index 0baaced..0000000 --- a/Assets/Materials/Sandia/Seoul/FUR FF.004.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b0244f0eb362e774fa60a188a0d3cf27 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Original/FUR FF.003.mat b/Assets/Materials/Sandia/Seoul/FUR FF.006.mat similarity index 95% rename from Assets/Materials/Sandia/Original/FUR FF.003.mat rename to Assets/Materials/Sandia/Seoul/FUR FF.006.mat index 150fe86..ec72e35 100644 --- a/Assets/Materials/Sandia/Original/FUR FF.003.mat +++ b/Assets/Materials/Sandia/Seoul/FUR FF.006.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: FUR FF.003 + m_Name: FUR FF.006 m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: f144009d1185ac14c951da28ce9f84cd, type: 3} + m_Texture: {fileID: 2800000, guid: bd86831a1e6448543b9369f1fd06a364, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Sandia/Seoul/FUR FF.006.mat.meta b/Assets/Materials/Sandia/Seoul/FUR FF.006.mat.meta new file mode 100644 index 0000000..ca8d457 --- /dev/null +++ b/Assets/Materials/Sandia/Seoul/FUR FF.006.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2152fa3acb38e93458128b7b55f5d41c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Sandia/Seoul/PALMBEACH WHITE LOGO.004.mat b/Assets/Materials/Sandia/Seoul/PALMBEACH WHITE LOGO.004.mat deleted file mode 100644 index 820c156..0000000 --- a/Assets/Materials/Sandia/Seoul/PALMBEACH WHITE LOGO.004.mat +++ /dev/null @@ -1,83 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: PALMBEACH WHITE LOGO.004 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 1760003fad6f09a469ff498e04fc0853, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - m_BuildTextureStacks: [] diff --git a/Assets/Materials/Sandia/Seoul/PALMBEACH WHITE LOGO.004.mat.meta b/Assets/Materials/Sandia/Seoul/PALMBEACH WHITE LOGO.004.mat.meta deleted file mode 100644 index 625b338..0000000 --- a/Assets/Materials/Sandia/Seoul/PALMBEACH WHITE LOGO.004.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 07907de7fc9ddd24a8902d21e01a25ca -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/B/FUR FF.007.mat b/Assets/Materials/Sandia/Seoul/PALMBEACH WHITE LOGO.006.mat similarity index 94% rename from Assets/Materials/Sandia/B/FUR FF.007.mat rename to Assets/Materials/Sandia/Seoul/PALMBEACH WHITE LOGO.006.mat index cf650cb..370bfed 100644 --- a/Assets/Materials/Sandia/B/FUR FF.007.mat +++ b/Assets/Materials/Sandia/Seoul/PALMBEACH WHITE LOGO.006.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: FUR FF.007 + m_Name: PALMBEACH WHITE LOGO.006 m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: e2fc05351cd5d424a81fa2a6b695f69d, type: 3} + m_Texture: {fileID: 2800000, guid: 4785122502f730049823c5dd0cea52b0, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Sandia/Seoul/PALMBEACH WHITE LOGO.006.mat.meta b/Assets/Materials/Sandia/Seoul/PALMBEACH WHITE LOGO.006.mat.meta new file mode 100644 index 0000000..be80d02 --- /dev/null +++ b/Assets/Materials/Sandia/Seoul/PALMBEACH WHITE LOGO.006.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 31ccb65ff26e28147a46dcac06beb7ca +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Sandia/Seoul/Seoul linen.001.mat b/Assets/Materials/Sandia/Seoul/Seoul linen.001.mat index 4b97ba3..eb43216 100644 --- a/Assets/Materials/Sandia/Seoul/Seoul linen.001.mat +++ b/Assets/Materials/Sandia/Seoul/Seoul linen.001.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 7444dcec9372d514abfcc6d76fc96ac0, type: 3} + m_Texture: {fileID: 2800000, guid: 8351bade3936c864aadca736eedc10f1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Models/Cleo.fbx b/Assets/Models/Cleo.fbx new file mode 100644 index 0000000..03b935b --- /dev/null +++ b/Assets/Models/Cleo.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb6da9929cd7e4154d6b8945d4a3f870256b1d548cfd26702381393702db845a +size 396258956 diff --git a/Assets/Models/Sandia_Brighter.fbx.meta b/Assets/Models/Cleo.fbx.meta similarity index 65% rename from Assets/Models/Sandia_Brighter.fbx.meta rename to Assets/Models/Cleo.fbx.meta index d1f41b5..2bd600d 100644 --- a/Assets/Models/Sandia_Brighter.fbx.meta +++ b/Assets/Models/Cleo.fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a111fe03c04803540b4eadfd7393394f +guid: cffeeee406d883e45b35a8917980c66b ModelImporter: serializedVersion: 22200 internalIDToNameTable: [] @@ -7,63 +7,43 @@ ModelImporter: - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: Bangkok Rock.001 - second: {fileID: 2100000, guid: 1278b108e46b04642a8ccb3e9f55dd62, type: 2} + name: Capitalino tan + second: {fileID: 2100000, guid: 178d8f2ea75fc3a4db5cd670fe5022ce, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: CALLE STRIPE_CACAO & CINNAMON.006 - second: {fileID: 2100000, guid: 724cfd87fd317254d90b687e33f8914e, type: 2} + name: Chocolate stained Wood + second: {fileID: 2100000, guid: f9732f00251d93142bc1a3e9470385cb, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: CUSHION BORDER.006 - second: {fileID: 2100000, guid: 2feb8d7c44c24c941924e43070717cc3, type: 2} + name: Chocolate stained Wood Logo + second: {fileID: 2100000, guid: b65eab9eae9e8ea48b9b24566470cea2, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: FILICUDI CINNAMON.006 - second: {fileID: 2100000, guid: 982116dd037729d43b86e16d15a2736f, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: FUR FF.006 - second: {fileID: 2100000, guid: 5ce16d658ef2d0349a325249a1434269, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: PALMBEACH WHITE LOGO.006 - second: {fileID: 2100000, guid: a25ba151d6322054a8448c95675897e3, type: 2} + name: Filicudi white + second: {fileID: 2100000, guid: 610c0a734e82f034c904143633707566, type: 2} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule - name: Fur cushion color - second: {fileID: 2800000, guid: 51fef9cea37422c48b1360c6c625d4f5, type: 3} + name: Capitolino tan color + second: {fileID: 2800000, guid: 95cfea40be0ee1942a937f13de58e577, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule - name: Logo cushion border color alt - second: {fileID: 2800000, guid: 011b3bf961655a2438c902d22bdde7e2, type: 3} + name: Chocolate Stained Wood Color + second: {fileID: 2800000, guid: e31b85f8a0c10d64e9683cc40e07a728, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule - name: Logo cushion color alt - second: {fileID: 2800000, guid: 50d7b25c3255eb4428ea3813e57bcc4b, type: 3} + name: Chocolate Stained Wood Logo Color + second: {fileID: 2800000, guid: 519630f1e9eef6c4fb0c1641af6c7de8, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule - name: Red cushion color - second: {fileID: 2800000, guid: 4e13ef0be6b12944aa49c225ef469641, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Striped cushion color - second: {fileID: 2800000, guid: 2b441b5cb9c568b4ba32936b0aeaf73f, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Yellow velvet brighter color - second: {fileID: 2800000, guid: e281a2272552ae54e8eccf47e40222d0, type: 3} + name: Filicui White Color + second: {fileID: 2800000, guid: 591cf74094498cc4f90bd22baff87d65, type: 3} materials: materialImportMode: 2 materialName: 0 @@ -103,8 +83,8 @@ ModelImporter: importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 - importCameras: 1 - importLights: 1 + importCameras: 0 + importLights: 0 nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 diff --git a/Assets/Models/Sandia_B.fbx b/Assets/Models/Sandia_B.fbx deleted file mode 100644 index 7a7d125..0000000 --- a/Assets/Models/Sandia_B.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d09890b7acf367884fe60ccef55cd0859aedcc5000fbbad035cd9a139308b9cc -size 351867372 diff --git a/Assets/Models/Sandia_B.fbx.meta b/Assets/Models/Sandia_B.fbx.meta deleted file mode 100644 index fee5154..0000000 --- a/Assets/Models/Sandia_B.fbx.meta +++ /dev/null @@ -1,204 +0,0 @@ -fileFormatVersion: 2 -guid: 96db7c6cc668ffe4c9b7fb7a4354a63f -ModelImporter: - serializedVersion: 22200 - internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: CALLE STRIPE_CACAO & CINNAMON - second: {fileID: 2100000, guid: 6510f681028d8644585634116d3dd595, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: CALLE STRIPE_CACAO & CINNAMON.007 - second: {fileID: 2100000, guid: 949a8c912c35d8c419c6d17dd57cb66f, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: CUSHION BORDER - second: {fileID: 2100000, guid: 1a995805143215249ba10390ed016b55, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: CUSHION BORDER.007 - second: {fileID: 2100000, guid: 183470dc2d072e240b6a75da75f36f89, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: FILICUDI CINNAMON - second: {fileID: 2100000, guid: 36c592bd0fd91bb42aa39df29ff3b828, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: FILICUDI CINNAMON.007 - second: {fileID: 2100000, guid: 50414cb99349cf342b381f88b79bd369, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: FUR FF - second: {fileID: 2100000, guid: 0983f2d710d7a064ab1c9cab224ce19f, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: FUR FF.007 - second: {fileID: 2100000, guid: f9a4ce3b3f154d943ab5236a9f4ccf18, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: PALMBEACH WHITE LOGO - second: {fileID: 2100000, guid: da8c1b8df7d229045ab8e59db3d2382b, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: PALMBEACH WHITE LOGO.007 - second: {fileID: 2100000, guid: 324bda6e9f4fa0149b03207b981e0196, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: Velvet.001 - second: {fileID: 2100000, guid: 0ea6d6f1225c56042b479f12a3a5f117, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: Velvet.003 - second: {fileID: 2100000, guid: f85eb4fff16903a49ac02bd82c4b946f, type: 2} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Fur cushion color - second: {fileID: 2800000, guid: e2fc05351cd5d424a81fa2a6b695f69d, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Logo cushion border color - second: {fileID: 2800000, guid: ac63c25eaa8c2d742993eeea30ebb64a, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Logo cushion color mod - second: {fileID: 2800000, guid: d174d1c6f3c912345a410420843aedd2, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Red cushion color - second: {fileID: 2800000, guid: 8e39c557773c0794595094c068165aa7, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Striped cushion color - second: {fileID: 2800000, guid: 0ba4f9f7ca6af6b45b28c7bd906ecd6b, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Yellow velvet color - second: {fileID: 2800000, guid: 48713b9532fa3094cb4fd7657ba3fce3, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Yellow velvet roughness - second: {fileID: 2800000, guid: 8420f5468f6e08d479024597154c79eb, type: 3} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - motionNodeName: - rigImportErrors: - rigImportWarnings: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importPhysicalCameras: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 1 - importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - strictVertexDataChecks: 0 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Models/Sandia_Bright.fbx b/Assets/Models/Sandia_Bright.fbx deleted file mode 100644 index 699c4b0..0000000 --- a/Assets/Models/Sandia_Bright.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea8572fc182fe1b5bd6621184eca0e5d04a84ae8a2a7b130681560ea7c0726a2 -size 255758156 diff --git a/Assets/Models/Sandia_Bright.fbx.meta b/Assets/Models/Sandia_Bright.fbx.meta deleted file mode 100644 index 53f6749..0000000 --- a/Assets/Models/Sandia_Bright.fbx.meta +++ /dev/null @@ -1,174 +0,0 @@ -fileFormatVersion: 2 -guid: 175bfca21f0632846a5677e77f9ea181 -ModelImporter: - serializedVersion: 22200 - internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: CALLE STRIPE_CACAO & CINNAMON.005 - second: {fileID: 2100000, guid: 2185fabe043f2ab4db77eb242375c3d3, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: CUSHION BORDER.005 - second: {fileID: 2100000, guid: 980dbe02dff9c4840a3be2d0a01c4493, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: FILICUDI CINNAMON.005 - second: {fileID: 2100000, guid: bcab187081de6f94a8b39d9e4f2bd097, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: FUR FF.005 - second: {fileID: 2100000, guid: 50ccb7800881edb4089451602b850473, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: PALMBEACH WHITE LOGO.005 - second: {fileID: 2100000, guid: 3c286f1dce9ffea46a686fb669af7b9f, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: Ponza grape.003 - second: {fileID: 2100000, guid: 59827c12397b23347afdd7e03f0d1ea6, type: 2} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Fur cushion color - second: {fileID: 2800000, guid: 32eefca5193988d4b93b688419db2bb6, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Logo cushion border color alt - second: {fileID: 2800000, guid: e2e95d223f64d4c4ea054f4e40d06d2c, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Logo cushion color alt - second: {fileID: 2800000, guid: b8eb323035064704bb65e9371f695a02, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Red cushion color - second: {fileID: 2800000, guid: 63fb0949c8649fb45844af865086df41, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Striped cushion color - second: {fileID: 2800000, guid: 3e21ab4907d9be2499cc9fdfef058907, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Yellow velvet bright color - second: {fileID: 2800000, guid: 0133394b1b5f6364798f483e3f092307, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Yellow velvet normal - second: {fileID: 2800000, guid: 3b81549f09a87894a9331a500b15957f, type: 3} - materials: - materialImportMode: 2 - materialName: 0 - materialSearch: 1 - materialLocation: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 1 - optimizeGameObjects: 0 - removeConstantScaleCurves: 0 - motionNodeName: - rigImportErrors: - rigImportWarnings: - animationImportErrors: - animationImportWarnings: - animationRetargetingWarnings: - animationDoRetargetingWarnings: 0 - importAnimatedCustomProperties: 0 - importConstraints: 0 - animationCompression: 1 - animationRotationError: 0.5 - animationPositionError: 0.5 - animationScaleError: 0.5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - extraUserProperties: [] - clipAnimations: [] - isReadable: 0 - meshes: - lODScreenPercentages: [] - globalScale: 1 - meshCompression: 0 - addColliders: 0 - useSRGBMaterialColor: 1 - sortHierarchyByName: 1 - importPhysicalCameras: 1 - importVisibility: 1 - importBlendShapes: 1 - importCameras: 1 - importLights: 1 - nodeNameCollisionStrategy: 1 - fileIdsGeneration: 2 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - keepQuads: 0 - weldVertices: 1 - bakeAxisConversion: 0 - preserveHierarchy: 0 - skinWeightsMode: 0 - maxBonesPerVertex: 4 - minBoneWeight: 0.001 - optimizeBones: 1 - meshOptimizationFlags: -1 - indexFormat: 0 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVMarginMethod: 1 - secondaryUVMinLightmapResolution: 40 - secondaryUVMinObjectScale: 1 - secondaryUVPackMargin: 4 - useFileScale: 1 - strictVertexDataChecks: 0 - tangentSpace: - normalSmoothAngle: 60 - normalImportMode: 0 - tangentImportMode: 3 - normalCalculationMode: 4 - legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 - blendShapeNormalImportMode: 1 - normalSmoothingSource: 0 - referencedClips: [] - importAnimation: 1 - humanDescription: - serializedVersion: 3 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - globalScale: 1 - rootMotionBoneName: - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 - humanoidOversampling: 1 - avatarSetup: 0 - addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 1 - remapMaterialsIfMaterialImportModeIsNone: 0 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Models/Sandia_Brighter.fbx b/Assets/Models/Sandia_Brighter.fbx deleted file mode 100644 index 64dbb3b..0000000 --- a/Assets/Models/Sandia_Brighter.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8642b74b0cb0ae20a89eb522a546d7422071d7435720a66b7260b1ccfd597ecf -size 220624892 diff --git a/Assets/Models/Sandia_Original.fbx b/Assets/Models/Sandia_Original.fbx index 072764a..8295880 100644 --- a/Assets/Models/Sandia_Original.fbx +++ b/Assets/Models/Sandia_Original.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3fdacf7129dad9c20a23ae8510417e2a5986cad7a3757d686d39eca66e857af -size 351834460 +oid sha256:ebb57d48fc37c88a16391c5fda5566860142ffbaad142beb5bcc1124f0a4f6b7 +size 348662204 diff --git a/Assets/Models/Sandia_Original.fbx.meta b/Assets/Models/Sandia_Original.fbx.meta index bd58bb7..586804b 100644 --- a/Assets/Models/Sandia_Original.fbx.meta +++ b/Assets/Models/Sandia_Original.fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c59aca9c1b49deb41bb52a8e5fdbc60e +guid: 2edf5ab52f9b640439e76ed059ac260d ModelImporter: serializedVersion: 22200 internalIDToNameTable: [] @@ -7,68 +7,78 @@ ModelImporter: - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: CALLE STRIPE_CACAO & CINNAMON.003 - second: {fileID: 2100000, guid: 2c9a98a7651d590449e00029b472f8c3, type: 2} + name: Bangkok Rock.001 + second: {fileID: 2100000, guid: 9e246a7c69bcb7c4a9498073e33f552f, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: CUSHION BORDER.003 - second: {fileID: 2100000, guid: 8b2ab604b13924c4dab4a9211c727eae, type: 2} + name: CALLE STRIPE_CACAO & CINNAMON.006 + second: {fileID: 2100000, guid: f91739b7c1f0daf4396c2ad9c0672e11, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: FILICUDI CINNAMON.003 - second: {fileID: 2100000, guid: 1a0d427563153b64d96b7fd9e35d8c2c, type: 2} + name: CUSHION BORDER.006 + second: {fileID: 2100000, guid: 27be645857766a14ab87a014487fabb4, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: FUR FF.003 - second: {fileID: 2100000, guid: 3526fc9216fb2b04bb6ee6d8994a0982, type: 2} + name: FILICUDI CINNAMON.006 + second: {fileID: 2100000, guid: f6edbdac7bac95b4f99a82ddc1b9fd7d, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: PALMBEACH WHITE LOGO.003 - second: {fileID: 2100000, guid: 52b28e6a7667cf948a88ed252703414d, type: 2} + name: FUR FF.006 + second: {fileID: 2100000, guid: 35e568169b3da0a41be65deed67f53c2, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: Velvet.002 - second: {fileID: 2100000, guid: 32820d39cef2cd9458f3d8addb94574b, type: 2} + name: PALMBEACH WHITE LOGO.006 + second: {fileID: 2100000, guid: e9972da832ea3d042bf590e936d53cc6, type: 2} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Fur cushion color - second: {fileID: 2800000, guid: f144009d1185ac14c951da28ce9f84cd, type: 3} + second: {fileID: 2800000, guid: 8bbc9ae782a51f84a83f59078b70dd82, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Logo cushion border color - second: {fileID: 2800000, guid: d6bafc0a5d1590d49816576034293052, type: 3} + second: {fileID: 2800000, guid: 1862a96a6c318214cab372af66207a19, type: 3} + - first: + type: UnityEngine:Texture2D + assembly: UnityEngine.CoreModule + name: Logo cushion border color alt + second: {fileID: 2800000, guid: 09b6e1591ac5ae5458f5e54f13f01995, type: 3} + - first: + type: UnityEngine:Texture2D + assembly: UnityEngine.CoreModule + name: Logo cushion color alt + second: {fileID: 2800000, guid: c16b921c9c20893488580735c06cf956, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Logo cushion color mod - second: {fileID: 2800000, guid: 167a317a221436648a3f927a496f2bb5, type: 3} + second: {fileID: 2800000, guid: 50709a532da857643aaf28177f49bcbb, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Red cushion color - second: {fileID: 2800000, guid: 1b43ae9747e07ee45a717cd4439898bf, type: 3} + second: {fileID: 2800000, guid: 1104d09dfb5c7944fb4f29423b410f07, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Striped cushion color - second: {fileID: 2800000, guid: a3177095530f11542b102ed1308d9988, type: 3} + second: {fileID: 2800000, guid: 3916f7cdba1d2b842b175ae2230f612a, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule - name: Yellow velvet color - second: {fileID: 2800000, guid: e95daee9af353b847a34197da77a182c, type: 3} + name: Yellow velvet bright color + second: {fileID: 2800000, guid: cea2a355dd2460d40ac4334f6698e0c5, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule - name: Yellow velvet roughness - second: {fileID: 2800000, guid: a5013d4d89562d1438282cfd37e8ca55, type: 3} + name: Yellow velvet brighter color + second: {fileID: 2800000, guid: 109da59915e07204cb6700121223ff11, type: 3} materials: materialImportMode: 2 materialName: 0 diff --git a/Assets/Models/Sandia_Seoul.fbx b/Assets/Models/Sandia_Seoul.fbx index 70d2521..43603ec 100644 --- a/Assets/Models/Sandia_Seoul.fbx +++ b/Assets/Models/Sandia_Seoul.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50bc264371ed32ea9c6c9f37daa72824292b33ce1adcdaa7f8a9f418edb720aa -size 234833244 +oid sha256:bbdd28112a414bef6d7e630c5149ec31f45f76066a24b7db867f7adf74698aae +size 234860204 diff --git a/Assets/Models/Sandia_Seoul.fbx.meta b/Assets/Models/Sandia_Seoul.fbx.meta index 3fac493..990d782 100644 --- a/Assets/Models/Sandia_Seoul.fbx.meta +++ b/Assets/Models/Sandia_Seoul.fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 30dfab80176d3b142ab310beb952e7be +guid: 3c14ff19ec0f8ca4fae22692254052ff ModelImporter: serializedVersion: 22200 internalIDToNameTable: [] @@ -7,28 +7,28 @@ ModelImporter: - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: CALLE STRIPE_CACAO & CINNAMON.004 - second: {fileID: 2100000, guid: c401684f541b82d4a9a0174dd10446ae, type: 2} + name: CALLE STRIPE_CACAO & CINNAMON.006 + second: {fileID: 2100000, guid: 94fc3a471c53d694f913eed186047d8a, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: CUSHION BORDER.004 - second: {fileID: 2100000, guid: 2c2eb75222877944696bffe67cdcc69c, type: 2} + name: CUSHION BORDER.006 + second: {fileID: 2100000, guid: aca0170be85c3004b91d62003bece021, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: FILICUDI CINNAMON.004 - second: {fileID: 2100000, guid: bbc94fdc03821414b852bddec3d647da, type: 2} + name: FILICUDI CINNAMON.006 + second: {fileID: 2100000, guid: c60e46cb965c92843a3477b2c14c38bb, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: FUR FF.004 - second: {fileID: 2100000, guid: b0244f0eb362e774fa60a188a0d3cf27, type: 2} + name: FUR FF.006 + second: {fileID: 2100000, guid: 2152fa3acb38e93458128b7b55f5d41c, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: PALMBEACH WHITE LOGO.004 - second: {fileID: 2100000, guid: 07907de7fc9ddd24a8902d21e01a25ca, type: 2} + name: PALMBEACH WHITE LOGO.006 + second: {fileID: 2100000, guid: 31ccb65ff26e28147a46dcac06beb7ca, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule @@ -38,32 +38,32 @@ ModelImporter: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Fur cushion color - second: {fileID: 2800000, guid: bee84f07ea83f5a4ca964947b75e9878, type: 3} + second: {fileID: 2800000, guid: bd86831a1e6448543b9369f1fd06a364, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Logo cushion border color alt - second: {fileID: 2800000, guid: 2266c4518bb1f2747920a24898418330, type: 3} + second: {fileID: 2800000, guid: afaa54413e58bf64ebd3b8256436f83d, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Logo cushion color alt - second: {fileID: 2800000, guid: 1760003fad6f09a469ff498e04fc0853, type: 3} + second: {fileID: 2800000, guid: 4785122502f730049823c5dd0cea52b0, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Red cushion color - second: {fileID: 2800000, guid: d544f0a425e2b88498bd3624e113468b, type: 3} + second: {fileID: 2800000, guid: 4fdb4dc07460a9c4898bc8fee4020e73, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Seoul Linen color - second: {fileID: 2800000, guid: 7444dcec9372d514abfcc6d76fc96ac0, type: 3} + second: {fileID: 2800000, guid: 8351bade3936c864aadca736eedc10f1, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Striped cushion color - second: {fileID: 2800000, guid: 8cb86c2198e491b4fb11b45f4421678a, type: 3} + second: {fileID: 2800000, guid: 8440f429174eb594482ea567c5a68ebc, type: 3} materials: materialImportMode: 2 materialName: 0 diff --git a/Assets/Prefab/Cleo.prefab b/Assets/Prefab/Cleo.prefab new file mode 100644 index 0000000..ac8f5a4 --- /dev/null +++ b/Assets/Prefab/Cleo.prefab @@ -0,0 +1,110 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &6532612766938416510 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: cffeeee406d883e45b35a8917980c66b, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cffeeee406d883e45b35a8917980c66b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cffeeee406d883e45b35a8917980c66b, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cffeeee406d883e45b35a8917980c66b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cffeeee406d883e45b35a8917980c66b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cffeeee406d883e45b35a8917980c66b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cffeeee406d883e45b35a8917980c66b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cffeeee406d883e45b35a8917980c66b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cffeeee406d883e45b35a8917980c66b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: cffeeee406d883e45b35a8917980c66b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3893569311029501362, guid: cffeeee406d883e45b35a8917980c66b, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: cffeeee406d883e45b35a8917980c66b, type: 3} + propertyPath: m_Name + value: Cleo + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: cffeeee406d883e45b35a8917980c66b, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: cffeeee406d883e45b35a8917980c66b, type: 3} + propertyPath: m_TagString + value: Selectable + objectReference: {fileID: 0} + - target: {fileID: 2548489492842245292, guid: cffeeee406d883e45b35a8917980c66b, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7474627784167400812, guid: cffeeee406d883e45b35a8917980c66b, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: + - {fileID: 65702495048144492, guid: cffeeee406d883e45b35a8917980c66b, type: 3} + - {fileID: 7869873546869171050, guid: cffeeee406d883e45b35a8917980c66b, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: cffeeee406d883e45b35a8917980c66b, type: 3} + insertIndex: -1 + addedObject: {fileID: 6932100124852629104} + m_SourcePrefab: {fileID: 100100000, guid: cffeeee406d883e45b35a8917980c66b, type: 3} +--- !u!1 &6226764569625688111 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: cffeeee406d883e45b35a8917980c66b, type: 3} + m_PrefabInstance: {fileID: 6532612766938416510} + m_PrefabAsset: {fileID: 0} +--- !u!65 &6932100124852629104 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6226764569625688111} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.8393523, y: 1.076242, z: 0.7730879} + m_Center: {x: -0.017527014, y: -0.12925386, z: 0.027852267} diff --git a/Assets/Prefab/Sandia_Brighter.prefab.meta b/Assets/Prefab/Cleo.prefab.meta similarity index 74% rename from Assets/Prefab/Sandia_Brighter.prefab.meta rename to Assets/Prefab/Cleo.prefab.meta index cda0f41..0f998b3 100644 --- a/Assets/Prefab/Sandia_Brighter.prefab.meta +++ b/Assets/Prefab/Cleo.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 10fd1baf1d33e46469e1484626608dd3 +guid: 7161bc8dd62e23649bbea53ddca38fe3 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefab/Sandia_Bright.prefab b/Assets/Prefab/Sandia_Bright.prefab deleted file mode 100644 index 824a453..0000000 --- a/Assets/Prefab/Sandia_Bright.prefab +++ /dev/null @@ -1,120 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &3915131695578125865 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8504973454910321432, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -7461785203076470766, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 707962214103442745, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} - propertyPath: m_Name - value: Sandia_Bright - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} - propertyPath: m_TagString - value: Selectable - objectReference: {fileID: 0} - - target: {fileID: 6480979605524990316, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 8607163237712032185, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} - insertIndex: -1 - addedObject: {fileID: 1821669428009637765} - m_SourcePrefab: {fileID: 100100000, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} ---- !u!1 &4221067304064232312 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 175bfca21f0632846a5677e77f9ea181, type: 3} - m_PrefabInstance: {fileID: 3915131695578125865} - m_PrefabAsset: {fileID: 0} ---- !u!65 &1821669428009637765 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4221067304064232312} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 2.7375913, y: 0.7396047, z: 1.2409264} - m_Center: {x: 0, y: 0.08152568, z: -0.052322328} diff --git a/Assets/Prefab/Sandia_Bright.prefab.meta b/Assets/Prefab/Sandia_Bright.prefab.meta deleted file mode 100644 index 9b516a3..0000000 --- a/Assets/Prefab/Sandia_Bright.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ac647af2b37142441b020e10da657e61 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefab/Sandia_Brighter.prefab b/Assets/Prefab/Sandia_Brighter.prefab deleted file mode 100644 index c16a469..0000000 --- a/Assets/Prefab/Sandia_Brighter.prefab +++ /dev/null @@ -1,116 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &2198196006118403871 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: a111fe03c04803540b4eadfd7393394f, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a111fe03c04803540b4eadfd7393394f, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a111fe03c04803540b4eadfd7393394f, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a111fe03c04803540b4eadfd7393394f, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a111fe03c04803540b4eadfd7393394f, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a111fe03c04803540b4eadfd7393394f, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a111fe03c04803540b4eadfd7393394f, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a111fe03c04803540b4eadfd7393394f, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a111fe03c04803540b4eadfd7393394f, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: a111fe03c04803540b4eadfd7393394f, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7994797705509562334, guid: a111fe03c04803540b4eadfd7393394f, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -2483457360873903965, guid: a111fe03c04803540b4eadfd7393394f, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: a111fe03c04803540b4eadfd7393394f, type: 3} - propertyPath: m_Name - value: Sandia_Brighter - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: a111fe03c04803540b4eadfd7393394f, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: a111fe03c04803540b4eadfd7393394f, type: 3} - propertyPath: m_TagString - value: Selectable - objectReference: {fileID: 0} - - target: {fileID: 1048557623486924390, guid: a111fe03c04803540b4eadfd7393394f, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 2286881742900085478, guid: a111fe03c04803540b4eadfd7393394f, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 8159868104006456718, guid: a111fe03c04803540b4eadfd7393394f, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a111fe03c04803540b4eadfd7393394f, type: 3} - insertIndex: -1 - addedObject: {fileID: -4691020483020118899} - m_SourcePrefab: {fileID: 100100000, guid: a111fe03c04803540b4eadfd7393394f, type: 3} ---- !u!1 &1315304318694560334 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: a111fe03c04803540b4eadfd7393394f, type: 3} - m_PrefabInstance: {fileID: 2198196006118403871} - m_PrefabAsset: {fileID: 0} ---- !u!65 &-4691020483020118899 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1315304318694560334} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 2.7278566, y: 0.72743666, z: 1.2360592} - m_Center: {x: -0.00000023841858, y: 0.07544148, z: -0.052322388} diff --git a/Assets/Prefab/Sandia_Original.prefab b/Assets/Prefab/Sandia_Original.prefab index 65659d8..99d33e4 100644 --- a/Assets/Prefab/Sandia_Original.prefab +++ b/Assets/Prefab/Sandia_Original.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &7379024879776412326 +--- !u!1001 &5479171355772647032 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -8,102 +8,100 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -8679921383154817045, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} + - target: {fileID: -8679921383154817045, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} + - target: {fileID: -8679921383154817045, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} + - target: {fileID: -8679921383154817045, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} + - target: {fileID: -8679921383154817045, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} + - target: {fileID: -8679921383154817045, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} + - target: {fileID: -8679921383154817045, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} + - target: {fileID: -8679921383154817045, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} + - target: {fileID: -8679921383154817045, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} + - target: {fileID: -8679921383154817045, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} + - target: {fileID: -8679921383154817045, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -4856827502284789080, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} + - target: {fileID: -7994797705509562334, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_Layer value: 6 objectReference: {fileID: 0} - - target: {fileID: -4150886726098164377, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} + - target: {fileID: -2483457360873903965, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_Layer value: 6 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} + - target: {fileID: 919132149155446097, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_Name value: Sandia_Original objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} + - target: {fileID: 919132149155446097, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_Layer value: 6 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} + - target: {fileID: 919132149155446097, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_TagString value: Selectable objectReference: {fileID: 0} - - target: {fileID: 1945263359323730849, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} + - target: {fileID: 1048557623486924390, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_Layer value: 6 objectReference: {fileID: 0} - - target: {fileID: 3717912529839923233, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} + - target: {fileID: 2286881742900085478, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_Layer value: 6 objectReference: {fileID: 0} - - target: {fileID: 6094631546476722615, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} + - target: {fileID: 8159868104006456718, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_Layer value: 6 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: -8700617353114198275, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} + - {fileID: 65702495048144492, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} insertIndex: -1 - addedObject: {fileID: 2347518316999232572} - m_SourcePrefab: {fileID: 100100000, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} ---- !u!1 &7685104527507886071 stripped + addedObject: {fileID: 2027700185008669007} + m_SourcePrefab: {fileID: 100100000, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} +--- !u!1 &4668126701482396457 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c59aca9c1b49deb41bb52a8e5fdbc60e, type: 3} - m_PrefabInstance: {fileID: 7379024879776412326} + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} + m_PrefabInstance: {fileID: 5479171355772647032} m_PrefabAsset: {fileID: 0} ---- !u!65 &2347518316999232572 +--- !u!65 &2027700185008669007 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7685104527507886071} + m_GameObject: {fileID: 4668126701482396457} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -116,5 +114,5 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 2.7198553, y: 0.7129623, z: 1.2301042} - m_Center: {x: -0.001185894, y: 0.06760815, z: -0.05574712} + m_Size: {x: 2.7180703, y: 0.7272146, z: 1.2129643} + m_Center: {x: -0.0023926497, y: 0.07417859, z: -0.053839207} diff --git a/Assets/Prefab/Sandia_Seoul.prefab b/Assets/Prefab/Sandia_Seoul.prefab index 86ea6b3..8048064 100644 --- a/Assets/Prefab/Sandia_Seoul.prefab +++ b/Assets/Prefab/Sandia_Seoul.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &7698347425519716844 +--- !u!1001 &4190862597793380653 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -8,102 +8,100 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} + - target: {fileID: -8679921383154817045, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} + - target: {fileID: -8679921383154817045, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} + - target: {fileID: -8679921383154817045, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} + - target: {fileID: -8679921383154817045, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} + - target: {fileID: -8679921383154817045, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} + - target: {fileID: -8679921383154817045, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} + - target: {fileID: -8679921383154817045, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} + - target: {fileID: -8679921383154817045, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} + - target: {fileID: -8679921383154817045, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} + - target: {fileID: -8679921383154817045, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -1666124529458451630, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} + - target: {fileID: -7994797705509562334, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} propertyPath: m_Layer value: 6 objectReference: {fileID: 0} - - target: {fileID: 67444240525435405, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} + - target: {fileID: -2483457360873903965, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} propertyPath: m_Layer value: 6 objectReference: {fileID: 0} - - target: {fileID: 99593173342607956, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} + - target: {fileID: 919132149155446097, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} propertyPath: m_Name value: Sandia_Seoul objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} + - target: {fileID: 919132149155446097, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} propertyPath: m_Layer value: 6 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} + - target: {fileID: 919132149155446097, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} propertyPath: m_TagString value: Selectable objectReference: {fileID: 0} - - target: {fileID: 3521109243151063259, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} + - target: {fileID: 1048557623486924390, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} propertyPath: m_Layer value: 6 objectReference: {fileID: 0} - - target: {fileID: 7898634311935120001, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} + - target: {fileID: 2286881742900085478, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8159868104006456718, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} propertyPath: m_Layer value: 6 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: -8700617353114198275, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} + - {fileID: 65702495048144492, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} insertIndex: -1 - addedObject: {fileID: 245372825112062026} - m_SourcePrefab: {fileID: 100100000, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} ---- !u!1 &7356471540363850941 stripped + addedObject: {fileID: 5524598028417987098} + m_SourcePrefab: {fileID: 100100000, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} +--- !u!1 &3956841657705219196 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 30dfab80176d3b142ab310beb952e7be, type: 3} - m_PrefabInstance: {fileID: 7698347425519716844} + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} + m_PrefabInstance: {fileID: 4190862597793380653} m_PrefabAsset: {fileID: 0} ---- !u!65 &245372825112062026 +--- !u!65 &5524598028417987098 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7356471540363850941} + m_GameObject: {fileID: 3956841657705219196} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -116,5 +114,5 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 2.7229896, y: 0.73230374, z: 1.2311919} - m_Center: {x: -0.009734392, y: 0.07787518, z: -0.052322507} + m_Size: {x: 2.727857, y: 0.7955775, z: 1.2190243} + m_Center: {x: 0.0024335384, y: 0.10221124, z: -0.04867226} diff --git a/Assets/Scenes/ARScreen.unity b/Assets/Scenes/ARScreen.unity index e473f41..e634eb0 100644 --- a/Assets/Scenes/ARScreen.unity +++ b/Assets/Scenes/ARScreen.unity @@ -691,8 +691,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1498425121} m_HandleRect: {fileID: 1498425120} m_Direction: 0 - m_Value: 0.009578878 - m_Size: 0.31375092 + m_Value: 0.009578929 + m_Size: 0.31294698 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -754,7 +754,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &518661786 RectTransform: m_ObjectHideFlags: 0 @@ -769,9 +769,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 753346143} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 458.18018, y: -101.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 521, y: 327} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &518661787 @@ -786,7 +786,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6bcac7e483a825d48bb0e327d618f0ce, type: 3} m_Name: m_EditorClassIdentifier: - prefabToInstance: {fileID: 384462179027726530, guid: d7ca2b9d438a97e46b228f65e3ea34fd, type: 3} + prefabToInstance: {fileID: 6226764569625688111, guid: 7161bc8dd62e23649bbea53ddca38fe3, type: 3} gridPrefab: {fileID: 7069418182187326116, guid: 9d00637d689464a7aabd732cb44e1552, type: 3} --- !u!114 &518661788 MonoBehaviour: @@ -1120,8 +1120,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 2.6195068, y: 0} - m_SizeDelta: {x: -342.7124, y: 300} + m_AnchoredPosition: {x: 5.616028, y: 0} + m_SizeDelta: {x: -346.8048, y: 300} m_Pivot: {x: 0.5, y: 0} --- !u!114 &717270552 MonoBehaviour: @@ -1309,8 +1309,6 @@ RectTransform: - {fileID: 518661786} - {fileID: 1510757701} - {fileID: 1141372680} - - {fileID: 1077327212} - - {fileID: 983487248} - {fileID: 1824976691} - {fileID: 2016642935} - {fileID: 1198553687} @@ -1447,276 +1445,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_PlanePrefab: {fileID: 5367619110524989107, guid: 6791394203e51fd4381b2bab568d6455, type: 3} m_DetectionMode: 1 ---- !u!1 &983487247 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 983487248} - - component: {fileID: 983487252} - - component: {fileID: 983487251} - - component: {fileID: 983487250} - - component: {fileID: 983487249} - m_Layer: 5 - m_Name: Sandia_Brighter - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &983487248 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 983487247} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 753346143} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 521, y: 327} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &983487249 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 983487247} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6bcac7e483a825d48bb0e327d618f0ce, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabToInstance: {fileID: 1315304318694560334, guid: 10fd1baf1d33e46469e1484626608dd3, type: 3} - gridPrefab: {fileID: 7069418182187326116, guid: 9d00637d689464a7aabd732cb44e1552, type: 3} ---- !u!114 &983487250 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 983487247} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 983487251} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &983487251 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 983487247} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 173b0925f1f52714a8a3db2ca056f762, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &983487252 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 983487247} - m_CullTransparentMesh: 1 ---- !u!1 &1077327211 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1077327212} - - component: {fileID: 1077327216} - - component: {fileID: 1077327215} - - component: {fileID: 1077327214} - - component: {fileID: 1077327213} - m_Layer: 5 - m_Name: Sandia_Bright - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1077327212 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077327211} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 753346143} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 521, y: 327} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1077327213 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077327211} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6bcac7e483a825d48bb0e327d618f0ce, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabToInstance: {fileID: 4221067304064232312, guid: ac647af2b37142441b020e10da657e61, type: 3} - gridPrefab: {fileID: 7069418182187326116, guid: 9d00637d689464a7aabd732cb44e1552, type: 3} ---- !u!114 &1077327214 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077327211} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1077327215} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1077327215 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077327211} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0fb1c9560f0972149a1b8d00f9990e68, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1077327216 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1077327211} - m_CullTransparentMesh: 1 --- !u!1 &1087465590 GameObject: m_ObjectHideFlags: 0 @@ -2052,7 +1780,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6bcac7e483a825d48bb0e327d618f0ce, type: 3} m_Name: m_EditorClassIdentifier: - prefabToInstance: {fileID: 7356471540363850941, guid: 65f9bcf61b8f4b84d8883473bb85dbc0, type: 3} + prefabToInstance: {fileID: 3956841657705219196, guid: 65f9bcf61b8f4b84d8883473bb85dbc0, type: 3} gridPrefab: {fileID: 7069418182187326116, guid: 9d00637d689464a7aabd732cb44e1552, type: 3} --- !u!114 &1141372682 MonoBehaviour: @@ -2731,7 +2459,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6bcac7e483a825d48bb0e327d618f0ce, type: 3} m_Name: m_EditorClassIdentifier: - prefabToInstance: {fileID: 7685104527507886071, guid: be2751640704a964197f73b09dbd1581, type: 3} + prefabToInstance: {fileID: 4668126701482396457, guid: be2751640704a964197f73b09dbd1581, type: 3} gridPrefab: {fileID: 7069418182187326116, guid: 9d00637d689464a7aabd732cb44e1552, type: 3} --- !u!114 &1510757703 MonoBehaviour: @@ -2797,7 +2525,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5177911f4092f994f813a206cd5de842, type: 3} + m_Sprite: {fileID: 21300000, guid: 0fb1c9560f0972149a1b8d00f9990e68, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Materials/Sandia/Bright.meta b/Assets/Textures/Cleo.meta similarity index 77% rename from Assets/Materials/Sandia/Bright.meta rename to Assets/Textures/Cleo.meta index 2676bd0..df9fa41 100644 --- a/Assets/Materials/Sandia/Bright.meta +++ b/Assets/Textures/Cleo.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8a1f41cc053c5c34e977d1a953ee26a7 +guid: 5a4636dce52ae394fbdc243c9bd7a0df folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Textures/Cleo/Capitolino tan color.png b/Assets/Textures/Cleo/Capitolino tan color.png new file mode 100644 index 0000000..4cf420b --- /dev/null +++ b/Assets/Textures/Cleo/Capitolino tan color.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09ba8599cfdb0e3666d7e2b4607d0c2f526b0e75f032c3569d632eaabfe0a055 +size 39293340 diff --git a/Assets/Textures/Sandia/B/Logo cushion border color.png.meta b/Assets/Textures/Cleo/Capitolino tan color.png.meta similarity index 98% rename from Assets/Textures/Sandia/B/Logo cushion border color.png.meta rename to Assets/Textures/Cleo/Capitolino tan color.png.meta index 72a5251..6b22c16 100644 --- a/Assets/Textures/Sandia/B/Logo cushion border color.png.meta +++ b/Assets/Textures/Cleo/Capitolino tan color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ac63c25eaa8c2d742993eeea30ebb64a +guid: 95cfea40be0ee1942a937f13de58e577 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Cleo/Chocolate Stained Wood Color.png b/Assets/Textures/Cleo/Chocolate Stained Wood Color.png new file mode 100644 index 0000000..c7654f7 --- /dev/null +++ b/Assets/Textures/Cleo/Chocolate Stained Wood Color.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:317405f75100cd62147454b24398153c3a76e9e89ad340e278acdda1d9d49056 +size 16531508 diff --git a/Assets/Textures/Sandia/B/Logo cushion color mod.png.meta b/Assets/Textures/Cleo/Chocolate Stained Wood Color.png.meta similarity index 98% rename from Assets/Textures/Sandia/B/Logo cushion color mod.png.meta rename to Assets/Textures/Cleo/Chocolate Stained Wood Color.png.meta index c305bb4..9be34c2 100644 --- a/Assets/Textures/Sandia/B/Logo cushion color mod.png.meta +++ b/Assets/Textures/Cleo/Chocolate Stained Wood Color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d174d1c6f3c912345a410420843aedd2 +guid: e31b85f8a0c10d64e9683cc40e07a728 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Cleo/Chocolate Stained Wood Logo Color.png b/Assets/Textures/Cleo/Chocolate Stained Wood Logo Color.png new file mode 100644 index 0000000..9ef62a9 --- /dev/null +++ b/Assets/Textures/Cleo/Chocolate Stained Wood Logo Color.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4100d5d8d23dc0db6041a9f7f74cac62ee32ceb6b8893a58e71096f72235a45 +size 132922825 diff --git a/Assets/Textures/Sandia/B/Fur cushion color.png.meta b/Assets/Textures/Cleo/Chocolate Stained Wood Logo Color.png.meta similarity index 98% rename from Assets/Textures/Sandia/B/Fur cushion color.png.meta rename to Assets/Textures/Cleo/Chocolate Stained Wood Logo Color.png.meta index bb19bcb..d109e98 100644 --- a/Assets/Textures/Sandia/B/Fur cushion color.png.meta +++ b/Assets/Textures/Cleo/Chocolate Stained Wood Logo Color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e2fc05351cd5d424a81fa2a6b695f69d +guid: 519630f1e9eef6c4fb0c1641af6c7de8 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Cleo/Filicui White Color.png b/Assets/Textures/Cleo/Filicui White Color.png new file mode 100644 index 0000000..6bf5df0 --- /dev/null +++ b/Assets/Textures/Cleo/Filicui White Color.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:94224f5f77816703052b82ca546a511ce27d99817f56e257147a34deb81d2cce +size 132922825 diff --git a/Assets/Textures/Sandia/B/Red cushion color.png.meta b/Assets/Textures/Cleo/Filicui White Color.png.meta similarity index 98% rename from Assets/Textures/Sandia/B/Red cushion color.png.meta rename to Assets/Textures/Cleo/Filicui White Color.png.meta index 59f354b..908736d 100644 --- a/Assets/Textures/Sandia/B/Red cushion color.png.meta +++ b/Assets/Textures/Cleo/Filicui White Color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8e39c557773c0794595094c068165aa7 +guid: 591cf74094498cc4f90bd22baff87d65 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sandia/B.meta b/Assets/Textures/Sandia/B.meta deleted file mode 100644 index 0facc47..0000000 --- a/Assets/Textures/Sandia/B.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: df155531131d562468676ba79ec80a4f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Sandia/B/Fur cushion color.png b/Assets/Textures/Sandia/B/Fur cushion color.png deleted file mode 100644 index ef2009e..0000000 --- a/Assets/Textures/Sandia/B/Fur cushion color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac07c97e73df59ef20851062a13d6329a09c084c08dd29b427af6dbb00b727a2 -size 132922825 diff --git a/Assets/Textures/Sandia/B/Logo cushion border color.png b/Assets/Textures/Sandia/B/Logo cushion border color.png deleted file mode 100644 index 38564c2..0000000 --- a/Assets/Textures/Sandia/B/Logo cushion border color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:96b84ebe7ce4f4029d418ef61373c7c56e09dfb07d3d6d41032753f1708d1c7d -size 132922825 diff --git a/Assets/Textures/Sandia/B/Logo cushion color mod.png b/Assets/Textures/Sandia/B/Logo cushion color mod.png deleted file mode 100644 index 801f67b..0000000 --- a/Assets/Textures/Sandia/B/Logo cushion color mod.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef961460ae35e3cc4f2b10ee5a179db80e3c2052de9ad656c63f7bd935a098bf -size 19366907 diff --git a/Assets/Textures/Sandia/B/Red cushion color.png b/Assets/Textures/Sandia/B/Red cushion color.png deleted file mode 100644 index 93992fc..0000000 --- a/Assets/Textures/Sandia/B/Red cushion color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b4fc281f3eb0536d64b3f4c4d410247576b6225b035f4c051d7461b44346de8 -size 29325216 diff --git a/Assets/Textures/Sandia/B/Striped cushion color.png b/Assets/Textures/Sandia/B/Striped cushion color.png deleted file mode 100644 index 3845525..0000000 --- a/Assets/Textures/Sandia/B/Striped cushion color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:917454bd593587f4a57e88f18c384fe9cb18aeb4431762eac0b60aaa7421c5c4 -size 18892844 diff --git a/Assets/Textures/Sandia/B/Striped cushion color.png.meta b/Assets/Textures/Sandia/B/Striped cushion color.png.meta deleted file mode 100644 index 97d3537..0000000 --- a/Assets/Textures/Sandia/B/Striped cushion color.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 0ba4f9f7ca6af6b45b28c7bd906ecd6b -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Sandia/B/Yellow velvet color.png b/Assets/Textures/Sandia/B/Yellow velvet color.png deleted file mode 100644 index b772db9..0000000 --- a/Assets/Textures/Sandia/B/Yellow velvet color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a0c7bec597981a2446672eecb8c522c465870a01f279fa1a75dfe6b67c759d9d -size 12654009 diff --git a/Assets/Textures/Sandia/B/Yellow velvet color.png.meta b/Assets/Textures/Sandia/B/Yellow velvet color.png.meta deleted file mode 100644 index 6eceef9..0000000 --- a/Assets/Textures/Sandia/B/Yellow velvet color.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 48713b9532fa3094cb4fd7657ba3fce3 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Sandia/B/Yellow velvet roughness.png b/Assets/Textures/Sandia/B/Yellow velvet roughness.png deleted file mode 100644 index 2350e01..0000000 --- a/Assets/Textures/Sandia/B/Yellow velvet roughness.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2dce320c0b23b281e152188fc429c15ae8166240a3b28bf479ae9a1fa899a75 -size 882002 diff --git a/Assets/Textures/Sandia/B/Yellow velvet roughness.png.meta b/Assets/Textures/Sandia/B/Yellow velvet roughness.png.meta deleted file mode 100644 index e0f16d0..0000000 --- a/Assets/Textures/Sandia/B/Yellow velvet roughness.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 8420f5468f6e08d479024597154c79eb -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Sandia/Bright.meta b/Assets/Textures/Sandia/Bright.meta deleted file mode 100644 index 9177a99..0000000 --- a/Assets/Textures/Sandia/Bright.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d37f03638433f51448c919670b64df75 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Sandia/Bright/Fur cushion color.png b/Assets/Textures/Sandia/Bright/Fur cushion color.png deleted file mode 100644 index ef2009e..0000000 --- a/Assets/Textures/Sandia/Bright/Fur cushion color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac07c97e73df59ef20851062a13d6329a09c084c08dd29b427af6dbb00b727a2 -size 132922825 diff --git a/Assets/Textures/Sandia/Bright/Fur cushion color.png.meta b/Assets/Textures/Sandia/Bright/Fur cushion color.png.meta deleted file mode 100644 index 90a7700..0000000 --- a/Assets/Textures/Sandia/Bright/Fur cushion color.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 32eefca5193988d4b93b688419db2bb6 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - 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: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Sandia/Bright/Red cushion color.png b/Assets/Textures/Sandia/Bright/Red cushion color.png deleted file mode 100644 index 93992fc..0000000 --- a/Assets/Textures/Sandia/Bright/Red cushion color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b4fc281f3eb0536d64b3f4c4d410247576b6225b035f4c051d7461b44346de8 -size 29325216 diff --git a/Assets/Textures/Sandia/Bright/Red cushion color.png.meta b/Assets/Textures/Sandia/Bright/Red cushion color.png.meta deleted file mode 100644 index 7c97727..0000000 --- a/Assets/Textures/Sandia/Bright/Red cushion color.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 63fb0949c8649fb45844af865086df41 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - 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: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Sandia/Bright/Striped cushion color.png b/Assets/Textures/Sandia/Bright/Striped cushion color.png deleted file mode 100644 index 3845525..0000000 --- a/Assets/Textures/Sandia/Bright/Striped cushion color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:917454bd593587f4a57e88f18c384fe9cb18aeb4431762eac0b60aaa7421c5c4 -size 18892844 diff --git a/Assets/Textures/Sandia/Bright/Striped cushion color.png.meta b/Assets/Textures/Sandia/Bright/Striped cushion color.png.meta deleted file mode 100644 index fe773f2..0000000 --- a/Assets/Textures/Sandia/Bright/Striped cushion color.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 3e21ab4907d9be2499cc9fdfef058907 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - 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: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Sandia/Brighter.meta b/Assets/Textures/Sandia/Brighter.meta deleted file mode 100644 index 6a448df..0000000 --- a/Assets/Textures/Sandia/Brighter.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d605175227a6e784ba063db454b82bbd -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Sandia/Brighter/Fur cushion color.png b/Assets/Textures/Sandia/Brighter/Fur cushion color.png deleted file mode 100644 index ef2009e..0000000 --- a/Assets/Textures/Sandia/Brighter/Fur cushion color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac07c97e73df59ef20851062a13d6329a09c084c08dd29b427af6dbb00b727a2 -size 132922825 diff --git a/Assets/Textures/Sandia/Brighter/Fur cushion color.png.meta b/Assets/Textures/Sandia/Brighter/Fur cushion color.png.meta deleted file mode 100644 index 197fc7c..0000000 --- a/Assets/Textures/Sandia/Brighter/Fur cushion color.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 51fef9cea37422c48b1360c6c625d4f5 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - 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: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Sandia/Brighter/Logo cushion border color alt.png b/Assets/Textures/Sandia/Brighter/Logo cushion border color alt.png deleted file mode 100644 index 63b3326..0000000 --- a/Assets/Textures/Sandia/Brighter/Logo cushion border color alt.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25985fff5fd06bab1b59a4a21c5a8ea07df767be1aec1644e6b5dfda9052d650 -size 3624139 diff --git a/Assets/Textures/Sandia/Brighter/Logo cushion border color alt.png.meta b/Assets/Textures/Sandia/Brighter/Logo cushion border color alt.png.meta deleted file mode 100644 index 1098f46..0000000 --- a/Assets/Textures/Sandia/Brighter/Logo cushion border color alt.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 011b3bf961655a2438c902d22bdde7e2 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - 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: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Sandia/Brighter/Logo cushion color alt.png b/Assets/Textures/Sandia/Brighter/Logo cushion color alt.png deleted file mode 100644 index e05020e..0000000 --- a/Assets/Textures/Sandia/Brighter/Logo cushion color alt.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:02aeeb19fff7b61a322a2f9c2280c190ab695f8b6edcad6bc367b8828164f305 -size 19307629 diff --git a/Assets/Textures/Sandia/Brighter/Logo cushion color alt.png.meta b/Assets/Textures/Sandia/Brighter/Logo cushion color alt.png.meta deleted file mode 100644 index e4fe208..0000000 --- a/Assets/Textures/Sandia/Brighter/Logo cushion color alt.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 50d7b25c3255eb4428ea3813e57bcc4b -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - 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: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Sandia/Brighter/Red cushion color.png b/Assets/Textures/Sandia/Brighter/Red cushion color.png deleted file mode 100644 index 93992fc..0000000 --- a/Assets/Textures/Sandia/Brighter/Red cushion color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b4fc281f3eb0536d64b3f4c4d410247576b6225b035f4c051d7461b44346de8 -size 29325216 diff --git a/Assets/Textures/Sandia/Brighter/Red cushion color.png.meta b/Assets/Textures/Sandia/Brighter/Red cushion color.png.meta deleted file mode 100644 index 94cff01..0000000 --- a/Assets/Textures/Sandia/Brighter/Red cushion color.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 4e13ef0be6b12944aa49c225ef469641 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - 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: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Sandia/Brighter/Striped cushion color.png b/Assets/Textures/Sandia/Brighter/Striped cushion color.png deleted file mode 100644 index 3845525..0000000 --- a/Assets/Textures/Sandia/Brighter/Striped cushion color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:917454bd593587f4a57e88f18c384fe9cb18aeb4431762eac0b60aaa7421c5c4 -size 18892844 diff --git a/Assets/Textures/Sandia/Brighter/Striped cushion color.png.meta b/Assets/Textures/Sandia/Brighter/Striped cushion color.png.meta deleted file mode 100644 index 860a9e3..0000000 --- a/Assets/Textures/Sandia/Brighter/Striped cushion color.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 2b441b5cb9c568b4ba32936b0aeaf73f -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - 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: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Sandia/Original.meta b/Assets/Textures/Sandia/Original.meta index b1bbe1c..e231150 100644 --- a/Assets/Textures/Sandia/Original.meta +++ b/Assets/Textures/Sandia/Original.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4681edaca13f7684a8c0c20c2f4f1c2f +guid: dfe7b5c2f6c7e9948af480cedc4ed6b6 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Textures/Sandia/Original/Fur cushion color.png.meta b/Assets/Textures/Sandia/Original/Fur cushion color.png.meta index ab8db44..b3f4c03 100644 --- a/Assets/Textures/Sandia/Original/Fur cushion color.png.meta +++ b/Assets/Textures/Sandia/Original/Fur cushion color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f144009d1185ac14c951da28ce9f84cd +guid: 8bbc9ae782a51f84a83f59078b70dd82 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sandia/Bright/Logo cushion border color alt.png b/Assets/Textures/Sandia/Original/Logo cushion border color alt.png similarity index 100% rename from Assets/Textures/Sandia/Bright/Logo cushion border color alt.png rename to Assets/Textures/Sandia/Original/Logo cushion border color alt.png diff --git a/Assets/Textures/Sandia/Bright/Logo cushion border color alt.png.meta b/Assets/Textures/Sandia/Original/Logo cushion border color alt.png.meta similarity index 98% rename from Assets/Textures/Sandia/Bright/Logo cushion border color alt.png.meta rename to Assets/Textures/Sandia/Original/Logo cushion border color alt.png.meta index 46c09c0..8f3072e 100644 --- a/Assets/Textures/Sandia/Bright/Logo cushion border color alt.png.meta +++ b/Assets/Textures/Sandia/Original/Logo cushion border color alt.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e2e95d223f64d4c4ea054f4e40d06d2c +guid: 09b6e1591ac5ae5458f5e54f13f01995 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sandia/Original/Logo cushion border color.png.meta b/Assets/Textures/Sandia/Original/Logo cushion border color.png.meta index 2a57fa9..18916f5 100644 --- a/Assets/Textures/Sandia/Original/Logo cushion border color.png.meta +++ b/Assets/Textures/Sandia/Original/Logo cushion border color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d6bafc0a5d1590d49816576034293052 +guid: 1862a96a6c318214cab372af66207a19 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sandia/Bright/Logo cushion color alt.png b/Assets/Textures/Sandia/Original/Logo cushion color alt.png similarity index 100% rename from Assets/Textures/Sandia/Bright/Logo cushion color alt.png rename to Assets/Textures/Sandia/Original/Logo cushion color alt.png diff --git a/Assets/Textures/Sandia/Bright/Logo cushion color alt.png.meta b/Assets/Textures/Sandia/Original/Logo cushion color alt.png.meta similarity index 98% rename from Assets/Textures/Sandia/Bright/Logo cushion color alt.png.meta rename to Assets/Textures/Sandia/Original/Logo cushion color alt.png.meta index d59cd94..2352d9a 100644 --- a/Assets/Textures/Sandia/Bright/Logo cushion color alt.png.meta +++ b/Assets/Textures/Sandia/Original/Logo cushion color alt.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b8eb323035064704bb65e9371f695a02 +guid: c16b921c9c20893488580735c06cf956 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sandia/Original/Logo cushion color mod.png.meta b/Assets/Textures/Sandia/Original/Logo cushion color mod.png.meta index d70b5aa..3d469fd 100644 --- a/Assets/Textures/Sandia/Original/Logo cushion color mod.png.meta +++ b/Assets/Textures/Sandia/Original/Logo cushion color mod.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 167a317a221436648a3f927a496f2bb5 +guid: 50709a532da857643aaf28177f49bcbb TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -52,9 +52,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -112,7 +112,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Assets/Textures/Sandia/Original/Red cushion color.png.meta b/Assets/Textures/Sandia/Original/Red cushion color.png.meta index 5606e8b..cedf945 100644 --- a/Assets/Textures/Sandia/Original/Red cushion color.png.meta +++ b/Assets/Textures/Sandia/Original/Red cushion color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1b43ae9747e07ee45a717cd4439898bf +guid: 1104d09dfb5c7944fb4f29423b410f07 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sandia/Original/Striped cushion color.png.meta b/Assets/Textures/Sandia/Original/Striped cushion color.png.meta index fdbab53..e0f542c 100644 --- a/Assets/Textures/Sandia/Original/Striped cushion color.png.meta +++ b/Assets/Textures/Sandia/Original/Striped cushion color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a3177095530f11542b102ed1308d9988 +guid: 3916f7cdba1d2b842b175ae2230f612a TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sandia/Bright/Yellow velvet bright color.png b/Assets/Textures/Sandia/Original/Yellow velvet bright color.png similarity index 100% rename from Assets/Textures/Sandia/Bright/Yellow velvet bright color.png rename to Assets/Textures/Sandia/Original/Yellow velvet bright color.png diff --git a/Assets/Textures/Sandia/Bright/Yellow velvet bright color.png.meta b/Assets/Textures/Sandia/Original/Yellow velvet bright color.png.meta similarity index 98% rename from Assets/Textures/Sandia/Bright/Yellow velvet bright color.png.meta rename to Assets/Textures/Sandia/Original/Yellow velvet bright color.png.meta index ff29d3f..be7a797 100644 --- a/Assets/Textures/Sandia/Bright/Yellow velvet bright color.png.meta +++ b/Assets/Textures/Sandia/Original/Yellow velvet bright color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0133394b1b5f6364798f483e3f092307 +guid: cea2a355dd2460d40ac4334f6698e0c5 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sandia/Brighter/Yellow velvet brighter color.png b/Assets/Textures/Sandia/Original/Yellow velvet brighter color.png similarity index 100% rename from Assets/Textures/Sandia/Brighter/Yellow velvet brighter color.png rename to Assets/Textures/Sandia/Original/Yellow velvet brighter color.png diff --git a/Assets/Textures/Sandia/Brighter/Yellow velvet brighter color.png.meta b/Assets/Textures/Sandia/Original/Yellow velvet brighter color.png.meta similarity index 98% rename from Assets/Textures/Sandia/Brighter/Yellow velvet brighter color.png.meta rename to Assets/Textures/Sandia/Original/Yellow velvet brighter color.png.meta index 13af9e0..4ce7eac 100644 --- a/Assets/Textures/Sandia/Brighter/Yellow velvet brighter color.png.meta +++ b/Assets/Textures/Sandia/Original/Yellow velvet brighter color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e281a2272552ae54e8eccf47e40222d0 +guid: 109da59915e07204cb6700121223ff11 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sandia/Original/Yellow velvet color.png b/Assets/Textures/Sandia/Original/Yellow velvet color.png deleted file mode 100644 index b772db9..0000000 --- a/Assets/Textures/Sandia/Original/Yellow velvet color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a0c7bec597981a2446672eecb8c522c465870a01f279fa1a75dfe6b67c759d9d -size 12654009 diff --git a/Assets/Textures/Sandia/Original/Yellow velvet color.png.meta b/Assets/Textures/Sandia/Original/Yellow velvet color.png.meta deleted file mode 100644 index 1d01be2..0000000 --- a/Assets/Textures/Sandia/Original/Yellow velvet color.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: e95daee9af353b847a34197da77a182c -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - 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: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Sandia/Original/Yellow velvet roughness.png b/Assets/Textures/Sandia/Original/Yellow velvet roughness.png deleted file mode 100644 index 2350e01..0000000 --- a/Assets/Textures/Sandia/Original/Yellow velvet roughness.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2dce320c0b23b281e152188fc429c15ae8166240a3b28bf479ae9a1fa899a75 -size 882002 diff --git a/Assets/Textures/Sandia/Original/Yellow velvet roughness.png.meta b/Assets/Textures/Sandia/Original/Yellow velvet roughness.png.meta deleted file mode 100644 index 335f465..0000000 --- a/Assets/Textures/Sandia/Original/Yellow velvet roughness.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: a5013d4d89562d1438282cfd37e8ca55 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - 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: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Sandia/Seoul.meta b/Assets/Textures/Sandia/Seoul.meta index 120ea62..d61e985 100644 --- a/Assets/Textures/Sandia/Seoul.meta +++ b/Assets/Textures/Sandia/Seoul.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1043add3cd42b2d4286459580b1b3591 +guid: de42431ea1d8857468315aafcb38c214 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Textures/Sandia/Seoul/Fur cushion color.png.meta b/Assets/Textures/Sandia/Seoul/Fur cushion color.png.meta index 0759f76..ea0574c 100644 --- a/Assets/Textures/Sandia/Seoul/Fur cushion color.png.meta +++ b/Assets/Textures/Sandia/Seoul/Fur cushion color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bee84f07ea83f5a4ca964947b75e9878 +guid: bd86831a1e6448543b9369f1fd06a364 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sandia/Seoul/Logo cushion border color alt.png.meta b/Assets/Textures/Sandia/Seoul/Logo cushion border color alt.png.meta index 65e7644..fe4ab39 100644 --- a/Assets/Textures/Sandia/Seoul/Logo cushion border color alt.png.meta +++ b/Assets/Textures/Sandia/Seoul/Logo cushion border color alt.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2266c4518bb1f2747920a24898418330 +guid: afaa54413e58bf64ebd3b8256436f83d TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sandia/Seoul/Logo cushion color alt.png.meta b/Assets/Textures/Sandia/Seoul/Logo cushion color alt.png.meta index ed471e3..c44e313 100644 --- a/Assets/Textures/Sandia/Seoul/Logo cushion color alt.png.meta +++ b/Assets/Textures/Sandia/Seoul/Logo cushion color alt.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 1760003fad6f09a469ff498e04fc0853 +guid: 4785122502f730049823c5dd0cea52b0 TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -52,9 +52,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -112,7 +112,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Assets/Textures/Sandia/Seoul/Red cushion color.png.meta b/Assets/Textures/Sandia/Seoul/Red cushion color.png.meta index 0680658..4cbe225 100644 --- a/Assets/Textures/Sandia/Seoul/Red cushion color.png.meta +++ b/Assets/Textures/Sandia/Seoul/Red cushion color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d544f0a425e2b88498bd3624e113468b +guid: 4fdb4dc07460a9c4898bc8fee4020e73 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sandia/Seoul/Seoul Linen color.png.meta b/Assets/Textures/Sandia/Seoul/Seoul Linen color.png.meta index 291a538..c94f45f 100644 --- a/Assets/Textures/Sandia/Seoul/Seoul Linen color.png.meta +++ b/Assets/Textures/Sandia/Seoul/Seoul Linen color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7444dcec9372d514abfcc6d76fc96ac0 +guid: 8351bade3936c864aadca736eedc10f1 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sandia/Seoul/Striped cushion color.png.meta b/Assets/Textures/Sandia/Seoul/Striped cushion color.png.meta index c589a90..21d6cd4 100644 --- a/Assets/Textures/Sandia/Seoul/Striped cushion color.png.meta +++ b/Assets/Textures/Sandia/Seoul/Striped cushion color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8cb86c2198e491b4fb11b45f4421678a +guid: 8440f429174eb594482ea567c5a68ebc TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 8d0cb5a..015b04e 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,9 +5,6 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 0 - path: Assets/Scenes/MainScreen.unity - guid: 21b26bd2f8bf74544b0b1b120fc9ca8d - enabled: 1 path: Assets/Scenes/MeasuringSystem.unity guid: 943fa0203c62c3445acf4302da821c87 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 849e9c8..246c2c4 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -145,6 +145,14 @@ PlayerSettings: - {fileID: 4800000, guid: b02d09082cbc14569ae46c12d9836abc, type: 3} - {fileID: 4800000, guid: f40a6c94c8e1b494d93d434ae522a14f, type: 3} - {fileID: 4800000, guid: 0f45334fa661448c886e4f99ba812a7e, type: 3} + - {fileID: 479186601668263405, guid: e04dc9557a6bcec40b5d8576988f74a3, type: 2} + - {fileID: 11400000, guid: 6bfaaf31cb485f64fb956f1d691a0e1d, type: 2} + - {fileID: -7180841881952691092, guid: 228964b93c232624fac8c242b79176e5, type: 2} + - {fileID: 4800000, guid: b1d4c517492046e1a4e4cc49b0b73b42, type: 3} + - {fileID: 4800000, guid: 2b7e3540272684e0b8e12fed2c4609de, type: 3} + - {fileID: 11400000, guid: 911becadf2ac07e4da62b8afa0b9ea7f, type: 2} + - {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3} + - {fileID: 4800000, guid: 0945859e5a1034c2cb6dce53cb4fb899, type: 3} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1