From 60d9159b0462b3b4776972e191759897ecf1499b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ignacio=20G=C3=B3mez=20Puga?= Date: Sun, 23 Mar 2025 18:45:46 -0600 Subject: [PATCH] Test new models 2 --- Assets/Images/Fendi-Emblem.png | 3 - Assets/Images/FendiImaageQLogo.png | 3 + .../FendiImaageQLogo.png.meta} | 2 +- Assets/Images/ImaageQLogo.png | 3 + ...i-Emblem.png.meta => ImaageQLogo.png.meta} | 2 +- Assets/Materials/Cleo/Capitalino tan.mat | 4 +- .../Cleo/Chocolate stained Wood Logo.mat | 2 +- .../Materials/Cleo/Chocolate stained Wood.mat | 11 +- Assets/Materials/Cleo/Cleo40.meta | 8 - .../Cleo40/Chocolate stained Wood Logo.mat | 83 ---- .../Chocolate stained Wood Logo.mat.meta | 8 - .../Cleo/Cleo40/Chocolate stained Wood.mat | 84 ---- .../Cleo40/Chocolate stained Wood.mat.meta | 8 - .../Materials/Cleo/Cleo40/Filicudi white.mat | 83 ---- .../Cleo/Cleo40/Filicudi white.mat.meta | 8 - Assets/Materials/Cleo/Filicudi white.mat | 2 +- .../Sandia/Original/Bangkok Rock.001.mat | 84 ---- .../Sandia/Original/Bangkok Rock.001.mat.meta | 8 - .../CALLE STRIPE_CACAO & CINNAMON.006.mat | 2 +- .../CUSHION BORDER.001.mat | 2 +- .../CUSHION BORDER.001.mat.meta | 2 +- .../Sandia/Original/CUSHION BORDER.006.mat | 83 ---- .../Original/CUSHION BORDER.006.mat.meta | 8 - .../Sandia/Original/FILICUDI CINNAMON.006.mat | 2 +- .../Materials/Sandia/Original/FUR FF.006.mat | 2 +- .../PALMBEACH WHITE LOGO.001.mat | 2 +- .../PALMBEACH WHITE LOGO.001.mat.meta | 2 +- .../Original/PALMBEACH WHITE LOGO.006.mat | 83 ---- .../PALMBEACH WHITE LOGO.006.mat.meta | 8 - .../Original/Velvet.002.mat} | 6 +- .../Original/Velvet.002.mat.meta} | 2 +- Assets/Materials/Sandia/Original10.meta | 8 - .../Sandia/Original10/Bangkok Rock.001.mat | 84 ---- .../Original10/Bangkok Rock.001.mat.meta | 8 - .../CALLE STRIPE_CACAO & CINNAMON.006.mat | 83 ---- ...CALLE STRIPE_CACAO & CINNAMON.006.mat.meta | 8 - .../Sandia/Original10/CUSHION BORDER.006.mat | 83 ---- .../Original10/CUSHION BORDER.006.mat.meta | 8 - .../Original10/FILICUDI CINNAMON.006.mat | 83 ---- .../Original10/FILICUDI CINNAMON.006.mat.meta | 8 - .../Sandia/Original10/FUR FF.006.mat | 83 ---- .../Sandia/Original10/FUR FF.006.mat.meta | 8 - .../Original10/PALMBEACH WHITE LOGO.006.mat | 83 ---- .../PALMBEACH WHITE LOGO.006.mat.meta | 8 - .../CALLE STRIPE_CACAO & CINNAMON.006.mat | 2 +- .../Sandia/Seoul/CUSHION BORDER.006.mat | 2 +- .../Sandia/Seoul/FILICUDI CINNAMON.006.mat | 2 +- Assets/Materials/Sandia/Seoul/FUR FF.006.mat | 2 +- .../Sandia/Seoul/PALMBEACH WHITE LOGO.006.mat | 2 +- .../Sandia/Seoul/Seoul linen.001.mat | 2 +- Assets/Materials/Sandia/Seoul10.meta | 8 - .../CALLE STRIPE_CACAO & CINNAMON.001.mat | 83 ---- ...CALLE STRIPE_CACAO & CINNAMON.001.mat.meta | 8 - .../Sandia/Seoul10/FILICUDI CINNAMON.001.mat | 83 ---- .../Seoul10/FILICUDI CINNAMON.001.mat.meta | 8 - .../Materials/Sandia/Seoul10/FUR FF.001.mat | 83 ---- .../Sandia/Seoul10/FUR FF.001.mat.meta | 8 - .../Sandia/Seoul10/Seoul linen.001.mat | 83 ---- .../Sandia/Seoul10/Seoul linen.001.mat.meta | 8 - Assets/Materials/Sumo/102Shadow/Glass.mat | 6 +- .../Metal Brushed Horizontal Dark.001.mat | 2 +- .../Metal Brushed Horizontal.001.mat | 4 +- .../Sumo/102Shadow/Metal Brushed.001.mat | 9 +- .../Totu/103/Carnico Gray Glossy.mat | 6 +- .../103/Metal Brushed Horizontal Dark.001.mat | 2 +- .../Totu/103/Metal Brushed Horizontal.001.mat | 7 +- .../Materials/Totu/103/Metal Brushed.001.mat | 7 +- .../Totu/104/MARMO PATAGONIA CLEARER_.mat | 9 +- .../104/Metal Brushed Horizontal Dark.001.mat | 2 +- .../Totu/104/Metal Brushed Horizontal.001.mat | 2 +- .../Materials/Totu/104/Metal Brushed.001.mat | 2 +- Assets/Models/Cleo.fbx | 4 +- Assets/Models/Cleo.fbx.meta | 14 +- Assets/Models/Cleo40.fbx | 3 - Assets/Models/Cleo40.fbx.meta | 149 ------- Assets/Models/SUMO102Shadow.fbx | 4 +- Assets/Models/SUMO102Shadow.fbx.meta | 22 +- Assets/Models/SandiaOriginal.fbx | 4 +- Assets/Models/SandiaOriginal.fbx.meta | 43 +- Assets/Models/SandiaOriginal10.fbx | 3 - Assets/Models/SandiaOriginal10.fbx.meta | 169 ------- Assets/Models/SandiaSeoul.fbx | 4 +- Assets/Models/SandiaSeoul.fbx.meta | 17 +- Assets/Models/SandiaSeoul10.fbx | 3 - Assets/Models/SandiaSeoul10.fbx.meta | 169 ------- Assets/Models/TOTU103.fbx | 4 +- Assets/Models/TOTU103.fbx.meta | 18 +- Assets/Models/TOTU104.fbx | 4 +- Assets/Models/TOTU104.fbx.meta | 14 +- Assets/Prefab/Cleo.prefab | 28 +- Assets/Prefab/Cleo40.prefab | 96 ---- Assets/Prefab/Cleo40.prefab.meta | 7 - Assets/Prefab/SUMO102Shadow.prefab | 32 +- Assets/Prefab/SandiaOriginal.prefab | 20 +- Assets/Prefab/SandiaOriginal10.prefab | 116 ----- Assets/Prefab/SandiaOriginal10.prefab.meta | 7 - Assets/Prefab/SandiaSeoul.prefab | 20 +- Assets/Prefab/SandiaSeoul10.prefab | 116 ----- Assets/Prefab/SandiaSeoul10.prefab.meta | 7 - Assets/Prefab/TOTU103.prefab | 36 +- Assets/Prefab/TOTU104.prefab | 42 +- Assets/Scenes/ARScreen.unity | 422 +----------------- .../ObjectDetection/ObjectDetectionSample.cs | 2 +- .../Cleo/Capitolino tan color alt.png | 3 + ...meta => Capitolino tan color alt.png.meta} | 2 +- Assets/Textures/Cleo/Capitolino tan color.png | 3 - .../Chocolate Stained Wood Color.png.meta | 2 +- ...Chocolate Stained Wood Logo Color.png.meta | 2 +- Assets/Textures/Cleo/Cleo40.meta | 8 - .../Cleo/Cleo40/Capitolino tan color.png | 3 - .../Cleo/Cleo40/Capitolino tan color.png.meta | 127 ------ .../Cleo40/Chocolate Stained Wood Color.png | 3 - .../Chocolate Stained Wood Logo Color.png | 3 - .../Cleo/Cleo40/Filicui White Color.png | 3 - .../Cleo/Filicui White Color.png.meta | 2 +- .../Original/Fur cushion color.png.meta | 18 +- .../Logo cushion border color alt.png.meta | 18 +- .../Logo cushion border color.png.meta | 18 +- .../Original/Logo cushion color alt.png.meta | 18 +- .../Original/Logo cushion color mod.png.meta | 18 +- .../Original/Red cushion color.png.meta | 18 +- .../Original/Striped cushion color.png.meta | 18 +- .../Yellow velvet bright color.png.meta | 2 +- .../Original/Yellow velvet brighter color.png | 3 - .../Yellow velvet brighter color.png.meta | 127 ------ .../Sandia/Original/Yellow velvet color.png | 3 + .../Original/Yellow velvet color.png.meta} | 2 +- .../Original/Yellow velvet roughness.png | 3 + .../Yellow velvet roughness.png.meta} | 2 +- Assets/Textures/Sandia/Original10.meta | 8 - .../Sandia/Original10/Fur cushion color.png | 3 - .../Original10/Logo cushion border color.png | 3 - .../Original10/Logo cushion color mod.png | 3 - .../Logo cushion color mod.png.meta | 127 ------ .../Sandia/Original10/Red cushion color.png | 3 - .../Original10/Red cushion color.png.meta | 127 ------ .../Original10/Striped cushion color.png | 3 - .../Original10/Striped cushion color.png.meta | 127 ------ .../Original10/Yellow velvet bright color.png | 3 - .../Yellow velvet bright color.png.meta | 127 ------ .../Sandia/Seoul/Fur cushion color.png.meta | 18 +- .../Logo cushion border color alt.png.meta | 18 +- .../Seoul/Logo cushion color alt.png.meta | 18 +- .../Sandia/Seoul/Red cushion color.png.meta | 18 +- .../Sandia/Seoul/Seoul Linen color alt.png | 3 + .../Seoul/Seoul Linen color alt.png.meta} | 2 +- .../Sandia/Seoul/Seoul Linen color.png.meta | 18 +- .../Seoul/Striped cushion color.png.meta | 18 +- Assets/Textures/Sandia/Seoul10.meta | 8 - .../Sandia/Seoul10/Fur cushion color.png | 3 - .../Sandia/Seoul10/Fur cushion color.png.meta | 127 ------ .../Seoul10/Logo cushion border color alt.png | 3 - .../Logo cushion border color alt.png.meta | 127 ------ .../Sandia/Seoul10/Logo cushion color alt.png | 3 - .../Seoul10/Logo cushion color alt.png.meta | 127 ------ .../Sandia/Seoul10/Red cushion color.png | 3 - .../Sandia/Seoul10/Red cushion color.png.meta | 127 ------ .../Sandia/Seoul10/Seoul Linen color.png | 3 - .../Sandia/Seoul10/Seoul Linen color.png.meta | 127 ------ .../Sandia/Seoul10/Striped cushion color.png | 3 - .../Seoul10/Striped cushion color.png.meta | 127 ------ .../Sumo/102Shadow/Glass Color Shadow alt.png | 3 + .../Glass Color Shadow alt.png.meta} | 2 +- .../Sumo/102Shadow/Glass Color Shadow.png | 3 - .../102Shadow/Glass Color Shadow.png.meta | 127 ------ .../Textures/Sumo/102Shadow/Glass UV.png.meta | 2 +- .../Sumo/102Shadow/Metal Color.png.meta | 2 +- .../102Shadow/Metal Horizontal Color.png.meta | 2 +- .../Metal Horizontal Dark Color.png.meta | 2 +- .../Metal Horizontal Dark Roughness.png.meta | 2 +- .../Metal Horizontal Roughness.png.meta | 2 +- .../Sumo/102Shadow/Metal Roughness.png.meta | 2 +- .../Totu/103/103 Metal Color.png.meta | 2 +- .../103/103 Metal Horizontal Color.png.meta | 2 +- .../103 Metal Horizontal Dark Color.png.meta | 2 +- ...3 Metal Horizontal Dark Roughness.png.meta | 2 +- .../103 Metal Horizontal Roughness.png.meta | 2 +- .../Totu/103/103 Metal Roughness.png.meta | 2 +- .../103/CARNICO GREY GLOSSY Texture.png.meta | 18 +- ...PATAGONIA CLEARER Texture clearer.png.meta | 18 +- Assets/Textures/Totu/104/Metal Color.png.meta | 2 +- .../Totu/104/Metal Horizontal Color.png.meta | 2 +- .../104/Metal Horizontal Dark Color.png.meta | 2 +- .../Metal Horizontal Dark Roughness.png.meta | 2 +- .../104/Metal Horizontal Roughness.png.meta | 2 +- .../Totu/104/Metal Roughness.png.meta | 2 +- ProjectSettings/ProjectSettings.asset | 124 ++--- 187 files changed, 462 insertions(+), 4941 deletions(-) delete mode 100644 Assets/Images/Fendi-Emblem.png create mode 100644 Assets/Images/FendiImaageQLogo.png rename Assets/{Textures/Cleo/Cleo40/Chocolate Stained Wood Color.png.meta => Images/FendiImaageQLogo.png.meta} (98%) create mode 100644 Assets/Images/ImaageQLogo.png rename Assets/Images/{Fendi-Emblem.png.meta => ImaageQLogo.png.meta} (98%) delete mode 100644 Assets/Materials/Cleo/Cleo40.meta delete mode 100644 Assets/Materials/Cleo/Cleo40/Chocolate stained Wood Logo.mat delete mode 100644 Assets/Materials/Cleo/Cleo40/Chocolate stained Wood Logo.mat.meta delete mode 100644 Assets/Materials/Cleo/Cleo40/Chocolate stained Wood.mat delete mode 100644 Assets/Materials/Cleo/Cleo40/Chocolate stained Wood.mat.meta delete mode 100644 Assets/Materials/Cleo/Cleo40/Filicudi white.mat delete mode 100644 Assets/Materials/Cleo/Cleo40/Filicudi white.mat.meta delete mode 100644 Assets/Materials/Sandia/Original/Bangkok Rock.001.mat delete mode 100644 Assets/Materials/Sandia/Original/Bangkok Rock.001.mat.meta rename Assets/Materials/Sandia/{Seoul10 => Original}/CUSHION BORDER.001.mat (96%) rename Assets/Materials/Sandia/{Seoul10 => Original}/CUSHION BORDER.001.mat.meta (79%) delete mode 100644 Assets/Materials/Sandia/Original/CUSHION BORDER.006.mat delete mode 100644 Assets/Materials/Sandia/Original/CUSHION BORDER.006.mat.meta rename Assets/Materials/Sandia/{Seoul10 => Original}/PALMBEACH WHITE LOGO.001.mat (96%) rename Assets/Materials/Sandia/{Seoul10 => Original}/PALMBEACH WHITE LOGO.001.mat.meta (79%) delete mode 100644 Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.006.mat delete mode 100644 Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.006.mat.meta rename Assets/Materials/{Cleo/Cleo40/Capitalino tan.mat => Sandia/Original/Velvet.002.mat} (91%) rename Assets/Materials/{Cleo/Cleo40/Capitalino tan.mat.meta => Sandia/Original/Velvet.002.mat.meta} (79%) delete mode 100644 Assets/Materials/Sandia/Original10.meta delete mode 100644 Assets/Materials/Sandia/Original10/Bangkok Rock.001.mat delete mode 100644 Assets/Materials/Sandia/Original10/Bangkok Rock.001.mat.meta delete mode 100644 Assets/Materials/Sandia/Original10/CALLE STRIPE_CACAO & CINNAMON.006.mat delete mode 100644 Assets/Materials/Sandia/Original10/CALLE STRIPE_CACAO & CINNAMON.006.mat.meta delete mode 100644 Assets/Materials/Sandia/Original10/CUSHION BORDER.006.mat delete mode 100644 Assets/Materials/Sandia/Original10/CUSHION BORDER.006.mat.meta delete mode 100644 Assets/Materials/Sandia/Original10/FILICUDI CINNAMON.006.mat delete mode 100644 Assets/Materials/Sandia/Original10/FILICUDI CINNAMON.006.mat.meta delete mode 100644 Assets/Materials/Sandia/Original10/FUR FF.006.mat delete mode 100644 Assets/Materials/Sandia/Original10/FUR FF.006.mat.meta delete mode 100644 Assets/Materials/Sandia/Original10/PALMBEACH WHITE LOGO.006.mat delete mode 100644 Assets/Materials/Sandia/Original10/PALMBEACH WHITE LOGO.006.mat.meta delete mode 100644 Assets/Materials/Sandia/Seoul10.meta delete mode 100644 Assets/Materials/Sandia/Seoul10/CALLE STRIPE_CACAO & CINNAMON.001.mat delete mode 100644 Assets/Materials/Sandia/Seoul10/CALLE STRIPE_CACAO & CINNAMON.001.mat.meta delete mode 100644 Assets/Materials/Sandia/Seoul10/FILICUDI CINNAMON.001.mat delete mode 100644 Assets/Materials/Sandia/Seoul10/FILICUDI CINNAMON.001.mat.meta delete mode 100644 Assets/Materials/Sandia/Seoul10/FUR FF.001.mat delete mode 100644 Assets/Materials/Sandia/Seoul10/FUR FF.001.mat.meta delete mode 100644 Assets/Materials/Sandia/Seoul10/Seoul linen.001.mat delete mode 100644 Assets/Materials/Sandia/Seoul10/Seoul linen.001.mat.meta delete mode 100644 Assets/Models/Cleo40.fbx delete mode 100644 Assets/Models/Cleo40.fbx.meta delete mode 100644 Assets/Models/SandiaOriginal10.fbx delete mode 100644 Assets/Models/SandiaOriginal10.fbx.meta delete mode 100644 Assets/Models/SandiaSeoul10.fbx delete mode 100644 Assets/Models/SandiaSeoul10.fbx.meta delete mode 100644 Assets/Prefab/Cleo40.prefab delete mode 100644 Assets/Prefab/Cleo40.prefab.meta delete mode 100644 Assets/Prefab/SandiaOriginal10.prefab delete mode 100644 Assets/Prefab/SandiaOriginal10.prefab.meta delete mode 100644 Assets/Prefab/SandiaSeoul10.prefab delete mode 100644 Assets/Prefab/SandiaSeoul10.prefab.meta create mode 100644 Assets/Textures/Cleo/Capitolino tan color alt.png rename Assets/Textures/Cleo/{Cleo40/Filicui White Color.png.meta => Capitolino tan color alt.png.meta} (98%) delete mode 100644 Assets/Textures/Cleo/Capitolino tan color.png delete mode 100644 Assets/Textures/Cleo/Cleo40.meta delete mode 100644 Assets/Textures/Cleo/Cleo40/Capitolino tan color.png delete mode 100644 Assets/Textures/Cleo/Cleo40/Capitolino tan color.png.meta delete mode 100644 Assets/Textures/Cleo/Cleo40/Chocolate Stained Wood Color.png delete mode 100644 Assets/Textures/Cleo/Cleo40/Chocolate Stained Wood Logo Color.png delete mode 100644 Assets/Textures/Cleo/Cleo40/Filicui White Color.png delete mode 100644 Assets/Textures/Sandia/Original/Yellow velvet brighter color.png delete mode 100644 Assets/Textures/Sandia/Original/Yellow velvet brighter color.png.meta create mode 100644 Assets/Textures/Sandia/Original/Yellow velvet color.png rename Assets/Textures/{Cleo/Cleo40/Chocolate Stained Wood Logo Color.png.meta => Sandia/Original/Yellow velvet color.png.meta} (98%) create mode 100644 Assets/Textures/Sandia/Original/Yellow velvet roughness.png rename Assets/Textures/Sandia/{Original10/Fur cushion color.png.meta => Original/Yellow velvet roughness.png.meta} (98%) delete mode 100644 Assets/Textures/Sandia/Original10.meta delete mode 100644 Assets/Textures/Sandia/Original10/Fur cushion color.png delete mode 100644 Assets/Textures/Sandia/Original10/Logo cushion border color.png delete mode 100644 Assets/Textures/Sandia/Original10/Logo cushion color mod.png delete mode 100644 Assets/Textures/Sandia/Original10/Logo cushion color mod.png.meta delete mode 100644 Assets/Textures/Sandia/Original10/Red cushion color.png delete mode 100644 Assets/Textures/Sandia/Original10/Red cushion color.png.meta delete mode 100644 Assets/Textures/Sandia/Original10/Striped cushion color.png delete mode 100644 Assets/Textures/Sandia/Original10/Striped cushion color.png.meta delete mode 100644 Assets/Textures/Sandia/Original10/Yellow velvet bright color.png delete mode 100644 Assets/Textures/Sandia/Original10/Yellow velvet bright color.png.meta create mode 100644 Assets/Textures/Sandia/Seoul/Seoul Linen color alt.png rename Assets/Textures/{Cleo/Capitolino tan color.png.meta => Sandia/Seoul/Seoul Linen color alt.png.meta} (98%) delete mode 100644 Assets/Textures/Sandia/Seoul10.meta delete mode 100644 Assets/Textures/Sandia/Seoul10/Fur cushion color.png delete mode 100644 Assets/Textures/Sandia/Seoul10/Fur cushion color.png.meta delete mode 100644 Assets/Textures/Sandia/Seoul10/Logo cushion border color alt.png delete mode 100644 Assets/Textures/Sandia/Seoul10/Logo cushion border color alt.png.meta delete mode 100644 Assets/Textures/Sandia/Seoul10/Logo cushion color alt.png delete mode 100644 Assets/Textures/Sandia/Seoul10/Logo cushion color alt.png.meta delete mode 100644 Assets/Textures/Sandia/Seoul10/Red cushion color.png delete mode 100644 Assets/Textures/Sandia/Seoul10/Red cushion color.png.meta delete mode 100644 Assets/Textures/Sandia/Seoul10/Seoul Linen color.png delete mode 100644 Assets/Textures/Sandia/Seoul10/Seoul Linen color.png.meta delete mode 100644 Assets/Textures/Sandia/Seoul10/Striped cushion color.png delete mode 100644 Assets/Textures/Sandia/Seoul10/Striped cushion color.png.meta create mode 100644 Assets/Textures/Sumo/102Shadow/Glass Color Shadow alt.png rename Assets/Textures/{Sandia/Original10/Logo cushion border color.png.meta => Sumo/102Shadow/Glass Color Shadow alt.png.meta} (98%) delete mode 100644 Assets/Textures/Sumo/102Shadow/Glass Color Shadow.png delete mode 100644 Assets/Textures/Sumo/102Shadow/Glass Color Shadow.png.meta diff --git a/Assets/Images/Fendi-Emblem.png b/Assets/Images/Fendi-Emblem.png deleted file mode 100644 index 7a381e1..0000000 --- a/Assets/Images/Fendi-Emblem.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4cecdae17de9c901fb1166374ac2d6e5471d960bbb5b1fdb931cdd12810a245c -size 49392 diff --git a/Assets/Images/FendiImaageQLogo.png b/Assets/Images/FendiImaageQLogo.png new file mode 100644 index 0000000..4dd4ee7 --- /dev/null +++ b/Assets/Images/FendiImaageQLogo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d29fb71bf480957fd7cfeda6bb67a0e9114f2912d044f5d6d539d9aed9a00242 +size 56853 diff --git a/Assets/Textures/Cleo/Cleo40/Chocolate Stained Wood Color.png.meta b/Assets/Images/FendiImaageQLogo.png.meta similarity index 98% rename from Assets/Textures/Cleo/Cleo40/Chocolate Stained Wood Color.png.meta rename to Assets/Images/FendiImaageQLogo.png.meta index 7521404..54ed578 100644 --- a/Assets/Textures/Cleo/Cleo40/Chocolate Stained Wood Color.png.meta +++ b/Assets/Images/FendiImaageQLogo.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 269d7092acdef664abb74ca5b6e13f67 +guid: 60f1aeeb8422c134c8a4f3e4f3bedaed TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Images/ImaageQLogo.png b/Assets/Images/ImaageQLogo.png new file mode 100644 index 0000000..2f255d0 --- /dev/null +++ b/Assets/Images/ImaageQLogo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3780f46e5292a3b60b4efc0324e28f13e1cb47057c1ed9023255227dd9037802 +size 41259 diff --git a/Assets/Images/Fendi-Emblem.png.meta b/Assets/Images/ImaageQLogo.png.meta similarity index 98% rename from Assets/Images/Fendi-Emblem.png.meta rename to Assets/Images/ImaageQLogo.png.meta index 4df089a..fcb0926 100644 --- a/Assets/Images/Fendi-Emblem.png.meta +++ b/Assets/Images/ImaageQLogo.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 108ff42928e7d774c8e6d850fe909443 +guid: 591612bbd27de904e858e744497839cf TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Materials/Cleo/Capitalino tan.mat b/Assets/Materials/Cleo/Capitalino tan.mat index 03927c4..678072c 100644 --- a/Assets/Materials/Cleo/Capitalino tan.mat +++ b/Assets/Materials/Cleo/Capitalino tan.mat @@ -29,7 +29,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: - m_Texture: {fileID: 2800000, guid: 95cfea40be0ee1942a937f13de58e577, type: 3} + m_Texture: {fileID: 2800000, guid: 218eadac3feb68f4b86d50c522307b8a, 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: 95cfea40be0ee1942a937f13de58e577, type: 3} + m_Texture: {fileID: 2800000, guid: 218eadac3feb68f4b86d50c522307b8a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Cleo/Chocolate stained Wood Logo.mat b/Assets/Materials/Cleo/Chocolate stained Wood Logo.mat index 93434bb..d17d13d 100644 --- a/Assets/Materials/Cleo/Chocolate stained Wood Logo.mat +++ b/Assets/Materials/Cleo/Chocolate stained Wood Logo.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 519630f1e9eef6c4fb0c1641af6c7de8, type: 3} + m_Texture: {fileID: 2800000, guid: 0c2f3acb1f5d6fe4e85ba07f841d38d5, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Cleo/Chocolate stained Wood.mat b/Assets/Materials/Cleo/Chocolate stained Wood.mat index 3380223..06d709a 100644 --- a/Assets/Materials/Cleo/Chocolate stained Wood.mat +++ b/Assets/Materials/Cleo/Chocolate stained Wood.mat @@ -8,12 +8,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Chocolate stained Wood - m_Shader: {fileID: 10708, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] - m_InvalidKeywords: - - _DETAIL_MULX2 + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -29,7 +28,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: - m_Texture: {fileID: 2800000, guid: e31b85f8a0c10d64e9683cc40e07a728, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailMask: @@ -45,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: e31b85f8a0c10d64e9683cc40e07a728, type: 3} + m_Texture: {fileID: 2800000, guid: f59deffb3a9171d469424631ac019e95, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -67,7 +66,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0 + - _Glossiness: 0.5 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 diff --git a/Assets/Materials/Cleo/Cleo40.meta b/Assets/Materials/Cleo/Cleo40.meta deleted file mode 100644 index 0193581..0000000 --- a/Assets/Materials/Cleo/Cleo40.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 038cf0d7859c4764187bdc3211984de7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Cleo/Cleo40/Chocolate stained Wood Logo.mat b/Assets/Materials/Cleo/Cleo40/Chocolate stained Wood Logo.mat deleted file mode 100644 index 44ac2f7..0000000 --- a/Assets/Materials/Cleo/Cleo40/Chocolate stained Wood Logo.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: Chocolate stained Wood Logo - 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: 1de0fd10c165dec478ef731f88babd39, 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/Cleo/Cleo40/Chocolate stained Wood Logo.mat.meta b/Assets/Materials/Cleo/Cleo40/Chocolate stained Wood Logo.mat.meta deleted file mode 100644 index 394bc78..0000000 --- a/Assets/Materials/Cleo/Cleo40/Chocolate stained Wood Logo.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: df554adc7c9b60d43bf783bcabf182f9 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Cleo/Cleo40/Chocolate stained Wood.mat b/Assets/Materials/Cleo/Cleo40/Chocolate stained Wood.mat deleted file mode 100644 index c5db7ad..0000000 --- a/Assets/Materials/Cleo/Cleo40/Chocolate stained Wood.mat +++ /dev/null @@ -1,84 +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: 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: 269d7092acdef664abb74ca5b6e13f67, 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: 269d7092acdef664abb74ca5b6e13f67, 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/Cleo/Cleo40/Chocolate stained Wood.mat.meta b/Assets/Materials/Cleo/Cleo40/Chocolate stained Wood.mat.meta deleted file mode 100644 index 19bd9bf..0000000 --- a/Assets/Materials/Cleo/Cleo40/Chocolate stained Wood.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3c1e6cd8f9ba6d544adbc60707c08336 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Cleo/Cleo40/Filicudi white.mat b/Assets/Materials/Cleo/Cleo40/Filicudi white.mat deleted file mode 100644 index 4d24410..0000000 --- a/Assets/Materials/Cleo/Cleo40/Filicudi white.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 white - 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: a211dddfadae7504ba96561e7d028de3, 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.1 - - _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/Cleo/Cleo40/Filicudi white.mat.meta b/Assets/Materials/Cleo/Cleo40/Filicudi white.mat.meta deleted file mode 100644 index 2a5933d..0000000 --- a/Assets/Materials/Cleo/Cleo40/Filicudi white.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 04e72c391f203c24385e1762ecff0db1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Cleo/Filicudi white.mat b/Assets/Materials/Cleo/Filicudi white.mat index 7809c29..36cff67 100644 --- a/Assets/Materials/Cleo/Filicudi white.mat +++ b/Assets/Materials/Cleo/Filicudi white.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 591cf74094498cc4f90bd22baff87d65, type: 3} + m_Texture: {fileID: 2800000, guid: b1da137d355e6e94cb7343ff55049338, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Sandia/Original/Bangkok Rock.001.mat b/Assets/Materials/Sandia/Original/Bangkok Rock.001.mat deleted file mode 100644 index 06d0251..0000000 --- a/Assets/Materials/Sandia/Original/Bangkok Rock.001.mat +++ /dev/null @@ -1,84 +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: Bangkok Rock.001 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _DETAIL_MULX2 - 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: 2800000, guid: cea2a355dd2460d40ac4334f6698e0c5, 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: cea2a355dd2460d40ac4334f6698e0c5, 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.1 - - _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/Bangkok Rock.001.mat.meta b/Assets/Materials/Sandia/Original/Bangkok Rock.001.mat.meta deleted file mode 100644 index edd76c0..0000000 --- a/Assets/Materials/Sandia/Original/Bangkok Rock.001.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9e246a7c69bcb7c4a9498073e33f552f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Original/CALLE STRIPE_CACAO & CINNAMON.006.mat b/Assets/Materials/Sandia/Original/CALLE STRIPE_CACAO & CINNAMON.006.mat index 3cb2772..72c0cc2 100644 --- a/Assets/Materials/Sandia/Original/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: 3916f7cdba1d2b842b175ae2230f612a, type: 3} + m_Texture: {fileID: 2800000, guid: 46ea6d8847452c647a14b82dd0266e6f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Sandia/Seoul10/CUSHION BORDER.001.mat b/Assets/Materials/Sandia/Original/CUSHION BORDER.001.mat similarity index 96% rename from Assets/Materials/Sandia/Seoul10/CUSHION BORDER.001.mat rename to Assets/Materials/Sandia/Original/CUSHION BORDER.001.mat index 83ede1c..004afda 100644 --- a/Assets/Materials/Sandia/Seoul10/CUSHION BORDER.001.mat +++ b/Assets/Materials/Sandia/Original/CUSHION BORDER.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: 895b60155bc08d14f9f8ecc803b57dc9, type: 3} + m_Texture: {fileID: 2800000, guid: 5c7717242a8419441b3d0402f3c7de32, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Sandia/Seoul10/CUSHION BORDER.001.mat.meta b/Assets/Materials/Sandia/Original/CUSHION BORDER.001.mat.meta similarity index 79% rename from Assets/Materials/Sandia/Seoul10/CUSHION BORDER.001.mat.meta rename to Assets/Materials/Sandia/Original/CUSHION BORDER.001.mat.meta index 6908f46..e25e0b4 100644 --- a/Assets/Materials/Sandia/Seoul10/CUSHION BORDER.001.mat.meta +++ b/Assets/Materials/Sandia/Original/CUSHION BORDER.001.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4ed2cf358f610d34eb5c96f0ce0d1517 +guid: 817005a7c355f7c4f8183b79d0c209fb NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Materials/Sandia/Original/CUSHION BORDER.006.mat b/Assets/Materials/Sandia/Original/CUSHION BORDER.006.mat deleted file mode 100644 index 4315129..0000000 --- a/Assets/Materials/Sandia/Original/CUSHION BORDER.006.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.006 - 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: 1862a96a6c318214cab372af66207a19, 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.006.mat.meta b/Assets/Materials/Sandia/Original/CUSHION BORDER.006.mat.meta deleted file mode 100644 index df0b5cb..0000000 --- a/Assets/Materials/Sandia/Original/CUSHION BORDER.006.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 27be645857766a14ab87a014487fabb4 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Original/FILICUDI CINNAMON.006.mat b/Assets/Materials/Sandia/Original/FILICUDI CINNAMON.006.mat index d77d5c6..40eacce 100644 --- a/Assets/Materials/Sandia/Original/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: 1104d09dfb5c7944fb4f29423b410f07, type: 3} + m_Texture: {fileID: 2800000, guid: c067ea4586d909a458c04ffa24edf593, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Sandia/Original/FUR FF.006.mat b/Assets/Materials/Sandia/Original/FUR FF.006.mat index c4ac7df..a6449a4 100644 --- a/Assets/Materials/Sandia/Original/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: 8bbc9ae782a51f84a83f59078b70dd82, type: 3} + m_Texture: {fileID: 2800000, guid: 676d206708d695c40942dbabab4d89e9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Sandia/Seoul10/PALMBEACH WHITE LOGO.001.mat b/Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.001.mat similarity index 96% rename from Assets/Materials/Sandia/Seoul10/PALMBEACH WHITE LOGO.001.mat rename to Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.001.mat index d4543d1..b777204 100644 --- a/Assets/Materials/Sandia/Seoul10/PALMBEACH WHITE LOGO.001.mat +++ b/Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.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: 62d73a3cdc4062445a72a552888ff790, type: 3} + m_Texture: {fileID: 2800000, guid: d9b8c0760f0ecc04bb7e4309c31c206f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Sandia/Seoul10/PALMBEACH WHITE LOGO.001.mat.meta b/Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.001.mat.meta similarity index 79% rename from Assets/Materials/Sandia/Seoul10/PALMBEACH WHITE LOGO.001.mat.meta rename to Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.001.mat.meta index 783f137..f93fd43 100644 --- a/Assets/Materials/Sandia/Seoul10/PALMBEACH WHITE LOGO.001.mat.meta +++ b/Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.001.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a4ae4b78462fcbd4287ca369ab86e455 +guid: 65fc10e6c507b2c489396a18ceb9278c NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.006.mat b/Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.006.mat deleted file mode 100644 index 05a674a..0000000 --- a/Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.006.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.006 - 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: 50709a532da857643aaf28177f49bcbb, 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.006.mat.meta b/Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.006.mat.meta deleted file mode 100644 index 8d554a0..0000000 --- a/Assets/Materials/Sandia/Original/PALMBEACH WHITE LOGO.006.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e9972da832ea3d042bf590e936d53cc6 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Cleo/Cleo40/Capitalino tan.mat b/Assets/Materials/Sandia/Original/Velvet.002.mat similarity index 91% rename from Assets/Materials/Cleo/Cleo40/Capitalino tan.mat rename to Assets/Materials/Sandia/Original/Velvet.002.mat index fb56a46..7f9a08e 100644 --- a/Assets/Materials/Cleo/Cleo40/Capitalino tan.mat +++ b/Assets/Materials/Sandia/Original/Velvet.002.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Capitalino tan + m_Name: Velvet.002 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: a75b747ff5da1d14daeb09871b9ddab3, type: 3} + m_Texture: {fileID: 2800000, guid: c8beed965eeadae44b71099ada286a5d, 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: a75b747ff5da1d14daeb09871b9ddab3, type: 3} + m_Texture: {fileID: 2800000, guid: c8beed965eeadae44b71099ada286a5d, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Cleo/Cleo40/Capitalino tan.mat.meta b/Assets/Materials/Sandia/Original/Velvet.002.mat.meta similarity index 79% rename from Assets/Materials/Cleo/Cleo40/Capitalino tan.mat.meta rename to Assets/Materials/Sandia/Original/Velvet.002.mat.meta index 67037da..cfeff57 100644 --- a/Assets/Materials/Cleo/Cleo40/Capitalino tan.mat.meta +++ b/Assets/Materials/Sandia/Original/Velvet.002.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 336588c59156fc24aa59939c24533f30 +guid: 41fcda4fdd6e92441a2b7cad7467d8fd NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Materials/Sandia/Original10.meta b/Assets/Materials/Sandia/Original10.meta deleted file mode 100644 index ca836ff..0000000 --- a/Assets/Materials/Sandia/Original10.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: deb77d85e43a5364994c4e750b5e7c5e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Original10/Bangkok Rock.001.mat b/Assets/Materials/Sandia/Original10/Bangkok Rock.001.mat deleted file mode 100644 index 34907eb..0000000 --- a/Assets/Materials/Sandia/Original10/Bangkok Rock.001.mat +++ /dev/null @@ -1,84 +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: Bangkok Rock.001 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _DETAIL_MULX2 - 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: 2800000, guid: 2a4ebea2f6a81e6469af1752e7cce964, 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: 2a4ebea2f6a81e6469af1752e7cce964, 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.1 - - _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/Original10/Bangkok Rock.001.mat.meta b/Assets/Materials/Sandia/Original10/Bangkok Rock.001.mat.meta deleted file mode 100644 index 832e6db..0000000 --- a/Assets/Materials/Sandia/Original10/Bangkok Rock.001.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c6af3c8abcec0ce4f863f7575941b6b1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Original10/CALLE STRIPE_CACAO & CINNAMON.006.mat b/Assets/Materials/Sandia/Original10/CALLE STRIPE_CACAO & CINNAMON.006.mat deleted file mode 100644 index 736abe6..0000000 --- a/Assets/Materials/Sandia/Original10/CALLE STRIPE_CACAO & CINNAMON.006.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.006 - 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: 6937a3c514930dc4a8aa04df9d7e9f43, 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/Original10/CALLE STRIPE_CACAO & CINNAMON.006.mat.meta b/Assets/Materials/Sandia/Original10/CALLE STRIPE_CACAO & CINNAMON.006.mat.meta deleted file mode 100644 index 4b91c92..0000000 --- a/Assets/Materials/Sandia/Original10/CALLE STRIPE_CACAO & CINNAMON.006.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2292bee1481f1a04baa955dbe01b7aa6 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Original10/CUSHION BORDER.006.mat b/Assets/Materials/Sandia/Original10/CUSHION BORDER.006.mat deleted file mode 100644 index ce06b55..0000000 --- a/Assets/Materials/Sandia/Original10/CUSHION BORDER.006.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.006 - 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: 5a7f162de90bcd34a81ce786cc4cac82, 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/Original10/CUSHION BORDER.006.mat.meta b/Assets/Materials/Sandia/Original10/CUSHION BORDER.006.mat.meta deleted file mode 100644 index 980a9b6..0000000 --- a/Assets/Materials/Sandia/Original10/CUSHION BORDER.006.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 30287979efe816d449549d7204ab4cab -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Original10/FILICUDI CINNAMON.006.mat b/Assets/Materials/Sandia/Original10/FILICUDI CINNAMON.006.mat deleted file mode 100644 index ee69467..0000000 --- a/Assets/Materials/Sandia/Original10/FILICUDI CINNAMON.006.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.006 - 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: 86f8d820442c35948931e288256d2abf, 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/Original10/FILICUDI CINNAMON.006.mat.meta b/Assets/Materials/Sandia/Original10/FILICUDI CINNAMON.006.mat.meta deleted file mode 100644 index 77a6da4..0000000 --- a/Assets/Materials/Sandia/Original10/FILICUDI CINNAMON.006.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8827ffae86eadc844aefe9cd7f64774e -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Original10/FUR FF.006.mat b/Assets/Materials/Sandia/Original10/FUR FF.006.mat deleted file mode 100644 index 3d01c73..0000000 --- a/Assets/Materials/Sandia/Original10/FUR FF.006.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.006 - 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: 179f6c974c7e6c84dafc451bc3f2243b, 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/Original10/FUR FF.006.mat.meta b/Assets/Materials/Sandia/Original10/FUR FF.006.mat.meta deleted file mode 100644 index 6922adf..0000000 --- a/Assets/Materials/Sandia/Original10/FUR FF.006.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e2cb1f78f7424724ab11be77f70690e2 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Original10/PALMBEACH WHITE LOGO.006.mat b/Assets/Materials/Sandia/Original10/PALMBEACH WHITE LOGO.006.mat deleted file mode 100644 index c67c6cd..0000000 --- a/Assets/Materials/Sandia/Original10/PALMBEACH WHITE LOGO.006.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.006 - 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: 5e2f5e921b7bce14388d87a63c2cb94e, 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/Original10/PALMBEACH WHITE LOGO.006.mat.meta b/Assets/Materials/Sandia/Original10/PALMBEACH WHITE LOGO.006.mat.meta deleted file mode 100644 index ef5c755..0000000 --- a/Assets/Materials/Sandia/Original10/PALMBEACH WHITE LOGO.006.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3bbc411aab3b1584892a7d6cb014dd13 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Seoul/CALLE STRIPE_CACAO & CINNAMON.006.mat b/Assets/Materials/Sandia/Seoul/CALLE STRIPE_CACAO & CINNAMON.006.mat index f7c2c83..25f292e 100644 --- a/Assets/Materials/Sandia/Seoul/CALLE STRIPE_CACAO & CINNAMON.006.mat +++ b/Assets/Materials/Sandia/Seoul/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: 8440f429174eb594482ea567c5a68ebc, type: 3} + m_Texture: {fileID: 2800000, guid: bd688355637821d43b88eda93e7815b5, 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 b/Assets/Materials/Sandia/Seoul/CUSHION BORDER.006.mat index b680539..7a587be 100644 --- a/Assets/Materials/Sandia/Seoul/CUSHION BORDER.006.mat +++ b/Assets/Materials/Sandia/Seoul/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: afaa54413e58bf64ebd3b8256436f83d, type: 3} + m_Texture: {fileID: 2800000, guid: 2ddaaa2da903ba34cabadf3ead26834c, 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 b/Assets/Materials/Sandia/Seoul/FILICUDI CINNAMON.006.mat index 2b855a9..66eccac 100644 --- a/Assets/Materials/Sandia/Seoul/FILICUDI CINNAMON.006.mat +++ b/Assets/Materials/Sandia/Seoul/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: 4fdb4dc07460a9c4898bc8fee4020e73, type: 3} + m_Texture: {fileID: 2800000, guid: eae3adf566fc31b4a9d568c61d7b9859, 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 b/Assets/Materials/Sandia/Seoul/FUR FF.006.mat index ec72e35..1f6a0cc 100644 --- a/Assets/Materials/Sandia/Seoul/FUR FF.006.mat +++ b/Assets/Materials/Sandia/Seoul/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: bd86831a1e6448543b9369f1fd06a364, type: 3} + m_Texture: {fileID: 2800000, guid: b883147826f83f444ab6bf02bd8c88e7, 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 b/Assets/Materials/Sandia/Seoul/PALMBEACH WHITE LOGO.006.mat index 370bfed..142ffee 100644 --- a/Assets/Materials/Sandia/Seoul/PALMBEACH WHITE LOGO.006.mat +++ b/Assets/Materials/Sandia/Seoul/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: 4785122502f730049823c5dd0cea52b0, type: 3} + m_Texture: {fileID: 2800000, guid: c285a30d91ebf3441a1759b2173e94a9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Sandia/Seoul/Seoul linen.001.mat b/Assets/Materials/Sandia/Seoul/Seoul linen.001.mat index eb43216..125d252 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: 8351bade3936c864aadca736eedc10f1, type: 3} + m_Texture: {fileID: 2800000, guid: 0457397da535393418e69da6e0fcdb62, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Sandia/Seoul10.meta b/Assets/Materials/Sandia/Seoul10.meta deleted file mode 100644 index a0fa8aa..0000000 --- a/Assets/Materials/Sandia/Seoul10.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b0c425dea4d365b4892bbb5c8ffed294 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Seoul10/CALLE STRIPE_CACAO & CINNAMON.001.mat b/Assets/Materials/Sandia/Seoul10/CALLE STRIPE_CACAO & CINNAMON.001.mat deleted file mode 100644 index b2ba1bf..0000000 --- a/Assets/Materials/Sandia/Seoul10/CALLE STRIPE_CACAO & CINNAMON.001.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.001 - 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: 59e34bd3295eaf7458d98b7e7a1bc628, 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/Seoul10/CALLE STRIPE_CACAO & CINNAMON.001.mat.meta b/Assets/Materials/Sandia/Seoul10/CALLE STRIPE_CACAO & CINNAMON.001.mat.meta deleted file mode 100644 index 7d324a9..0000000 --- a/Assets/Materials/Sandia/Seoul10/CALLE STRIPE_CACAO & CINNAMON.001.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 027d064479c3e1b419bd61e9ef64f16c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Seoul10/FILICUDI CINNAMON.001.mat b/Assets/Materials/Sandia/Seoul10/FILICUDI CINNAMON.001.mat deleted file mode 100644 index 76d5f24..0000000 --- a/Assets/Materials/Sandia/Seoul10/FILICUDI CINNAMON.001.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.001 - 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: 5ca06450fdb12b8439c3724bf8b2f6fe, 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/Seoul10/FILICUDI CINNAMON.001.mat.meta b/Assets/Materials/Sandia/Seoul10/FILICUDI CINNAMON.001.mat.meta deleted file mode 100644 index 5ff4aac..0000000 --- a/Assets/Materials/Sandia/Seoul10/FILICUDI CINNAMON.001.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cad94a6dcfd2a514e8674c392287b880 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Seoul10/FUR FF.001.mat b/Assets/Materials/Sandia/Seoul10/FUR FF.001.mat deleted file mode 100644 index 8076566..0000000 --- a/Assets/Materials/Sandia/Seoul10/FUR FF.001.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.001 - 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: 73228977e6907fc4583e27f889fce61b, 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/Seoul10/FUR FF.001.mat.meta b/Assets/Materials/Sandia/Seoul10/FUR FF.001.mat.meta deleted file mode 100644 index 5a5d90c..0000000 --- a/Assets/Materials/Sandia/Seoul10/FUR FF.001.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d7f5278d9330aea4da7b3bcb89b73e5f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sandia/Seoul10/Seoul linen.001.mat b/Assets/Materials/Sandia/Seoul10/Seoul linen.001.mat deleted file mode 100644 index c13e825..0000000 --- a/Assets/Materials/Sandia/Seoul10/Seoul linen.001.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: Seoul linen.001 - 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: 142e815be2928d0459ffca3c0cbb0e0b, 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.1 - - _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/Seoul10/Seoul linen.001.mat.meta b/Assets/Materials/Sandia/Seoul10/Seoul linen.001.mat.meta deleted file mode 100644 index 9704f2e..0000000 --- a/Assets/Materials/Sandia/Seoul10/Seoul linen.001.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 768593d000f410f4a858bf9d26a3e843 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Materials/Sumo/102Shadow/Glass.mat b/Assets/Materials/Sumo/102Shadow/Glass.mat index 02adec3..1981119 100644 --- a/Assets/Materials/Sumo/102Shadow/Glass.mat +++ b/Assets/Materials/Sumo/102Shadow/Glass.mat @@ -29,7 +29,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: - m_Texture: {fileID: 2800000, guid: a2d2395b736ff9040a5b8e508748f3a6, type: 3} + m_Texture: {fileID: 2800000, guid: f21022bffde8c1d4885d592886c70050, 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: a2d2395b736ff9040a5b8e508748f3a6, type: 3} + m_Texture: {fileID: 2800000, guid: f21022bffde8c1d4885d592886c70050, 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/Sumo/102Shadow/Metal Brushed Horizontal Dark.001.mat b/Assets/Materials/Sumo/102Shadow/Metal Brushed Horizontal Dark.001.mat index e12fec3..a152609 100644 --- a/Assets/Materials/Sumo/102Shadow/Metal Brushed Horizontal Dark.001.mat +++ b/Assets/Materials/Sumo/102Shadow/Metal Brushed Horizontal Dark.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: 84a0b3ceba66bb44da18e3e061f52c00, type: 3} + m_Texture: {fileID: 2800000, guid: 558a225694f6fa14eaf35b12474bb126, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Sumo/102Shadow/Metal Brushed Horizontal.001.mat b/Assets/Materials/Sumo/102Shadow/Metal Brushed Horizontal.001.mat index 46ee6ed..f5ef632 100644 --- a/Assets/Materials/Sumo/102Shadow/Metal Brushed Horizontal.001.mat +++ b/Assets/Materials/Sumo/102Shadow/Metal Brushed Horizontal.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: ee54d5014f847144298a62f9286ca76e, type: 3} + m_Texture: {fileID: 2800000, guid: 40b41c189b961154ca476d17832a89e2, 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 + - _Glossiness: 0.5 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 diff --git a/Assets/Materials/Sumo/102Shadow/Metal Brushed.001.mat b/Assets/Materials/Sumo/102Shadow/Metal Brushed.001.mat index d171c08..ea81613 100644 --- a/Assets/Materials/Sumo/102Shadow/Metal Brushed.001.mat +++ b/Assets/Materials/Sumo/102Shadow/Metal Brushed.001.mat @@ -11,8 +11,7 @@ Material: m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _DETAIL_MULX2 + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -29,7 +28,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: - m_Texture: {fileID: 2800000, guid: 514be8f8b49767c4fa35e3b835724e6f, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailMask: @@ -45,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 514be8f8b49767c4fa35e3b835724e6f, type: 3} + m_Texture: {fileID: 2800000, guid: 179b5728fb01ea44fb3ac90b37f405a8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -67,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/Totu/103/Carnico Gray Glossy.mat b/Assets/Materials/Totu/103/Carnico Gray Glossy.mat index 161ee73..460cf9e 100644 --- a/Assets/Materials/Totu/103/Carnico Gray Glossy.mat +++ b/Assets/Materials/Totu/103/Carnico Gray Glossy.mat @@ -29,7 +29,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: - m_Texture: {fileID: 2800000, guid: fc4de649de163dc49b38833dd33dadd3, type: 3} + m_Texture: {fileID: 2800000, guid: 169c93011d6e8df46923c8d1fc9f99bd, 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: fc4de649de163dc49b38833dd33dadd3, type: 3} + m_Texture: {fileID: 2800000, guid: 169c93011d6e8df46923c8d1fc9f99bd, 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/Totu/103/Metal Brushed Horizontal Dark.001.mat b/Assets/Materials/Totu/103/Metal Brushed Horizontal Dark.001.mat index 8782788..e34b7bd 100644 --- a/Assets/Materials/Totu/103/Metal Brushed Horizontal Dark.001.mat +++ b/Assets/Materials/Totu/103/Metal Brushed Horizontal Dark.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: e88dcc86b515fb34f9734acacaac24d0, type: 3} + m_Texture: {fileID: 2800000, guid: b678b2ad654c5754597dc744f9495159, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Totu/103/Metal Brushed Horizontal.001.mat b/Assets/Materials/Totu/103/Metal Brushed Horizontal.001.mat index 2d7ed09..bf62eff 100644 --- a/Assets/Materials/Totu/103/Metal Brushed Horizontal.001.mat +++ b/Assets/Materials/Totu/103/Metal Brushed Horizontal.001.mat @@ -11,8 +11,7 @@ Material: m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _DETAIL_MULX2 + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -29,7 +28,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: - m_Texture: {fileID: 2800000, guid: cef87e04cb4a46348855b7284e6e9241, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailMask: @@ -45,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: cef87e04cb4a46348855b7284e6e9241, type: 3} + m_Texture: {fileID: 2800000, guid: 6faad1f9527f47449a33b9335aff3b56, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Totu/103/Metal Brushed.001.mat b/Assets/Materials/Totu/103/Metal Brushed.001.mat index cdfb377..a40b1d2 100644 --- a/Assets/Materials/Totu/103/Metal Brushed.001.mat +++ b/Assets/Materials/Totu/103/Metal Brushed.001.mat @@ -11,8 +11,7 @@ Material: m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _DETAIL_MULX2 + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -29,7 +28,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: - m_Texture: {fileID: 2800000, guid: 457a996a64e512441a57a10cfffe69ec, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailMask: @@ -45,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 457a996a64e512441a57a10cfffe69ec, type: 3} + m_Texture: {fileID: 2800000, guid: 453535a9179abe64aba4c36fa2341090, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Totu/104/MARMO PATAGONIA CLEARER_.mat b/Assets/Materials/Totu/104/MARMO PATAGONIA CLEARER_.mat index da335c2..6456be8 100644 --- a/Assets/Materials/Totu/104/MARMO PATAGONIA CLEARER_.mat +++ b/Assets/Materials/Totu/104/MARMO PATAGONIA CLEARER_.mat @@ -11,7 +11,8 @@ Material: m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _DETAIL_MULX2 m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -28,7 +29,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 4f9308b390761ca4daa07f4df96cced4, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailMask: @@ -44,7 +45,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: ccea2b44db9d8f849a3d0a0f34859fa7, type: 3} + m_Texture: {fileID: 2800000, guid: 4f9308b390761ca4daa07f4df96cced4, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -66,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/Totu/104/Metal Brushed Horizontal Dark.001.mat b/Assets/Materials/Totu/104/Metal Brushed Horizontal Dark.001.mat index da9ddb4..ad92d4b 100644 --- a/Assets/Materials/Totu/104/Metal Brushed Horizontal Dark.001.mat +++ b/Assets/Materials/Totu/104/Metal Brushed Horizontal Dark.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: 7bf573df0270405418a469a2c4036d4d, type: 3} + m_Texture: {fileID: 2800000, guid: 3e9625a7bbb6f1b4a9a6d86930437e7c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Totu/104/Metal Brushed Horizontal.001.mat b/Assets/Materials/Totu/104/Metal Brushed Horizontal.001.mat index 9064333..254a021 100644 --- a/Assets/Materials/Totu/104/Metal Brushed Horizontal.001.mat +++ b/Assets/Materials/Totu/104/Metal Brushed Horizontal.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: 9bc836979ec58044ab9883456f595a3e, type: 3} + m_Texture: {fileID: 2800000, guid: 5c7f7c92f97daf64daa6a57bcd7a26b1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/Totu/104/Metal Brushed.001.mat b/Assets/Materials/Totu/104/Metal Brushed.001.mat index 6dd433e..e0e67b4 100644 --- a/Assets/Materials/Totu/104/Metal Brushed.001.mat +++ b/Assets/Materials/Totu/104/Metal Brushed.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: f2f98bb3ba012fe41aa973c0d0bf66be, type: 3} + m_Texture: {fileID: 2800000, guid: cf7ba267ba2e4f04e9d474777cf4b490, 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 index 03b935b..474a716 100644 --- a/Assets/Models/Cleo.fbx +++ b/Assets/Models/Cleo.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fb6da9929cd7e4154d6b8945d4a3f870256b1d548cfd26702381393702db845a -size 396258956 +oid sha256:01d48314e324a5122e940309d442cbe885826cae0cdd76e4f09b929148ee130d +size 395351692 diff --git a/Assets/Models/Cleo.fbx.meta b/Assets/Models/Cleo.fbx.meta index 2bd600d..940f148 100644 --- a/Assets/Models/Cleo.fbx.meta +++ b/Assets/Models/Cleo.fbx.meta @@ -27,23 +27,23 @@ ModelImporter: - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule - name: Capitolino tan color - second: {fileID: 2800000, guid: 95cfea40be0ee1942a937f13de58e577, type: 3} + name: Capitolino tan color alt + second: {fileID: 2800000, guid: 218eadac3feb68f4b86d50c522307b8a, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Chocolate Stained Wood Color - second: {fileID: 2800000, guid: e31b85f8a0c10d64e9683cc40e07a728, type: 3} + second: {fileID: 2800000, guid: f59deffb3a9171d469424631ac019e95, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Chocolate Stained Wood Logo Color - second: {fileID: 2800000, guid: 519630f1e9eef6c4fb0c1641af6c7de8, type: 3} + second: {fileID: 2800000, guid: 0c2f3acb1f5d6fe4e85ba07f841d38d5, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Filicui White Color - second: {fileID: 2800000, guid: 591cf74094498cc4f90bd22baff87d65, type: 3} + second: {fileID: 2800000, guid: b1da137d355e6e94cb7343ff55049338, type: 3} materials: materialImportMode: 2 materialName: 0 @@ -83,8 +83,8 @@ ModelImporter: importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importCameras: 1 + importLights: 1 nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 diff --git a/Assets/Models/Cleo40.fbx b/Assets/Models/Cleo40.fbx deleted file mode 100644 index e0eeec5..0000000 --- a/Assets/Models/Cleo40.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e853759953c695474164b8a1cdedf8ac87a6e8ff5c6a5e3dd752ad4b85fe14ff -size 396382156 diff --git a/Assets/Models/Cleo40.fbx.meta b/Assets/Models/Cleo40.fbx.meta deleted file mode 100644 index c40bfff..0000000 --- a/Assets/Models/Cleo40.fbx.meta +++ /dev/null @@ -1,149 +0,0 @@ -fileFormatVersion: 2 -guid: c5349716664a2c64b845940664ad6df6 -ModelImporter: - serializedVersion: 22200 - internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: Capitalino tan - second: {fileID: 2100000, guid: 336588c59156fc24aa59939c24533f30, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: Chocolate stained Wood - second: {fileID: 2100000, guid: 3c1e6cd8f9ba6d544adbc60707c08336, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: Chocolate stained Wood Logo - second: {fileID: 2100000, guid: df554adc7c9b60d43bf783bcabf182f9, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: Filicudi white - second: {fileID: 2100000, guid: 04e72c391f203c24385e1762ecff0db1, type: 2} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Capitolino tan color - second: {fileID: 2800000, guid: a75b747ff5da1d14daeb09871b9ddab3, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Chocolate Stained Wood Color - second: {fileID: 2800000, guid: 269d7092acdef664abb74ca5b6e13f67, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Chocolate Stained Wood Logo Color - second: {fileID: 2800000, guid: 1de0fd10c165dec478ef731f88babd39, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Filicui White Color - second: {fileID: 2800000, guid: a211dddfadae7504ba96561e7d028de3, 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/SUMO102Shadow.fbx b/Assets/Models/SUMO102Shadow.fbx index aa50a72..9b17a98 100644 --- a/Assets/Models/SUMO102Shadow.fbx +++ b/Assets/Models/SUMO102Shadow.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c10e722da43be072788b3780e57d0103cb8bafdd747c246e85f9d7249276b8af -size 586654780 +oid sha256:0ef9518bcd0ca882c45c278492703b5acc15ab8270077c70cfaa5631681ca921 +size 586486364 diff --git a/Assets/Models/SUMO102Shadow.fbx.meta b/Assets/Models/SUMO102Shadow.fbx.meta index 52918ad..9928eec 100644 --- a/Assets/Models/SUMO102Shadow.fbx.meta +++ b/Assets/Models/SUMO102Shadow.fbx.meta @@ -27,43 +27,43 @@ ModelImporter: - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule - name: Glass Color Shadow - second: {fileID: 2800000, guid: a2d2395b736ff9040a5b8e508748f3a6, type: 3} + name: Glass Color Shadow alt + second: {fileID: 2800000, guid: f21022bffde8c1d4885d592886c70050, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Glass UV - second: {fileID: 2800000, guid: ec555b6ae2c303c4793a42690c7ae620, type: 3} + second: {fileID: 2800000, guid: 7a100421eba7f964994124f10847e050, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Metal Color - second: {fileID: 2800000, guid: 514be8f8b49767c4fa35e3b835724e6f, type: 3} + second: {fileID: 2800000, guid: 179b5728fb01ea44fb3ac90b37f405a8, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Metal Horizontal Color - second: {fileID: 2800000, guid: ee54d5014f847144298a62f9286ca76e, type: 3} + second: {fileID: 2800000, guid: 40b41c189b961154ca476d17832a89e2, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Metal Horizontal Dark Color - second: {fileID: 2800000, guid: 84a0b3ceba66bb44da18e3e061f52c00, type: 3} + second: {fileID: 2800000, guid: 558a225694f6fa14eaf35b12474bb126, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Metal Horizontal Dark Roughness - second: {fileID: 2800000, guid: ed1fc7b0fe3d0364d92ddb7d806f5721, type: 3} + second: {fileID: 2800000, guid: 7b4e1a2e1987e9b4fae4d66d3b7f63a9, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Metal Horizontal Roughness - second: {fileID: 2800000, guid: 37b677cae9883f240986cb01cb795d20, type: 3} + second: {fileID: 2800000, guid: a223e5dc853f51447994f878506d85dc, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Metal Roughness - second: {fileID: 2800000, guid: 1b4bde8b467dd0e4ca93661e66c4781f, type: 3} + second: {fileID: 2800000, guid: 2fda535f520b823459b29e5a2b64218d, type: 3} materials: materialImportMode: 2 materialName: 0 @@ -103,8 +103,8 @@ ModelImporter: importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importCameras: 1 + importLights: 1 nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 diff --git a/Assets/Models/SandiaOriginal.fbx b/Assets/Models/SandiaOriginal.fbx index 8295880..90ffbf3 100644 --- a/Assets/Models/SandiaOriginal.fbx +++ b/Assets/Models/SandiaOriginal.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ebb57d48fc37c88a16391c5fda5566860142ffbaad142beb5bcc1124f0a4f6b7 -size 348662204 +oid sha256:6cc4c0719515a3dccf5a47d8e015f66dfb96b3a58f45984c2fe7ac27a602e6e4 +size 349547596 diff --git a/Assets/Models/SandiaOriginal.fbx.meta b/Assets/Models/SandiaOriginal.fbx.meta index 586804b..89b2a88 100644 --- a/Assets/Models/SandiaOriginal.fbx.meta +++ b/Assets/Models/SandiaOriginal.fbx.meta @@ -4,11 +4,6 @@ ModelImporter: serializedVersion: 22200 internalIDToNameTable: [] externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: Bangkok Rock.001 - second: {fileID: 2100000, guid: 9e246a7c69bcb7c4a9498073e33f552f, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule @@ -17,8 +12,8 @@ ModelImporter: - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: CUSHION BORDER.006 - second: {fileID: 2100000, guid: 27be645857766a14ab87a014487fabb4, type: 2} + name: CUSHION BORDER.001 + second: {fileID: 2100000, guid: 817005a7c355f7c4f8183b79d0c209fb, type: 2} - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule @@ -32,53 +27,63 @@ ModelImporter: - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: PALMBEACH WHITE LOGO.006 - second: {fileID: 2100000, guid: e9972da832ea3d042bf590e936d53cc6, type: 2} + name: PALMBEACH WHITE LOGO.001 + second: {fileID: 2100000, guid: 65fc10e6c507b2c489396a18ceb9278c, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Velvet.002 + second: {fileID: 2100000, guid: 41fcda4fdd6e92441a2b7cad7467d8fd, type: 2} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Fur cushion color - second: {fileID: 2800000, guid: 8bbc9ae782a51f84a83f59078b70dd82, type: 3} + second: {fileID: 2800000, guid: 676d206708d695c40942dbabab4d89e9, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Logo cushion border color - second: {fileID: 2800000, guid: 1862a96a6c318214cab372af66207a19, type: 3} + second: {fileID: 2800000, guid: 5c7717242a8419441b3d0402f3c7de32, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Logo cushion border color alt - second: {fileID: 2800000, guid: 09b6e1591ac5ae5458f5e54f13f01995, type: 3} + second: {fileID: 2800000, guid: f6b705156c7c74844a556540ddbc178a, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Logo cushion color alt - second: {fileID: 2800000, guid: c16b921c9c20893488580735c06cf956, type: 3} + second: {fileID: 2800000, guid: e7a237e23d943b546901eb2baa9cc35a, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Logo cushion color mod - second: {fileID: 2800000, guid: 50709a532da857643aaf28177f49bcbb, type: 3} + second: {fileID: 2800000, guid: d9b8c0760f0ecc04bb7e4309c31c206f, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Red cushion color - second: {fileID: 2800000, guid: 1104d09dfb5c7944fb4f29423b410f07, type: 3} + second: {fileID: 2800000, guid: c067ea4586d909a458c04ffa24edf593, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Striped cushion color - second: {fileID: 2800000, guid: 3916f7cdba1d2b842b175ae2230f612a, type: 3} + second: {fileID: 2800000, guid: 46ea6d8847452c647a14b82dd0266e6f, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Yellow velvet bright color - second: {fileID: 2800000, guid: cea2a355dd2460d40ac4334f6698e0c5, type: 3} + second: {fileID: 2800000, guid: c8beed965eeadae44b71099ada286a5d, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule - name: Yellow velvet brighter color - second: {fileID: 2800000, guid: 109da59915e07204cb6700121223ff11, type: 3} + name: Yellow velvet color + second: {fileID: 2800000, guid: 8db40b83cc3700041b0e3f207eb673b6, type: 3} + - first: + type: UnityEngine:Texture2D + assembly: UnityEngine.CoreModule + name: Yellow velvet roughness + second: {fileID: 2800000, guid: afb5ea52ffb890542a3a88dc5d010f39, type: 3} materials: materialImportMode: 2 materialName: 0 diff --git a/Assets/Models/SandiaOriginal10.fbx b/Assets/Models/SandiaOriginal10.fbx deleted file mode 100644 index fbcc673..0000000 --- a/Assets/Models/SandiaOriginal10.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70d22e59fe0026f021431c22d6f2a9d82b09ee55e7950200a60938268407c3fb -size 348664540 diff --git a/Assets/Models/SandiaOriginal10.fbx.meta b/Assets/Models/SandiaOriginal10.fbx.meta deleted file mode 100644 index e9191a6..0000000 --- a/Assets/Models/SandiaOriginal10.fbx.meta +++ /dev/null @@ -1,169 +0,0 @@ -fileFormatVersion: 2 -guid: 3e11bb85aa881844d89ef8c9b58ba2bd -ModelImporter: - serializedVersion: 22200 - internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: Bangkok Rock.001 - second: {fileID: 2100000, guid: c6af3c8abcec0ce4f863f7575941b6b1, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: CALLE STRIPE_CACAO & CINNAMON.006 - second: {fileID: 2100000, guid: 2292bee1481f1a04baa955dbe01b7aa6, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: CUSHION BORDER.006 - second: {fileID: 2100000, guid: 30287979efe816d449549d7204ab4cab, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: FILICUDI CINNAMON.006 - second: {fileID: 2100000, guid: 8827ffae86eadc844aefe9cd7f64774e, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: FUR FF.006 - second: {fileID: 2100000, guid: e2cb1f78f7424724ab11be77f70690e2, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: PALMBEACH WHITE LOGO.006 - second: {fileID: 2100000, guid: 3bbc411aab3b1584892a7d6cb014dd13, type: 2} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Fur cushion color - second: {fileID: 2800000, guid: 179f6c974c7e6c84dafc451bc3f2243b, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Logo cushion border color - second: {fileID: 2800000, guid: 5a7f162de90bcd34a81ce786cc4cac82, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Logo cushion color mod - second: {fileID: 2800000, guid: 5e2f5e921b7bce14388d87a63c2cb94e, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Red cushion color - second: {fileID: 2800000, guid: 86f8d820442c35948931e288256d2abf, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Striped cushion color - second: {fileID: 2800000, guid: 6937a3c514930dc4a8aa04df9d7e9f43, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Yellow velvet bright color - second: {fileID: 2800000, guid: 2a4ebea2f6a81e6469af1752e7cce964, 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/SandiaSeoul.fbx b/Assets/Models/SandiaSeoul.fbx index 43603ec..dea1819 100644 --- a/Assets/Models/SandiaSeoul.fbx +++ b/Assets/Models/SandiaSeoul.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbdd28112a414bef6d7e630c5149ec31f45f76066a24b7db867f7adf74698aae -size 234860204 +oid sha256:6fd09a2c21b5cab7406518e0e2ffcf3333b7b46fac89c776619c6c52a4bf262e +size 231999036 diff --git a/Assets/Models/SandiaSeoul.fbx.meta b/Assets/Models/SandiaSeoul.fbx.meta index 990d782..0287e2c 100644 --- a/Assets/Models/SandiaSeoul.fbx.meta +++ b/Assets/Models/SandiaSeoul.fbx.meta @@ -38,32 +38,37 @@ ModelImporter: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Fur cushion color - second: {fileID: 2800000, guid: bd86831a1e6448543b9369f1fd06a364, type: 3} + second: {fileID: 2800000, guid: b883147826f83f444ab6bf02bd8c88e7, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Logo cushion border color alt - second: {fileID: 2800000, guid: afaa54413e58bf64ebd3b8256436f83d, type: 3} + second: {fileID: 2800000, guid: 2ddaaa2da903ba34cabadf3ead26834c, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Logo cushion color alt - second: {fileID: 2800000, guid: 4785122502f730049823c5dd0cea52b0, type: 3} + second: {fileID: 2800000, guid: c285a30d91ebf3441a1759b2173e94a9, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Red cushion color - second: {fileID: 2800000, guid: 4fdb4dc07460a9c4898bc8fee4020e73, type: 3} + second: {fileID: 2800000, guid: eae3adf566fc31b4a9d568c61d7b9859, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Seoul Linen color - second: {fileID: 2800000, guid: 8351bade3936c864aadca736eedc10f1, type: 3} + second: {fileID: 2800000, guid: d23687fbd9620f346b37ababef2657be, type: 3} + - first: + type: UnityEngine:Texture2D + assembly: UnityEngine.CoreModule + name: Seoul Linen color alt + second: {fileID: 2800000, guid: 0457397da535393418e69da6e0fcdb62, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Striped cushion color - second: {fileID: 2800000, guid: 8440f429174eb594482ea567c5a68ebc, type: 3} + second: {fileID: 2800000, guid: bd688355637821d43b88eda93e7815b5, type: 3} materials: materialImportMode: 2 materialName: 0 diff --git a/Assets/Models/SandiaSeoul10.fbx b/Assets/Models/SandiaSeoul10.fbx deleted file mode 100644 index e557de9..0000000 --- a/Assets/Models/SandiaSeoul10.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:904c942adf679f75980f80427e937a3d66e60f2b12da505757332dadf692c4fe -size 234862540 diff --git a/Assets/Models/SandiaSeoul10.fbx.meta b/Assets/Models/SandiaSeoul10.fbx.meta deleted file mode 100644 index 3ec1bcf..0000000 --- a/Assets/Models/SandiaSeoul10.fbx.meta +++ /dev/null @@ -1,169 +0,0 @@ -fileFormatVersion: 2 -guid: b2dfdc7db28fd884fa1cea72b71b0bdb -ModelImporter: - serializedVersion: 22200 - internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: CALLE STRIPE_CACAO & CINNAMON.001 - second: {fileID: 2100000, guid: 027d064479c3e1b419bd61e9ef64f16c, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: CUSHION BORDER.001 - second: {fileID: 2100000, guid: 4ed2cf358f610d34eb5c96f0ce0d1517, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: FILICUDI CINNAMON.001 - second: {fileID: 2100000, guid: cad94a6dcfd2a514e8674c392287b880, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: FUR FF.001 - second: {fileID: 2100000, guid: d7f5278d9330aea4da7b3bcb89b73e5f, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: PALMBEACH WHITE LOGO.001 - second: {fileID: 2100000, guid: a4ae4b78462fcbd4287ca369ab86e455, type: 2} - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: Seoul linen.001 - second: {fileID: 2100000, guid: 768593d000f410f4a858bf9d26a3e843, type: 2} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Fur cushion color - second: {fileID: 2800000, guid: 73228977e6907fc4583e27f889fce61b, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Logo cushion border color alt - second: {fileID: 2800000, guid: 895b60155bc08d14f9f8ecc803b57dc9, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Logo cushion color alt - second: {fileID: 2800000, guid: 62d73a3cdc4062445a72a552888ff790, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Red cushion color - second: {fileID: 2800000, guid: 5ca06450fdb12b8439c3724bf8b2f6fe, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Seoul Linen color - second: {fileID: 2800000, guid: 142e815be2928d0459ffca3c0cbb0e0b, type: 3} - - first: - type: UnityEngine:Texture2D - assembly: UnityEngine.CoreModule - name: Striped cushion color - second: {fileID: 2800000, guid: 59e34bd3295eaf7458d98b7e7a1bc628, 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/TOTU103.fbx b/Assets/Models/TOTU103.fbx index 872b93b..c40a413 100644 --- a/Assets/Models/TOTU103.fbx +++ b/Assets/Models/TOTU103.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b8b20c50073aae9fa6988dc9a61f53b860a1aba22fe6e59d850c591436c647dc -size 666664236 +oid sha256:2ff619af07c46b65e879fae61b8e858633bcffa86cd80873bb29664093d678ba +size 666678572 diff --git a/Assets/Models/TOTU103.fbx.meta b/Assets/Models/TOTU103.fbx.meta index e994a28..c6c50d5 100644 --- a/Assets/Models/TOTU103.fbx.meta +++ b/Assets/Models/TOTU103.fbx.meta @@ -28,37 +28,37 @@ ModelImporter: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: 103 Metal Color - second: {fileID: 2800000, guid: 457a996a64e512441a57a10cfffe69ec, type: 3} + second: {fileID: 2800000, guid: 453535a9179abe64aba4c36fa2341090, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: 103 Metal Horizontal Color - second: {fileID: 2800000, guid: cef87e04cb4a46348855b7284e6e9241, type: 3} + second: {fileID: 2800000, guid: 6faad1f9527f47449a33b9335aff3b56, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: 103 Metal Horizontal Dark Color - second: {fileID: 2800000, guid: e88dcc86b515fb34f9734acacaac24d0, type: 3} + second: {fileID: 2800000, guid: b678b2ad654c5754597dc744f9495159, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: 103 Metal Horizontal Dark Roughness - second: {fileID: 2800000, guid: 849328c94cfcc4447b9e0a8d2b89a237, type: 3} + second: {fileID: 2800000, guid: 7563ad5b67a3c294786eb387f064d7fd, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: 103 Metal Horizontal Roughness - second: {fileID: 2800000, guid: 7ae05aef1ecd2a54fb9796311e8582af, type: 3} + second: {fileID: 2800000, guid: 346e3485dea11d0419f5007217abee7f, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: 103 Metal Roughness - second: {fileID: 2800000, guid: bb7c8d325bdc3ef48b7eda046624db59, type: 3} + second: {fileID: 2800000, guid: 5c63c727698b31f4d814ea76919bbfea, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: CARNICO GREY GLOSSY Texture - second: {fileID: 2800000, guid: fc4de649de163dc49b38833dd33dadd3, type: 3} + second: {fileID: 2800000, guid: 169c93011d6e8df46923c8d1fc9f99bd, type: 3} materials: materialImportMode: 2 materialName: 0 @@ -98,8 +98,8 @@ ModelImporter: importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 - importCameras: 0 - importLights: 0 + importCameras: 1 + importLights: 1 nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 diff --git a/Assets/Models/TOTU104.fbx b/Assets/Models/TOTU104.fbx index c7b79be..7e26d0c 100644 --- a/Assets/Models/TOTU104.fbx +++ b/Assets/Models/TOTU104.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b52928c58c052f838a5f2a7bb6ba82bcc4f26709a4ee2a65154cf6b283d67cdd -size 39169532 +oid sha256:0f7acae3d9d848cf9bba9661f7477bf9bafb105c4a1310c42fe61ac4070e0d84 +size 39195020 diff --git a/Assets/Models/TOTU104.fbx.meta b/Assets/Models/TOTU104.fbx.meta index 4f6c4ae..be0c773 100644 --- a/Assets/Models/TOTU104.fbx.meta +++ b/Assets/Models/TOTU104.fbx.meta @@ -28,37 +28,37 @@ ModelImporter: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: MARMO PATAGONIA CLEARER Texture clearer - second: {fileID: 2800000, guid: ccea2b44db9d8f849a3d0a0f34859fa7, type: 3} + second: {fileID: 2800000, guid: 4f9308b390761ca4daa07f4df96cced4, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Metal Color - second: {fileID: 2800000, guid: f2f98bb3ba012fe41aa973c0d0bf66be, type: 3} + second: {fileID: 2800000, guid: cf7ba267ba2e4f04e9d474777cf4b490, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Metal Horizontal Color - second: {fileID: 2800000, guid: 9bc836979ec58044ab9883456f595a3e, type: 3} + second: {fileID: 2800000, guid: 5c7f7c92f97daf64daa6a57bcd7a26b1, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Metal Horizontal Dark Color - second: {fileID: 2800000, guid: 7bf573df0270405418a469a2c4036d4d, type: 3} + second: {fileID: 2800000, guid: 3e9625a7bbb6f1b4a9a6d86930437e7c, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Metal Horizontal Dark Roughness - second: {fileID: 2800000, guid: d2246c72971ced0459cb694c1c7ca93a, type: 3} + second: {fileID: 2800000, guid: 849e12c8ae59c4c47b2577ad84554f05, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Metal Horizontal Roughness - second: {fileID: 2800000, guid: ab1de751247c01b4b810833872883104, type: 3} + second: {fileID: 2800000, guid: f9ddd079cac0f9247b9a89dd035c2ed4, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Metal Roughness - second: {fileID: 2800000, guid: 1ebbbbde29f7b404bb0bbc62f025936e, type: 3} + second: {fileID: 2800000, guid: 510f51a591fc6fe46ba3f7fc46ccea7d, type: 3} materials: materialImportMode: 2 materialName: 0 diff --git a/Assets/Prefab/Cleo.prefab b/Assets/Prefab/Cleo.prefab index ac8f5a4..bcd8fb0 100644 --- a/Assets/Prefab/Cleo.prefab +++ b/Assets/Prefab/Cleo.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &6532612766938416510 +--- !u!1001 &4082807035866922116 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -48,10 +48,6 @@ PrefabInstance: 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 @@ -64,14 +60,6 @@ PrefabInstance: 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} @@ -80,20 +68,20 @@ PrefabInstance: m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: cffeeee406d883e45b35a8917980c66b, type: 3} insertIndex: -1 - addedObject: {fileID: 6932100124852629104} + addedObject: {fileID: 2994841607099113388} m_SourcePrefab: {fileID: 100100000, guid: cffeeee406d883e45b35a8917980c66b, type: 3} ---- !u!1 &6226764569625688111 stripped +--- !u!1 &3776376658020073941 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: cffeeee406d883e45b35a8917980c66b, type: 3} - m_PrefabInstance: {fileID: 6532612766938416510} + m_PrefabInstance: {fileID: 4082807035866922116} m_PrefabAsset: {fileID: 0} ---- !u!65 &6932100124852629104 +--- !u!65 &2994841607099113388 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6226764569625688111} + m_GameObject: {fileID: 3776376658020073941} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -106,5 +94,5 @@ BoxCollider: 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} + m_Size: {x: 0.8277278, y: 1.0705242, z: 0.76184124} + m_Center: {x: -0.0017607361, y: -0.20728925, z: 0.1209369} diff --git a/Assets/Prefab/Cleo40.prefab b/Assets/Prefab/Cleo40.prefab deleted file mode 100644 index ef6c9ef..0000000 --- a/Assets/Prefab/Cleo40.prefab +++ /dev/null @@ -1,96 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &6956153062100963784 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: c5349716664a2c64b845940664ad6df6, type: 3} - propertyPath: m_LocalPosition.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c5349716664a2c64b845940664ad6df6, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c5349716664a2c64b845940664ad6df6, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c5349716664a2c64b845940664ad6df6, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c5349716664a2c64b845940664ad6df6, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c5349716664a2c64b845940664ad6df6, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c5349716664a2c64b845940664ad6df6, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c5349716664a2c64b845940664ad6df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c5349716664a2c64b845940664ad6df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: c5349716664a2c64b845940664ad6df6, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: c5349716664a2c64b845940664ad6df6, type: 3} - propertyPath: m_Name - value: Cleo40 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: c5349716664a2c64b845940664ad6df6, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: c5349716664a2c64b845940664ad6df6, type: 3} - propertyPath: m_TagString - value: Selectable - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: c5349716664a2c64b845940664ad6df6, type: 3} - insertIndex: -1 - addedObject: {fileID: 222742371495227549} - m_SourcePrefab: {fileID: 100100000, guid: c5349716664a2c64b845940664ad6df6, type: 3} ---- !u!1 &7802576012562869401 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c5349716664a2c64b845940664ad6df6, type: 3} - m_PrefabInstance: {fileID: 6956153062100963784} - m_PrefabAsset: {fileID: 0} ---- !u!65 &222742371495227549 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7802576012562869401} - 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.8277278, y: 1.0705242, z: 0.7618412} - m_Center: {x: -0.01463151, y: -0.13038447, z: 0.028092146} diff --git a/Assets/Prefab/Cleo40.prefab.meta b/Assets/Prefab/Cleo40.prefab.meta deleted file mode 100644 index a0ad1f6..0000000 --- a/Assets/Prefab/Cleo40.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 365bd8676f428bb479147272cf6a7459 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefab/SUMO102Shadow.prefab b/Assets/Prefab/SUMO102Shadow.prefab index c5ceffd..5aada1d 100644 --- a/Assets/Prefab/SUMO102Shadow.prefab +++ b/Assets/Prefab/SUMO102Shadow.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &8271754405892009684 +--- !u!1001 &2604603381953265894 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -48,17 +48,17 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -5330287902570191112, guid: 8f5f1985decf4d3439fd62f8e7956522, type: 3} - propertyPath: m_Layer - value: 6 + - target: {fileID: -300055393346323776, guid: 8f5f1985decf4d3439fd62f8e7956522, type: 3} + propertyPath: m_LocalPosition.y + value: 0.079 objectReference: {fileID: 0} - - target: {fileID: -1978375887256046412, guid: 8f5f1985decf4d3439fd62f8e7956522, type: 3} - propertyPath: m_Layer - value: 6 + - target: {fileID: -300055393346323776, guid: 8f5f1985decf4d3439fd62f8e7956522, type: 3} + propertyPath: m_LocalPosition.z + value: -0.423 objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 8f5f1985decf4d3439fd62f8e7956522, type: 3} propertyPath: m_Name - value: SUMO 102_Shadow + value: SUMO102Shadow objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 8f5f1985decf4d3439fd62f8e7956522, type: 3} propertyPath: m_Layer @@ -70,26 +70,26 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: - - {fileID: -8700617353114198275, guid: 8f5f1985decf4d3439fd62f8e7956522, type: 3} - {fileID: 65702495048144492, guid: 8f5f1985decf4d3439fd62f8e7956522, type: 3} + - {fileID: -8700617353114198275, guid: 8f5f1985decf4d3439fd62f8e7956522, type: 3} m_AddedGameObjects: [] m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 8f5f1985decf4d3439fd62f8e7956522, type: 3} insertIndex: -1 - addedObject: {fileID: 7038787526579506249} + addedObject: {fileID: 3194299391318606698} m_SourcePrefab: {fileID: 100100000, guid: 8f5f1985decf4d3439fd62f8e7956522, type: 3} ---- !u!1 &9082147600617575301 stripped +--- !u!1 &2946481327619587511 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 8f5f1985decf4d3439fd62f8e7956522, type: 3} - m_PrefabInstance: {fileID: 8271754405892009684} + m_PrefabInstance: {fileID: 2604603381953265894} m_PrefabAsset: {fileID: 0} ---- !u!65 &7038787526579506249 +--- !u!65 &3194299391318606698 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9082147600617575301} + m_GameObject: {fileID: 2946481327619587511} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -102,5 +102,5 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.46565136, y: 0.57279617, z: 0.46839893} - m_Center: {x: 0.0006868094, y: 0.2699215, z: -0.002060473} + m_Size: {x: 0.44996822, y: 0.557, z: 0.4499841} + m_Center: {x: -0.00025933236, y: 0.18842238, z: -0.00039501488} diff --git a/Assets/Prefab/SandiaOriginal.prefab b/Assets/Prefab/SandiaOriginal.prefab index 99d33e4..2108193 100644 --- a/Assets/Prefab/SandiaOriginal.prefab +++ b/Assets/Prefab/SandiaOriginal.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &5479171355772647032 +--- !u!1001 &8494826378087422527 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -58,7 +58,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_Name - value: Sandia_Original + value: SandiaOriginal objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} propertyPath: m_Layer @@ -82,26 +82,26 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: - - {fileID: -8700617353114198275, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} - {fileID: 65702495048144492, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} + - {fileID: -8700617353114198275, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} m_AddedGameObjects: [] m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} insertIndex: -1 - addedObject: {fileID: 2027700185008669007} + addedObject: {fileID: 406969623798814043} m_SourcePrefab: {fileID: 100100000, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} ---- !u!1 &4668126701482396457 stripped +--- !u!1 &8728757026152900462 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 2edf5ab52f9b640439e76ed059ac260d, type: 3} - m_PrefabInstance: {fileID: 5479171355772647032} + m_PrefabInstance: {fileID: 8494826378087422527} m_PrefabAsset: {fileID: 0} ---- !u!65 &2027700185008669007 +--- !u!65 &406969623798814043 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4668126701482396457} + m_GameObject: {fileID: 8728757026152900462} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -114,5 +114,5 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 2.7180703, y: 0.7272146, z: 1.2129643} - m_Center: {x: -0.0023926497, y: 0.07417859, z: -0.053839207} + m_Size: {x: 2.9784298, y: 0.8157501, z: 1.3469641} + m_Center: {x: -0.003819704, y: 0.092124924, z: -0.056232095} diff --git a/Assets/Prefab/SandiaOriginal10.prefab b/Assets/Prefab/SandiaOriginal10.prefab deleted file mode 100644 index c75ce0f..0000000 --- a/Assets/Prefab/SandiaOriginal10.prefab +++ /dev/null @@ -1,116 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &8314176279852860809 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 3e11bb85aa881844d89ef8c9b58ba2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 3e11bb85aa881844d89ef8c9b58ba2bd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 3e11bb85aa881844d89ef8c9b58ba2bd, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 3e11bb85aa881844d89ef8c9b58ba2bd, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 3e11bb85aa881844d89ef8c9b58ba2bd, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 3e11bb85aa881844d89ef8c9b58ba2bd, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 3e11bb85aa881844d89ef8c9b58ba2bd, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 3e11bb85aa881844d89ef8c9b58ba2bd, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 3e11bb85aa881844d89ef8c9b58ba2bd, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 3e11bb85aa881844d89ef8c9b58ba2bd, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7994797705509562334, guid: 3e11bb85aa881844d89ef8c9b58ba2bd, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -2483457360873903965, guid: 3e11bb85aa881844d89ef8c9b58ba2bd, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 3e11bb85aa881844d89ef8c9b58ba2bd, type: 3} - propertyPath: m_Name - value: SandiaOriginal10 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 3e11bb85aa881844d89ef8c9b58ba2bd, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 3e11bb85aa881844d89ef8c9b58ba2bd, type: 3} - propertyPath: m_TagString - value: Selectable - objectReference: {fileID: 0} - - target: {fileID: 1048557623486924390, guid: 3e11bb85aa881844d89ef8c9b58ba2bd, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 2286881742900085478, guid: 3e11bb85aa881844d89ef8c9b58ba2bd, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 8159868104006456718, guid: 3e11bb85aa881844d89ef8c9b58ba2bd, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 3e11bb85aa881844d89ef8c9b58ba2bd, type: 3} - insertIndex: -1 - addedObject: {fileID: 6291726946797978268} - m_SourcePrefab: {fileID: 100100000, guid: 3e11bb85aa881844d89ef8c9b58ba2bd, type: 3} ---- !u!1 &9196502821654427864 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 3e11bb85aa881844d89ef8c9b58ba2bd, type: 3} - m_PrefabInstance: {fileID: 8314176279852860809} - m_PrefabAsset: {fileID: 0} ---- !u!65 &6291726946797978268 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9196502821654427864} - 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.998402, y: 0.81476957, z: 1.3652434} - m_Center: {x: 0.002608776, y: 0.09261522, z: -0.054786325} diff --git a/Assets/Prefab/SandiaOriginal10.prefab.meta b/Assets/Prefab/SandiaOriginal10.prefab.meta deleted file mode 100644 index 8579da9..0000000 --- a/Assets/Prefab/SandiaOriginal10.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 24d8fd106fc1ee847a33d53ad360c011 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefab/SandiaSeoul.prefab b/Assets/Prefab/SandiaSeoul.prefab index 8048064..58efd2c 100644 --- a/Assets/Prefab/SandiaSeoul.prefab +++ b/Assets/Prefab/SandiaSeoul.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &4190862597793380653 +--- !u!1001 &5251659569622819685 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -58,7 +58,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} propertyPath: m_Name - value: Sandia_Seoul + value: SandiaSeoul objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} propertyPath: m_Layer @@ -82,26 +82,26 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: - - {fileID: -8700617353114198275, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} - {fileID: 65702495048144492, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} + - {fileID: -8700617353114198275, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} m_AddedGameObjects: [] m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} insertIndex: -1 - addedObject: {fileID: 5524598028417987098} + addedObject: {fileID: 1667365404732025781} m_SourcePrefab: {fileID: 100100000, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} ---- !u!1 &3956841657705219196 stripped +--- !u!1 &4909149389872373300 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 3c14ff19ec0f8ca4fae22692254052ff, type: 3} - m_PrefabInstance: {fileID: 4190862597793380653} + m_PrefabInstance: {fileID: 5251659569622819685} m_PrefabAsset: {fileID: 0} ---- !u!65 &5524598028417987098 +--- !u!65 &1667365404732025781 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3956841657705219196} + m_GameObject: {fileID: 4909149389872373300} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -114,5 +114,5 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 2.727857, y: 0.7955775, z: 1.2190243} - m_Center: {x: 0.0024335384, y: 0.10221124, z: -0.04867226} + m_Size: {x: 2.9759986, y: 0.81689596, z: 1.3560358} + m_Center: {x: -0.003814578, y: 0.09155202, z: -0.068664014} diff --git a/Assets/Prefab/SandiaSeoul10.prefab b/Assets/Prefab/SandiaSeoul10.prefab deleted file mode 100644 index 706291c..0000000 --- a/Assets/Prefab/SandiaSeoul10.prefab +++ /dev/null @@ -1,116 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &5679451034891402697 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: b2dfdc7db28fd884fa1cea72b71b0bdb, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b2dfdc7db28fd884fa1cea72b71b0bdb, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b2dfdc7db28fd884fa1cea72b71b0bdb, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b2dfdc7db28fd884fa1cea72b71b0bdb, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b2dfdc7db28fd884fa1cea72b71b0bdb, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b2dfdc7db28fd884fa1cea72b71b0bdb, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b2dfdc7db28fd884fa1cea72b71b0bdb, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b2dfdc7db28fd884fa1cea72b71b0bdb, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b2dfdc7db28fd884fa1cea72b71b0bdb, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: b2dfdc7db28fd884fa1cea72b71b0bdb, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -4856827502284789080, guid: b2dfdc7db28fd884fa1cea72b71b0bdb, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -4150886726098164377, guid: b2dfdc7db28fd884fa1cea72b71b0bdb, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: b2dfdc7db28fd884fa1cea72b71b0bdb, type: 3} - propertyPath: m_Name - value: SandiaSeoul10 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: b2dfdc7db28fd884fa1cea72b71b0bdb, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: b2dfdc7db28fd884fa1cea72b71b0bdb, type: 3} - propertyPath: m_TagString - value: Selectable - objectReference: {fileID: 0} - - target: {fileID: 1945263359323730849, guid: b2dfdc7db28fd884fa1cea72b71b0bdb, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 3717912529839923233, guid: b2dfdc7db28fd884fa1cea72b71b0bdb, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 7898634311935120001, guid: b2dfdc7db28fd884fa1cea72b71b0bdb, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: b2dfdc7db28fd884fa1cea72b71b0bdb, type: 3} - insertIndex: -1 - addedObject: {fileID: 5877276918115856222} - m_SourcePrefab: {fileID: 100100000, guid: b2dfdc7db28fd884fa1cea72b71b0bdb, type: 3} ---- !u!1 &4760339380246151320 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: b2dfdc7db28fd884fa1cea72b71b0bdb, type: 3} - m_PrefabInstance: {fileID: 5679451034891402697} - m_PrefabAsset: {fileID: 0} ---- !u!65 &5877276918115856222 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4760339380246151320} - 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.9905753, y: 0.7782451, z: 1.3678519} - m_Center: {x: -0.009131193, y: 0.082179666, z: -0.053482234} diff --git a/Assets/Prefab/SandiaSeoul10.prefab.meta b/Assets/Prefab/SandiaSeoul10.prefab.meta deleted file mode 100644 index 6b60f69..0000000 --- a/Assets/Prefab/SandiaSeoul10.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a24a1495820ea064d89c644d7a8d052c -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefab/TOTU103.prefab b/Assets/Prefab/TOTU103.prefab index 9db70c5..4e06669 100644 --- a/Assets/Prefab/TOTU103.prefab +++ b/Assets/Prefab/TOTU103.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &4150255874948156312 +--- !u!1001 &2249162076874764750 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -48,17 +48,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -5529011160683422511, guid: d0af17ff3cfbdb249bafc9833a273119, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -4921540189421915963, guid: d0af17ff3cfbdb249bafc9833a273119, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: d0af17ff3cfbdb249bafc9833a273119, type: 3} propertyPath: m_Name - value: TOTU 103 + value: TOTU103 objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: d0af17ff3cfbdb249bafc9833a273119, type: 3} propertyPath: m_Layer @@ -68,28 +60,36 @@ PrefabInstance: propertyPath: m_TagString value: Selectable objectReference: {fileID: 0} + - target: {fileID: 9138704317439073631, guid: d0af17ff3cfbdb249bafc9833a273119, type: 3} + propertyPath: m_LocalPosition.y + value: -0.049 + objectReference: {fileID: 0} + - target: {fileID: 9138704317439073631, guid: d0af17ff3cfbdb249bafc9833a273119, type: 3} + propertyPath: m_LocalPosition.z + value: -0.587 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: - - {fileID: -8700617353114198275, guid: d0af17ff3cfbdb249bafc9833a273119, type: 3} - {fileID: 65702495048144492, guid: d0af17ff3cfbdb249bafc9833a273119, type: 3} + - {fileID: -8700617353114198275, guid: d0af17ff3cfbdb249bafc9833a273119, type: 3} m_AddedGameObjects: [] m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: d0af17ff3cfbdb249bafc9833a273119, type: 3} insertIndex: -1 - addedObject: {fileID: 5963433529744296413} + addedObject: {fileID: 266689197005504066} m_SourcePrefab: {fileID: 100100000, guid: d0af17ff3cfbdb249bafc9833a273119, type: 3} ---- !u!1 &3844317523185923785 stripped +--- !u!1 &1438839813668818079 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: d0af17ff3cfbdb249bafc9833a273119, type: 3} - m_PrefabInstance: {fileID: 4150255874948156312} + m_PrefabInstance: {fileID: 2249162076874764750} m_PrefabAsset: {fileID: 0} ---- !u!65 &5963433529744296413 +--- !u!65 &266689197005504066 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3844317523185923785} + m_GameObject: {fileID: 1438839813668818079} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -102,5 +102,5 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.6139138, y: 0.36908233, z: 0.60921204} - m_Center: {x: 0.00046736002, y: -0.15431905, z: 0.0018557906} + m_Size: {x: 0.59999853, y: 0.36000004, z: 0.5999825} + m_Center: {x: -0.000087440014, y: -0.10546042, z: -0.0012236983} diff --git a/Assets/Prefab/TOTU104.prefab b/Assets/Prefab/TOTU104.prefab index 595ac09..a0d1468 100644 --- a/Assets/Prefab/TOTU104.prefab +++ b/Assets/Prefab/TOTU104.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &3186395455343407404 +--- !u!1001 &7578941798489954057 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -8,18 +8,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 8f13c2dbac068fb469ec25862bfb81f8, type: 3} - propertyPath: m_LocalScale.x - value: 1.1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8f13c2dbac068fb469ec25862bfb81f8, type: 3} - propertyPath: m_LocalScale.y - value: 1.1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8f13c2dbac068fb469ec25862bfb81f8, type: 3} - propertyPath: m_LocalScale.z - value: 1.1 - objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8f13c2dbac068fb469ec25862bfb81f8, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -60,21 +48,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 8f13c2dbac068fb469ec25862bfb81f8, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -4193954691750240724, guid: 8f13c2dbac068fb469ec25862bfb81f8, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -1834228333010508426, guid: 8f13c2dbac068fb469ec25862bfb81f8, type: 3} - propertyPath: m_Layer - value: 6 - objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 8f13c2dbac068fb469ec25862bfb81f8, type: 3} propertyPath: m_Name - value: TOTU 104 + value: TOTU104 objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 8f13c2dbac068fb469ec25862bfb81f8, type: 3} propertyPath: m_Layer @@ -92,20 +68,20 @@ PrefabInstance: m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 8f13c2dbac068fb469ec25862bfb81f8, type: 3} insertIndex: -1 - addedObject: {fileID: 4110326969077454010} + addedObject: {fileID: 4058146486885692080} m_SourcePrefab: {fileID: 100100000, guid: 8f13c2dbac068fb469ec25862bfb81f8, type: 3} ---- !u!1 &2375983163045612669 stripped +--- !u!1 &7344428404966926936 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 8f13c2dbac068fb469ec25862bfb81f8, type: 3} - m_PrefabInstance: {fileID: 3186395455343407404} + m_PrefabInstance: {fileID: 7578941798489954057} m_PrefabAsset: {fileID: 0} ---- !u!65 &4110326969077454010 +--- !u!65 &4058146486885692080 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2375983163045612669} + m_GameObject: {fileID: 7344428404966926936} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -118,5 +94,5 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 1.2090707, y: 0.27797443, z: 1.2115015} - m_Center: {x: -0.0012155012, y: -0.10331985, z: -0.0012153928} + m_Size: {x: 1.1999738, y: 0.26000008, z: 1.1999648} + m_Center: {x: 0.00014516711, y: -0.092069626, z: -0.000526011} diff --git a/Assets/Scenes/ARScreen.unity b/Assets/Scenes/ARScreen.unity index 7dead88..4fd4e13 100644 --- a/Assets/Scenes/ARScreen.unity +++ b/Assets/Scenes/ARScreen.unity @@ -735,141 +735,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 376262062} m_CullTransparentMesh: 1 ---- !u!1 &456193744 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 456193745} - - component: {fileID: 456193749} - - component: {fileID: 456193748} - - component: {fileID: 456193747} - - component: {fileID: 456193746} - m_Layer: 5 - m_Name: SandiaOriginal10 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &456193745 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 456193744} - 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 &456193746 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 456193744} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6bcac7e483a825d48bb0e327d618f0ce, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabToInstance: {fileID: 9196502821654427864, guid: 24d8fd106fc1ee847a33d53ad360c011, type: 3} - gridPrefab: {fileID: 7069418182187326116, guid: 9d00637d689464a7aabd732cb44e1552, type: 3} ---- !u!114 &456193747 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 456193744} - 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: 456193748} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &456193748 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 456193744} - 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 &456193749 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 456193744} - m_CullTransparentMesh: 1 --- !u!1 &518661785 GameObject: m_ObjectHideFlags: 0 @@ -921,7 +786,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6bcac7e483a825d48bb0e327d618f0ce, type: 3} m_Name: m_EditorClassIdentifier: - prefabToInstance: {fileID: 6226764569625688111, guid: 7161bc8dd62e23649bbea53ddca38fe3, type: 3} + prefabToInstance: {fileID: 3776376658020073941, guid: 7161bc8dd62e23649bbea53ddca38fe3, type: 3} gridPrefab: {fileID: 7069418182187326116, guid: 9d00637d689464a7aabd732cb44e1552, type: 3} --- !u!114 &518661788 MonoBehaviour: @@ -1255,7 +1120,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0.8392, y: 0} + m_AnchoredPosition: {x: 0.83917236, y: 0} m_SizeDelta: {x: -344.6783, y: 208.0886} m_Pivot: {x: 0.5, y: 0} --- !u!114 &717270552 @@ -1442,11 +1307,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 518661786} - - {fileID: 2074877135} - {fileID: 1510757701} - - {fileID: 456193745} - {fileID: 1141372680} - - {fileID: 1873010162} - {fileID: 1824976691} - {fileID: 2016642935} - {fileID: 1198553687} @@ -1918,7 +1780,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6bcac7e483a825d48bb0e327d618f0ce, type: 3} m_Name: m_EditorClassIdentifier: - prefabToInstance: {fileID: 3956841657705219196, guid: 65f9bcf61b8f4b84d8883473bb85dbc0, type: 3} + prefabToInstance: {fileID: 4909149389872373300, guid: 65f9bcf61b8f4b84d8883473bb85dbc0, type: 3} gridPrefab: {fileID: 7069418182187326116, guid: 9d00637d689464a7aabd732cb44e1552, type: 3} --- !u!114 &1141372682 MonoBehaviour: @@ -2187,7 +2049,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6bcac7e483a825d48bb0e327d618f0ce, type: 3} m_Name: m_EditorClassIdentifier: - prefabToInstance: {fileID: 2375983163045612669, guid: 164147a71b561744d865026a9543e6f2, type: 3} + prefabToInstance: {fileID: 7344428404966926936, guid: 164147a71b561744d865026a9543e6f2, type: 3} gridPrefab: {fileID: 7069418182187326116, guid: 9d00637d689464a7aabd732cb44e1552, type: 3} --- !u!114 &1198553689 MonoBehaviour: @@ -2597,7 +2459,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6bcac7e483a825d48bb0e327d618f0ce, type: 3} m_Name: m_EditorClassIdentifier: - prefabToInstance: {fileID: 4668126701482396457, guid: be2751640704a964197f73b09dbd1581, type: 3} + prefabToInstance: {fileID: 8728757026152900462, guid: be2751640704a964197f73b09dbd1581, type: 3} gridPrefab: {fileID: 7069418182187326116, guid: 9d00637d689464a7aabd732cb44e1552, type: 3} --- !u!114 &1510757703 MonoBehaviour: @@ -2768,7 +2630,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6bcac7e483a825d48bb0e327d618f0ce, type: 3} m_Name: m_EditorClassIdentifier: - prefabToInstance: {fileID: 9082147600617575301, guid: dd94a7ef5ebf25b448d5dc1635cc6a3b, type: 3} + prefabToInstance: {fileID: 2946481327619587511, guid: dd94a7ef5ebf25b448d5dc1635cc6a3b, type: 3} gridPrefab: {fileID: 7069418182187326116, guid: 9d00637d689464a7aabd732cb44e1552, type: 3} --- !u!114 &1824976693 MonoBehaviour: @@ -2898,141 +2760,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1873010161 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1873010162} - - component: {fileID: 1873010166} - - component: {fileID: 1873010165} - - component: {fileID: 1873010164} - - component: {fileID: 1873010163} - m_Layer: 5 - m_Name: SandiaSeoul10 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1873010162 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1873010161} - 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 &1873010163 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1873010161} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6bcac7e483a825d48bb0e327d618f0ce, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabToInstance: {fileID: 4760339380246151320, guid: a24a1495820ea064d89c644d7a8d052c, type: 3} - gridPrefab: {fileID: 7069418182187326116, guid: 9d00637d689464a7aabd732cb44e1552, type: 3} ---- !u!114 &1873010164 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1873010161} - 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: 1873010165} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1873010165 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1873010161} - 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: 7ebac144592786a4e8c79ae40223b19f, 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 &1873010166 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1873010161} - m_CullTransparentMesh: 1 --- !u!1 &1919945870 GameObject: m_ObjectHideFlags: 0 @@ -3154,7 +2881,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6bcac7e483a825d48bb0e327d618f0ce, type: 3} m_Name: m_EditorClassIdentifier: - prefabToInstance: {fileID: 3844317523185923785, guid: 95b212afb5a437747abfb25df4d09cb3, type: 3} + prefabToInstance: {fileID: 1438839813668818079, guid: 95b212afb5a437747abfb25df4d09cb3, type: 3} gridPrefab: {fileID: 7069418182187326116, guid: 9d00637d689464a7aabd732cb44e1552, type: 3} --- !u!114 &2016642937 MonoBehaviour: @@ -3238,141 +2965,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2016642934} m_CullTransparentMesh: 1 ---- !u!1 &2074877134 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2074877135} - - component: {fileID: 2074877139} - - component: {fileID: 2074877138} - - component: {fileID: 2074877137} - - component: {fileID: 2074877136} - m_Layer: 5 - m_Name: CleoChair40 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2074877135 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2074877134} - 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 &2074877136 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2074877134} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6bcac7e483a825d48bb0e327d618f0ce, type: 3} - m_Name: - m_EditorClassIdentifier: - prefabToInstance: {fileID: 7802576012562869401, guid: 365bd8676f428bb479147272cf6a7459, type: 3} - gridPrefab: {fileID: 7069418182187326116, guid: 9d00637d689464a7aabd732cb44e1552, type: 3} ---- !u!114 &2074877137 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2074877134} - 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: 2074877138} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &2074877138 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2074877134} - 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: fc5bbe2cc8e4ab74e9f709640b10c591, 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 &2074877139 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2074877134} - m_CullTransparentMesh: 1 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/ObjectDetection/ObjectDetectionSample.cs b/Assets/Scripts/ObjectDetection/ObjectDetectionSample.cs index 679c31a..a20c96b 100644 --- a/Assets/Scripts/ObjectDetection/ObjectDetectionSample.cs +++ b/Assets/Scripts/ObjectDetection/ObjectDetectionSample.cs @@ -21,7 +21,7 @@ public class ObjectDetectionSample : MonoBehaviour private float _detectionSlowdownRate = 0.0f; // Detection frame rate for stationary camera private float _detectionNormalRate = 1.0f; // Detection frame rate for moving camera private bool _isCameraMoving = false; - private float confidencePercentage = 0.65f; + private float confidencePercentage = 1f; private void Awake() { diff --git a/Assets/Textures/Cleo/Capitolino tan color alt.png b/Assets/Textures/Cleo/Capitolino tan color alt.png new file mode 100644 index 0000000..fe4cf1b --- /dev/null +++ b/Assets/Textures/Cleo/Capitolino tan color alt.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f907fa082af0bbb0138912bcd5678fea3a4607e070ef0aae2a0588c5a44c2027 +size 38234932 diff --git a/Assets/Textures/Cleo/Cleo40/Filicui White Color.png.meta b/Assets/Textures/Cleo/Capitolino tan color alt.png.meta similarity index 98% rename from Assets/Textures/Cleo/Cleo40/Filicui White Color.png.meta rename to Assets/Textures/Cleo/Capitolino tan color alt.png.meta index 57b50cc..e91e7c5 100644 --- a/Assets/Textures/Cleo/Cleo40/Filicui White Color.png.meta +++ b/Assets/Textures/Cleo/Capitolino tan color alt.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a211dddfadae7504ba96561e7d028de3 +guid: 218eadac3feb68f4b86d50c522307b8a TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Cleo/Capitolino tan color.png b/Assets/Textures/Cleo/Capitolino tan color.png deleted file mode 100644 index 4cf420b..0000000 --- a/Assets/Textures/Cleo/Capitolino tan color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:09ba8599cfdb0e3666d7e2b4607d0c2f526b0e75f032c3569d632eaabfe0a055 -size 39293340 diff --git a/Assets/Textures/Cleo/Chocolate Stained Wood Color.png.meta b/Assets/Textures/Cleo/Chocolate Stained Wood Color.png.meta index 9be34c2..b0a6102 100644 --- a/Assets/Textures/Cleo/Chocolate Stained Wood Color.png.meta +++ b/Assets/Textures/Cleo/Chocolate Stained Wood Color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e31b85f8a0c10d64e9683cc40e07a728 +guid: f59deffb3a9171d469424631ac019e95 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Cleo/Chocolate Stained Wood Logo Color.png.meta b/Assets/Textures/Cleo/Chocolate Stained Wood Logo Color.png.meta index d109e98..0b1fa41 100644 --- a/Assets/Textures/Cleo/Chocolate Stained Wood Logo Color.png.meta +++ b/Assets/Textures/Cleo/Chocolate Stained Wood Logo Color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 519630f1e9eef6c4fb0c1641af6c7de8 +guid: 0c2f3acb1f5d6fe4e85ba07f841d38d5 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Cleo/Cleo40.meta b/Assets/Textures/Cleo/Cleo40.meta deleted file mode 100644 index 3867b8e..0000000 --- a/Assets/Textures/Cleo/Cleo40.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8fc6f60a7110b0f4ea468d6e0e492080 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Cleo/Cleo40/Capitolino tan color.png b/Assets/Textures/Cleo/Cleo40/Capitolino tan color.png deleted file mode 100644 index 4cf420b..0000000 --- a/Assets/Textures/Cleo/Cleo40/Capitolino tan color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:09ba8599cfdb0e3666d7e2b4607d0c2f526b0e75f032c3569d632eaabfe0a055 -size 39293340 diff --git a/Assets/Textures/Cleo/Cleo40/Capitolino tan color.png.meta b/Assets/Textures/Cleo/Cleo40/Capitolino tan color.png.meta deleted file mode 100644 index efe36c4..0000000 --- a/Assets/Textures/Cleo/Cleo40/Capitolino tan color.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: a75b747ff5da1d14daeb09871b9ddab3 -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/Cleo/Cleo40/Chocolate Stained Wood Color.png b/Assets/Textures/Cleo/Cleo40/Chocolate Stained Wood Color.png deleted file mode 100644 index c7654f7..0000000 --- a/Assets/Textures/Cleo/Cleo40/Chocolate Stained Wood Color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:317405f75100cd62147454b24398153c3a76e9e89ad340e278acdda1d9d49056 -size 16531508 diff --git a/Assets/Textures/Cleo/Cleo40/Chocolate Stained Wood Logo Color.png b/Assets/Textures/Cleo/Cleo40/Chocolate Stained Wood Logo Color.png deleted file mode 100644 index 9ef62a9..0000000 --- a/Assets/Textures/Cleo/Cleo40/Chocolate Stained Wood Logo Color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e4100d5d8d23dc0db6041a9f7f74cac62ee32ceb6b8893a58e71096f72235a45 -size 132922825 diff --git a/Assets/Textures/Cleo/Cleo40/Filicui White Color.png b/Assets/Textures/Cleo/Cleo40/Filicui White Color.png deleted file mode 100644 index 6bf5df0..0000000 --- a/Assets/Textures/Cleo/Cleo40/Filicui White Color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94224f5f77816703052b82ca546a511ce27d99817f56e257147a34deb81d2cce -size 132922825 diff --git a/Assets/Textures/Cleo/Filicui White Color.png.meta b/Assets/Textures/Cleo/Filicui White Color.png.meta index 908736d..df654b8 100644 --- a/Assets/Textures/Cleo/Filicui White Color.png.meta +++ b/Assets/Textures/Cleo/Filicui White Color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 591cf74094498cc4f90bd22baff87d65 +guid: b1da137d355e6e94cb7343ff55049338 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sandia/Original/Fur cushion color.png.meta b/Assets/Textures/Sandia/Original/Fur cushion color.png.meta index b3f4c03..4d6c08f 100644 --- a/Assets/Textures/Sandia/Original/Fur cushion color.png.meta +++ b/Assets/Textures/Sandia/Original/Fur cushion color.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 8bbc9ae782a51f84a83f59078b70dd82 +guid: 676d206708d695c40942dbabab4d89e9 TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 + wrapU: 0 + wrapV: 0 wrapW: 0 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 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: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -112,7 +112,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: internalID: 0 vertices: [] indices: diff --git a/Assets/Textures/Sandia/Original/Logo cushion border color alt.png.meta b/Assets/Textures/Sandia/Original/Logo cushion border color alt.png.meta index 8f3072e..b601a28 100644 --- a/Assets/Textures/Sandia/Original/Logo cushion border color alt.png.meta +++ b/Assets/Textures/Sandia/Original/Logo cushion border color alt.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 09b6e1591ac5ae5458f5e54f13f01995 +guid: f6b705156c7c74844a556540ddbc178a TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 + wrapU: 0 + wrapV: 0 wrapW: 0 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 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: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -112,7 +112,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: internalID: 0 vertices: [] indices: 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 18916f5..8632346 100644 --- a/Assets/Textures/Sandia/Original/Logo cushion border color.png.meta +++ b/Assets/Textures/Sandia/Original/Logo cushion border color.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 1862a96a6c318214cab372af66207a19 +guid: 5c7717242a8419441b3d0402f3c7de32 TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 + wrapU: 0 + wrapV: 0 wrapW: 0 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 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: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -112,7 +112,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: internalID: 0 vertices: [] indices: diff --git a/Assets/Textures/Sandia/Original/Logo cushion color alt.png.meta b/Assets/Textures/Sandia/Original/Logo cushion color alt.png.meta index 2352d9a..0e30711 100644 --- a/Assets/Textures/Sandia/Original/Logo cushion color alt.png.meta +++ b/Assets/Textures/Sandia/Original/Logo cushion color alt.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: c16b921c9c20893488580735c06cf956 +guid: e7a237e23d943b546901eb2baa9cc35a TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 + wrapU: 0 + wrapV: 0 wrapW: 0 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 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: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -112,7 +112,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: internalID: 0 vertices: [] indices: 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 3d469fd..763ca22 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: 50709a532da857643aaf28177f49bcbb +guid: d9b8c0760f0ecc04bb7e4309c31c206f TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 + wrapU: 0 + wrapV: 0 wrapW: 0 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 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: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -112,7 +112,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: 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 cedf945..c618bab 100644 --- a/Assets/Textures/Sandia/Original/Red cushion color.png.meta +++ b/Assets/Textures/Sandia/Original/Red cushion color.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 1104d09dfb5c7944fb4f29423b410f07 +guid: c067ea4586d909a458c04ffa24edf593 TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 + wrapU: 0 + wrapV: 0 wrapW: 0 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 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: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -112,7 +112,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: internalID: 0 vertices: [] indices: diff --git a/Assets/Textures/Sandia/Original/Striped cushion color.png.meta b/Assets/Textures/Sandia/Original/Striped cushion color.png.meta index e0f542c..2e42a2c 100644 --- a/Assets/Textures/Sandia/Original/Striped cushion color.png.meta +++ b/Assets/Textures/Sandia/Original/Striped cushion color.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 3916f7cdba1d2b842b175ae2230f612a +guid: 46ea6d8847452c647a14b82dd0266e6f TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 + wrapU: 0 + wrapV: 0 wrapW: 0 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 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: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -112,7 +112,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: internalID: 0 vertices: [] indices: diff --git a/Assets/Textures/Sandia/Original/Yellow velvet bright color.png.meta b/Assets/Textures/Sandia/Original/Yellow velvet bright color.png.meta index be7a797..1c51af6 100644 --- a/Assets/Textures/Sandia/Original/Yellow velvet bright color.png.meta +++ b/Assets/Textures/Sandia/Original/Yellow velvet bright color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cea2a355dd2460d40ac4334f6698e0c5 +guid: c8beed965eeadae44b71099ada286a5d TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sandia/Original/Yellow velvet brighter color.png b/Assets/Textures/Sandia/Original/Yellow velvet brighter color.png deleted file mode 100644 index 2dcab86..0000000 --- a/Assets/Textures/Sandia/Original/Yellow velvet brighter color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9f6326785245f1a3e146d3be3bae36443c4f3630d95e4e5d22993147cf015d6 -size 11660737 diff --git a/Assets/Textures/Sandia/Original/Yellow velvet brighter color.png.meta b/Assets/Textures/Sandia/Original/Yellow velvet brighter color.png.meta deleted file mode 100644 index 4ce7eac..0000000 --- a/Assets/Textures/Sandia/Original/Yellow velvet brighter color.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 109da59915e07204cb6700121223ff11 -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 color.png b/Assets/Textures/Sandia/Original/Yellow velvet color.png new file mode 100644 index 0000000..b772db9 --- /dev/null +++ b/Assets/Textures/Sandia/Original/Yellow velvet color.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a0c7bec597981a2446672eecb8c522c465870a01f279fa1a75dfe6b67c759d9d +size 12654009 diff --git a/Assets/Textures/Cleo/Cleo40/Chocolate Stained Wood Logo Color.png.meta b/Assets/Textures/Sandia/Original/Yellow velvet color.png.meta similarity index 98% rename from Assets/Textures/Cleo/Cleo40/Chocolate Stained Wood Logo Color.png.meta rename to Assets/Textures/Sandia/Original/Yellow velvet color.png.meta index c5e6366..a6fa825 100644 --- a/Assets/Textures/Cleo/Cleo40/Chocolate Stained Wood Logo Color.png.meta +++ b/Assets/Textures/Sandia/Original/Yellow velvet color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1de0fd10c165dec478ef731f88babd39 +guid: 8db40b83cc3700041b0e3f207eb673b6 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sandia/Original/Yellow velvet roughness.png b/Assets/Textures/Sandia/Original/Yellow velvet roughness.png new file mode 100644 index 0000000..2350e01 --- /dev/null +++ b/Assets/Textures/Sandia/Original/Yellow velvet roughness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2dce320c0b23b281e152188fc429c15ae8166240a3b28bf479ae9a1fa899a75 +size 882002 diff --git a/Assets/Textures/Sandia/Original10/Fur cushion color.png.meta b/Assets/Textures/Sandia/Original/Yellow velvet roughness.png.meta similarity index 98% rename from Assets/Textures/Sandia/Original10/Fur cushion color.png.meta rename to Assets/Textures/Sandia/Original/Yellow velvet roughness.png.meta index 2260de5..e330e13 100644 --- a/Assets/Textures/Sandia/Original10/Fur cushion color.png.meta +++ b/Assets/Textures/Sandia/Original/Yellow velvet roughness.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 179f6c974c7e6c84dafc451bc3f2243b +guid: afb5ea52ffb890542a3a88dc5d010f39 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sandia/Original10.meta b/Assets/Textures/Sandia/Original10.meta deleted file mode 100644 index 870b5f0..0000000 --- a/Assets/Textures/Sandia/Original10.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5e9cbe975d0c9a344af170ecbe2133f3 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Sandia/Original10/Fur cushion color.png b/Assets/Textures/Sandia/Original10/Fur cushion color.png deleted file mode 100644 index ef2009e..0000000 --- a/Assets/Textures/Sandia/Original10/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/Original10/Logo cushion border color.png b/Assets/Textures/Sandia/Original10/Logo cushion border color.png deleted file mode 100644 index 38564c2..0000000 --- a/Assets/Textures/Sandia/Original10/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/Original10/Logo cushion color mod.png b/Assets/Textures/Sandia/Original10/Logo cushion color mod.png deleted file mode 100644 index 801f67b..0000000 --- a/Assets/Textures/Sandia/Original10/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/Original10/Logo cushion color mod.png.meta b/Assets/Textures/Sandia/Original10/Logo cushion color mod.png.meta deleted file mode 100644 index 7372887..0000000 --- a/Assets/Textures/Sandia/Original10/Logo cushion color mod.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 5e2f5e921b7bce14388d87a63c2cb94e -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/Original10/Red cushion color.png b/Assets/Textures/Sandia/Original10/Red cushion color.png deleted file mode 100644 index 93992fc..0000000 --- a/Assets/Textures/Sandia/Original10/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/Original10/Red cushion color.png.meta b/Assets/Textures/Sandia/Original10/Red cushion color.png.meta deleted file mode 100644 index 00e62b8..0000000 --- a/Assets/Textures/Sandia/Original10/Red cushion color.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 86f8d820442c35948931e288256d2abf -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/Original10/Striped cushion color.png b/Assets/Textures/Sandia/Original10/Striped cushion color.png deleted file mode 100644 index 3845525..0000000 --- a/Assets/Textures/Sandia/Original10/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/Original10/Striped cushion color.png.meta b/Assets/Textures/Sandia/Original10/Striped cushion color.png.meta deleted file mode 100644 index 915d102..0000000 --- a/Assets/Textures/Sandia/Original10/Striped cushion color.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 6937a3c514930dc4a8aa04df9d7e9f43 -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/Original10/Yellow velvet bright color.png b/Assets/Textures/Sandia/Original10/Yellow velvet bright color.png deleted file mode 100644 index c9a9b25..0000000 --- a/Assets/Textures/Sandia/Original10/Yellow velvet bright color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05617be403b193018270010cf9743e55e26e32e5a0c0c06c1eb948fbcc15af2f -size 10337608 diff --git a/Assets/Textures/Sandia/Original10/Yellow velvet bright color.png.meta b/Assets/Textures/Sandia/Original10/Yellow velvet bright color.png.meta deleted file mode 100644 index 32c46fa..0000000 --- a/Assets/Textures/Sandia/Original10/Yellow velvet bright color.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 2a4ebea2f6a81e6469af1752e7cce964 -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/Seoul/Fur cushion color.png.meta b/Assets/Textures/Sandia/Seoul/Fur cushion color.png.meta index ea0574c..08114af 100644 --- a/Assets/Textures/Sandia/Seoul/Fur cushion color.png.meta +++ b/Assets/Textures/Sandia/Seoul/Fur cushion color.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: bd86831a1e6448543b9369f1fd06a364 +guid: b883147826f83f444ab6bf02bd8c88e7 TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 + wrapU: 0 + wrapV: 0 wrapW: 0 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 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: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -112,7 +112,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: internalID: 0 vertices: [] indices: 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 fe4ab39..f8daa2f 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,12 +1,12 @@ fileFormatVersion: 2 -guid: afaa54413e58bf64ebd3b8256436f83d +guid: 2ddaaa2da903ba34cabadf3ead26834c TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 + wrapU: 0 + wrapV: 0 wrapW: 0 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 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: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -112,7 +112,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: internalID: 0 vertices: [] indices: 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 c44e313..5d5e2b7 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: 4785122502f730049823c5dd0cea52b0 +guid: c285a30d91ebf3441a1759b2173e94a9 TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 + wrapU: 0 + wrapV: 0 wrapW: 0 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 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: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -112,7 +112,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: 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 4cbe225..258d9d3 100644 --- a/Assets/Textures/Sandia/Seoul/Red cushion color.png.meta +++ b/Assets/Textures/Sandia/Seoul/Red cushion color.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 4fdb4dc07460a9c4898bc8fee4020e73 +guid: eae3adf566fc31b4a9d568c61d7b9859 TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 + wrapU: 0 + wrapV: 0 wrapW: 0 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 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: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -112,7 +112,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: internalID: 0 vertices: [] indices: diff --git a/Assets/Textures/Sandia/Seoul/Seoul Linen color alt.png b/Assets/Textures/Sandia/Seoul/Seoul Linen color alt.png new file mode 100644 index 0000000..062d39c --- /dev/null +++ b/Assets/Textures/Sandia/Seoul/Seoul Linen color alt.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4287fc6a2256f9559057244c257a0da0a5e632c367a1fd7a3c8df7ac7ba958cb +size 23030383 diff --git a/Assets/Textures/Cleo/Capitolino tan color.png.meta b/Assets/Textures/Sandia/Seoul/Seoul Linen color alt.png.meta similarity index 98% rename from Assets/Textures/Cleo/Capitolino tan color.png.meta rename to Assets/Textures/Sandia/Seoul/Seoul Linen color alt.png.meta index 6b22c16..94db2c2 100644 --- a/Assets/Textures/Cleo/Capitolino tan color.png.meta +++ b/Assets/Textures/Sandia/Seoul/Seoul Linen color alt.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 95cfea40be0ee1942a937f13de58e577 +guid: 0457397da535393418e69da6e0fcdb62 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 c94f45f..780aab3 100644 --- a/Assets/Textures/Sandia/Seoul/Seoul Linen color.png.meta +++ b/Assets/Textures/Sandia/Seoul/Seoul Linen color.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 8351bade3936c864aadca736eedc10f1 +guid: d23687fbd9620f346b37ababef2657be TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 + wrapU: 0 + wrapV: 0 wrapW: 0 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 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: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -112,7 +112,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: internalID: 0 vertices: [] indices: diff --git a/Assets/Textures/Sandia/Seoul/Striped cushion color.png.meta b/Assets/Textures/Sandia/Seoul/Striped cushion color.png.meta index 21d6cd4..e675117 100644 --- a/Assets/Textures/Sandia/Seoul/Striped cushion color.png.meta +++ b/Assets/Textures/Sandia/Seoul/Striped cushion color.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 8440f429174eb594482ea567c5a68ebc +guid: bd688355637821d43b88eda93e7815b5 TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 13 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -37,13 +37,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 + wrapU: 0 + wrapV: 0 wrapW: 0 - nPOTScale: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 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: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -112,7 +112,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: internalID: 0 vertices: [] indices: diff --git a/Assets/Textures/Sandia/Seoul10.meta b/Assets/Textures/Sandia/Seoul10.meta deleted file mode 100644 index 4766ea6..0000000 --- a/Assets/Textures/Sandia/Seoul10.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 82508eeceb057c940a656dd8ae07fe1d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Textures/Sandia/Seoul10/Fur cushion color.png b/Assets/Textures/Sandia/Seoul10/Fur cushion color.png deleted file mode 100644 index ef2009e..0000000 --- a/Assets/Textures/Sandia/Seoul10/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/Seoul10/Fur cushion color.png.meta b/Assets/Textures/Sandia/Seoul10/Fur cushion color.png.meta deleted file mode 100644 index d4f89f1..0000000 --- a/Assets/Textures/Sandia/Seoul10/Fur cushion color.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 73228977e6907fc4583e27f889fce61b -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/Seoul10/Logo cushion border color alt.png b/Assets/Textures/Sandia/Seoul10/Logo cushion border color alt.png deleted file mode 100644 index 63b3326..0000000 --- a/Assets/Textures/Sandia/Seoul10/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/Seoul10/Logo cushion border color alt.png.meta b/Assets/Textures/Sandia/Seoul10/Logo cushion border color alt.png.meta deleted file mode 100644 index f49cebf..0000000 --- a/Assets/Textures/Sandia/Seoul10/Logo cushion border color alt.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 895b60155bc08d14f9f8ecc803b57dc9 -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/Seoul10/Logo cushion color alt.png b/Assets/Textures/Sandia/Seoul10/Logo cushion color alt.png deleted file mode 100644 index e05020e..0000000 --- a/Assets/Textures/Sandia/Seoul10/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/Seoul10/Logo cushion color alt.png.meta b/Assets/Textures/Sandia/Seoul10/Logo cushion color alt.png.meta deleted file mode 100644 index 0bb258f..0000000 --- a/Assets/Textures/Sandia/Seoul10/Logo cushion color alt.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 62d73a3cdc4062445a72a552888ff790 -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/Seoul10/Red cushion color.png b/Assets/Textures/Sandia/Seoul10/Red cushion color.png deleted file mode 100644 index 93992fc..0000000 --- a/Assets/Textures/Sandia/Seoul10/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/Seoul10/Red cushion color.png.meta b/Assets/Textures/Sandia/Seoul10/Red cushion color.png.meta deleted file mode 100644 index 6edc670..0000000 --- a/Assets/Textures/Sandia/Seoul10/Red cushion color.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 5ca06450fdb12b8439c3724bf8b2f6fe -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/Seoul10/Seoul Linen color.png b/Assets/Textures/Sandia/Seoul10/Seoul Linen color.png deleted file mode 100644 index 13bd78a..0000000 --- a/Assets/Textures/Sandia/Seoul10/Seoul Linen color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a6cd3327fdca5a46886e94040b9242d8ace40fa9fc27b5941192fed9cd3bb25a -size 25893814 diff --git a/Assets/Textures/Sandia/Seoul10/Seoul Linen color.png.meta b/Assets/Textures/Sandia/Seoul10/Seoul Linen color.png.meta deleted file mode 100644 index ae8d5dc..0000000 --- a/Assets/Textures/Sandia/Seoul10/Seoul Linen color.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 142e815be2928d0459ffca3c0cbb0e0b -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/Seoul10/Striped cushion color.png b/Assets/Textures/Sandia/Seoul10/Striped cushion color.png deleted file mode 100644 index 3845525..0000000 --- a/Assets/Textures/Sandia/Seoul10/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/Seoul10/Striped cushion color.png.meta b/Assets/Textures/Sandia/Seoul10/Striped cushion color.png.meta deleted file mode 100644 index 78bd2e7..0000000 --- a/Assets/Textures/Sandia/Seoul10/Striped cushion color.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 59e34bd3295eaf7458d98b7e7a1bc628 -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/Sumo/102Shadow/Glass Color Shadow alt.png b/Assets/Textures/Sumo/102Shadow/Glass Color Shadow alt.png new file mode 100644 index 0000000..dbe754e --- /dev/null +++ b/Assets/Textures/Sumo/102Shadow/Glass Color Shadow alt.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ebbad8f8709b0a0f5597e481b7e447679ef02513c46c0bccb40b62db3f623650 +size 22727501 diff --git a/Assets/Textures/Sandia/Original10/Logo cushion border color.png.meta b/Assets/Textures/Sumo/102Shadow/Glass Color Shadow alt.png.meta similarity index 98% rename from Assets/Textures/Sandia/Original10/Logo cushion border color.png.meta rename to Assets/Textures/Sumo/102Shadow/Glass Color Shadow alt.png.meta index 4b75d3b..07e7c84 100644 --- a/Assets/Textures/Sandia/Original10/Logo cushion border color.png.meta +++ b/Assets/Textures/Sumo/102Shadow/Glass Color Shadow alt.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5a7f162de90bcd34a81ce786cc4cac82 +guid: f21022bffde8c1d4885d592886c70050 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sumo/102Shadow/Glass Color Shadow.png b/Assets/Textures/Sumo/102Shadow/Glass Color Shadow.png deleted file mode 100644 index cd1a71f..0000000 --- a/Assets/Textures/Sumo/102Shadow/Glass Color Shadow.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d5863101de372892254b2fcaf81b6707d0c563a976da13991b2d4f06421a729 -size 22964825 diff --git a/Assets/Textures/Sumo/102Shadow/Glass Color Shadow.png.meta b/Assets/Textures/Sumo/102Shadow/Glass Color Shadow.png.meta deleted file mode 100644 index e29bada..0000000 --- a/Assets/Textures/Sumo/102Shadow/Glass Color Shadow.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: a2d2395b736ff9040a5b8e508748f3a6 -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/Sumo/102Shadow/Glass UV.png.meta b/Assets/Textures/Sumo/102Shadow/Glass UV.png.meta index ec0bf4a..ba6cf3a 100644 --- a/Assets/Textures/Sumo/102Shadow/Glass UV.png.meta +++ b/Assets/Textures/Sumo/102Shadow/Glass UV.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ec555b6ae2c303c4793a42690c7ae620 +guid: 7a100421eba7f964994124f10847e050 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sumo/102Shadow/Metal Color.png.meta b/Assets/Textures/Sumo/102Shadow/Metal Color.png.meta index e960f40..2350d82 100644 --- a/Assets/Textures/Sumo/102Shadow/Metal Color.png.meta +++ b/Assets/Textures/Sumo/102Shadow/Metal Color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 514be8f8b49767c4fa35e3b835724e6f +guid: 179b5728fb01ea44fb3ac90b37f405a8 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sumo/102Shadow/Metal Horizontal Color.png.meta b/Assets/Textures/Sumo/102Shadow/Metal Horizontal Color.png.meta index d4b5ea2..95d91c6 100644 --- a/Assets/Textures/Sumo/102Shadow/Metal Horizontal Color.png.meta +++ b/Assets/Textures/Sumo/102Shadow/Metal Horizontal Color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ee54d5014f847144298a62f9286ca76e +guid: 40b41c189b961154ca476d17832a89e2 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sumo/102Shadow/Metal Horizontal Dark Color.png.meta b/Assets/Textures/Sumo/102Shadow/Metal Horizontal Dark Color.png.meta index a093189..1853121 100644 --- a/Assets/Textures/Sumo/102Shadow/Metal Horizontal Dark Color.png.meta +++ b/Assets/Textures/Sumo/102Shadow/Metal Horizontal Dark Color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 84a0b3ceba66bb44da18e3e061f52c00 +guid: 558a225694f6fa14eaf35b12474bb126 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sumo/102Shadow/Metal Horizontal Dark Roughness.png.meta b/Assets/Textures/Sumo/102Shadow/Metal Horizontal Dark Roughness.png.meta index b4384fd..410fab0 100644 --- a/Assets/Textures/Sumo/102Shadow/Metal Horizontal Dark Roughness.png.meta +++ b/Assets/Textures/Sumo/102Shadow/Metal Horizontal Dark Roughness.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ed1fc7b0fe3d0364d92ddb7d806f5721 +guid: 7b4e1a2e1987e9b4fae4d66d3b7f63a9 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sumo/102Shadow/Metal Horizontal Roughness.png.meta b/Assets/Textures/Sumo/102Shadow/Metal Horizontal Roughness.png.meta index dd9bc69..fc5b571 100644 --- a/Assets/Textures/Sumo/102Shadow/Metal Horizontal Roughness.png.meta +++ b/Assets/Textures/Sumo/102Shadow/Metal Horizontal Roughness.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 37b677cae9883f240986cb01cb795d20 +guid: a223e5dc853f51447994f878506d85dc TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Sumo/102Shadow/Metal Roughness.png.meta b/Assets/Textures/Sumo/102Shadow/Metal Roughness.png.meta index 93cf278..07ac42b 100644 --- a/Assets/Textures/Sumo/102Shadow/Metal Roughness.png.meta +++ b/Assets/Textures/Sumo/102Shadow/Metal Roughness.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1b4bde8b467dd0e4ca93661e66c4781f +guid: 2fda535f520b823459b29e5a2b64218d TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Totu/103/103 Metal Color.png.meta b/Assets/Textures/Totu/103/103 Metal Color.png.meta index f074669..7e624d7 100644 --- a/Assets/Textures/Totu/103/103 Metal Color.png.meta +++ b/Assets/Textures/Totu/103/103 Metal Color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 457a996a64e512441a57a10cfffe69ec +guid: 453535a9179abe64aba4c36fa2341090 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Totu/103/103 Metal Horizontal Color.png.meta b/Assets/Textures/Totu/103/103 Metal Horizontal Color.png.meta index 8509180..784f3df 100644 --- a/Assets/Textures/Totu/103/103 Metal Horizontal Color.png.meta +++ b/Assets/Textures/Totu/103/103 Metal Horizontal Color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cef87e04cb4a46348855b7284e6e9241 +guid: 6faad1f9527f47449a33b9335aff3b56 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Totu/103/103 Metal Horizontal Dark Color.png.meta b/Assets/Textures/Totu/103/103 Metal Horizontal Dark Color.png.meta index 60258a0..3184905 100644 --- a/Assets/Textures/Totu/103/103 Metal Horizontal Dark Color.png.meta +++ b/Assets/Textures/Totu/103/103 Metal Horizontal Dark Color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e88dcc86b515fb34f9734acacaac24d0 +guid: b678b2ad654c5754597dc744f9495159 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Totu/103/103 Metal Horizontal Dark Roughness.png.meta b/Assets/Textures/Totu/103/103 Metal Horizontal Dark Roughness.png.meta index 3471256..f25b59f 100644 --- a/Assets/Textures/Totu/103/103 Metal Horizontal Dark Roughness.png.meta +++ b/Assets/Textures/Totu/103/103 Metal Horizontal Dark Roughness.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 849328c94cfcc4447b9e0a8d2b89a237 +guid: 7563ad5b67a3c294786eb387f064d7fd TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Totu/103/103 Metal Horizontal Roughness.png.meta b/Assets/Textures/Totu/103/103 Metal Horizontal Roughness.png.meta index 00311e0..04697ba 100644 --- a/Assets/Textures/Totu/103/103 Metal Horizontal Roughness.png.meta +++ b/Assets/Textures/Totu/103/103 Metal Horizontal Roughness.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7ae05aef1ecd2a54fb9796311e8582af +guid: 346e3485dea11d0419f5007217abee7f TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Totu/103/103 Metal Roughness.png.meta b/Assets/Textures/Totu/103/103 Metal Roughness.png.meta index 1783f67..42f1ed5 100644 --- a/Assets/Textures/Totu/103/103 Metal Roughness.png.meta +++ b/Assets/Textures/Totu/103/103 Metal Roughness.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bb7c8d325bdc3ef48b7eda046624db59 +guid: 5c63c727698b31f4d814ea76919bbfea TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Totu/103/CARNICO GREY GLOSSY Texture.png.meta b/Assets/Textures/Totu/103/CARNICO GREY GLOSSY Texture.png.meta index 4fbd49c..d459249 100644 --- a/Assets/Textures/Totu/103/CARNICO GREY GLOSSY Texture.png.meta +++ b/Assets/Textures/Totu/103/CARNICO GREY GLOSSY Texture.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: fc4de649de163dc49b38833dd33dadd3 +guid: 169c93011d6e8df46923c8d1fc9f99bd 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/Totu/104/MARMO PATAGONIA CLEARER Texture clearer.png.meta b/Assets/Textures/Totu/104/MARMO PATAGONIA CLEARER Texture clearer.png.meta index bb8f5f1..0ad3b85 100644 --- a/Assets/Textures/Totu/104/MARMO PATAGONIA CLEARER Texture clearer.png.meta +++ b/Assets/Textures/Totu/104/MARMO PATAGONIA CLEARER Texture clearer.png.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: ccea2b44db9d8f849a3d0a0f34859fa7 +guid: 4f9308b390761ca4daa07f4df96cced4 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/Totu/104/Metal Color.png.meta b/Assets/Textures/Totu/104/Metal Color.png.meta index 991d642..0b1a087 100644 --- a/Assets/Textures/Totu/104/Metal Color.png.meta +++ b/Assets/Textures/Totu/104/Metal Color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f2f98bb3ba012fe41aa973c0d0bf66be +guid: cf7ba267ba2e4f04e9d474777cf4b490 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Totu/104/Metal Horizontal Color.png.meta b/Assets/Textures/Totu/104/Metal Horizontal Color.png.meta index 4395152..d03d90f 100644 --- a/Assets/Textures/Totu/104/Metal Horizontal Color.png.meta +++ b/Assets/Textures/Totu/104/Metal Horizontal Color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9bc836979ec58044ab9883456f595a3e +guid: 5c7f7c92f97daf64daa6a57bcd7a26b1 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Totu/104/Metal Horizontal Dark Color.png.meta b/Assets/Textures/Totu/104/Metal Horizontal Dark Color.png.meta index e07c730..178a1f2 100644 --- a/Assets/Textures/Totu/104/Metal Horizontal Dark Color.png.meta +++ b/Assets/Textures/Totu/104/Metal Horizontal Dark Color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7bf573df0270405418a469a2c4036d4d +guid: 3e9625a7bbb6f1b4a9a6d86930437e7c TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Totu/104/Metal Horizontal Dark Roughness.png.meta b/Assets/Textures/Totu/104/Metal Horizontal Dark Roughness.png.meta index a7d79f9..57699d8 100644 --- a/Assets/Textures/Totu/104/Metal Horizontal Dark Roughness.png.meta +++ b/Assets/Textures/Totu/104/Metal Horizontal Dark Roughness.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d2246c72971ced0459cb694c1c7ca93a +guid: 849e12c8ae59c4c47b2577ad84554f05 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Totu/104/Metal Horizontal Roughness.png.meta b/Assets/Textures/Totu/104/Metal Horizontal Roughness.png.meta index 98670b0..d7e0ea2 100644 --- a/Assets/Textures/Totu/104/Metal Horizontal Roughness.png.meta +++ b/Assets/Textures/Totu/104/Metal Horizontal Roughness.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ab1de751247c01b4b810833872883104 +guid: f9ddd079cac0f9247b9a89dd035c2ed4 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Textures/Totu/104/Metal Roughness.png.meta b/Assets/Textures/Totu/104/Metal Roughness.png.meta index a67c43c..d8e6d7f 100644 --- a/Assets/Textures/Totu/104/Metal Roughness.png.meta +++ b/Assets/Textures/Totu/104/Metal Roughness.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1ebbbbde29f7b404bb0bbc62f025936e +guid: 510f51a591fc6fe46ba3f7fc46ccea7d TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 0581e8b..ca5751b 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -12,8 +12,8 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: AgileWebs - productName: ARFurniture + companyName: ImaageQ + productName: ImaageQ defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -408,66 +408,6 @@ PlayerSettings: m_SubKind: App Store - m_BuildTarget: Android m_Icons: - - m_Textures: [] - m_Width: 192 - m_Height: 192 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 144 - m_Height: 144 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 96 - m_Height: 96 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 72 - m_Height: 72 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 48 - m_Height: 48 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 36 - m_Height: 36 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 192 - m_Height: 192 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 144 - m_Height: 144 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 96 - m_Height: 96 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 72 - m_Height: 72 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 48 - m_Height: 48 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 36 - m_Height: 36 - m_Kind: 0 - m_SubKind: - m_Textures: [] m_Width: 432 m_Height: 432 @@ -498,6 +438,66 @@ PlayerSettings: m_Height: 81 m_Kind: 2 m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 0 + m_SubKind: m_BuildTargetBatching: - m_BuildTarget: Standalone m_StaticBatching: 1