diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..07c7228 Binary files /dev/null and b/.DS_Store differ diff --git a/Assets/.DS_Store b/Assets/.DS_Store new file mode 100644 index 0000000..197f1c2 Binary files /dev/null and b/Assets/.DS_Store differ diff --git a/Assets/10_URPEquirectangularCamera/.DS_Store b/Assets/10_URPEquirectangularCamera/.DS_Store new file mode 100644 index 0000000..2d065d9 Binary files /dev/null and b/Assets/10_URPEquirectangularCamera/.DS_Store differ diff --git a/Assets/1_House/.DS_Store b/Assets/1_House/.DS_Store new file mode 100644 index 0000000..331d897 Binary files /dev/null and b/Assets/1_House/.DS_Store differ diff --git a/Assets/1_House/Materials/Aluminio.mat b/Assets/1_House/Materials/Aluminio.mat index 42d5b70..88dd723 100644 --- a/Assets/1_House/Materials/Aluminio.mat +++ b/Assets/1_House/Materials/Aluminio.mat @@ -206,7 +206,7 @@ Material: - _IridescenceThickness: 1 - _LinkDetailsWithBase: 1 - _MaterialID: 1 - - _Metallic: 0 + - _Metallic: 1 - _MetallicRemapMax: 1 - _MetallicRemapMin: 0 - _Mode: 0 diff --git a/Assets/1_House/Materials/Black_Material.001.mat b/Assets/1_House/Materials/Black_Material.001.mat index e628ca1..8780453 100644 --- a/Assets/1_House/Materials/Black_Material.001.mat +++ b/Assets/1_House/Materials/Black_Material.001.mat @@ -254,9 +254,9 @@ Material: - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/1_House/Materials/Box_Material.mat b/Assets/1_House/Materials/Box_Material.mat index 3c06d64..6e4a5a6 100644 --- a/Assets/1_House/Materials/Box_Material.mat +++ b/Assets/1_House/Materials/Box_Material.mat @@ -13,6 +13,7 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP - _NORMALMAP_TANGENT_SPACE m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -35,7 +36,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 9b84129dfa64e4c8d846fc2af85557d3, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +72,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 9b84129dfa64e4c8d846fc2af85557d3, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -79,7 +80,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: bcc1e6cf0d8854f278e87b1f5197f047, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMapOS: @@ -211,7 +212,7 @@ Material: - _ReceivesSSR: 1 - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _Smoothness: 0.060849965 + - _Smoothness: 0 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessTextureChannel: 0 diff --git a/Assets/1_House/Materials/Button_Material.mat b/Assets/1_House/Materials/Button_Material.mat index 87ad134..c7ed527 100644 --- a/Assets/1_House/Materials/Button_Material.mat +++ b/Assets/1_House/Materials/Button_Material.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 0cc019693b2b74381901228dc27d1601, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 0cc019693b2b74381901228dc27d1601, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/Caisse_Bananes.mat b/Assets/1_House/Materials/Caisse_Bananes.mat index 8fb685e..6f940d8 100644 --- a/Assets/1_House/Materials/Caisse_Bananes.mat +++ b/Assets/1_House/Materials/Caisse_Bananes.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: ba868b1077deb4cd2904a84233c43433, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: ba868b1077deb4cd2904a84233c43433, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/Cardboard_Box_Mat.mat b/Assets/1_House/Materials/Cardboard_Box_Mat.mat index c6ec83c..768d053 100644 --- a/Assets/1_House/Materials/Cardboard_Box_Mat.mat +++ b/Assets/1_House/Materials/Cardboard_Box_Mat.mat @@ -13,6 +13,7 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP - _NORMALMAP_TANGENT_SPACE m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -35,7 +36,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: f92ac2073ee0145208c3f7a241583e8d, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +72,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: f92ac2073ee0145208c3f7a241583e8d, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -79,7 +80,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: caa1d1fa4f78843099d945abfe1d532e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMapOS: @@ -211,7 +212,7 @@ Material: - _ReceivesSSR: 1 - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _Smoothness: 0.59999996 + - _Smoothness: 0 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessTextureChannel: 0 diff --git a/Assets/1_House/Materials/Chair.mat b/Assets/1_House/Materials/Chair.mat index 7afe69c..f746b33 100644 --- a/Assets/1_House/Materials/Chair.mat +++ b/Assets/1_House/Materials/Chair.mat @@ -29,6 +29,7 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP - _NORMALMAP_TANGENT_SPACE m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -51,7 +52,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 339d3f8bb84f14c47a073c7006f2123e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +88,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 339d3f8bb84f14c47a073c7006f2123e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -95,7 +96,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: dead77e74c1f7415c8288028b9a235bd, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMapOS: @@ -227,7 +228,7 @@ Material: - _ReceivesSSR: 1 - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _Smoothness: 0.5 + - _Smoothness: 0.104 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessTextureChannel: 0 diff --git a/Assets/1_House/Materials/Chipboard.mat b/Assets/1_House/Materials/Chipboard.mat index 2dd59bb..67a388a 100644 --- a/Assets/1_House/Materials/Chipboard.mat +++ b/Assets/1_House/Materials/Chipboard.mat @@ -29,6 +29,7 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP - _NORMALMAP_TANGENT_SPACE m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -51,7 +52,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 16e818d915fae492d8416a93e8056663, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +88,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 16e818d915fae492d8416a93e8056663, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -95,7 +96,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 0f067fbefdc2d49cebf4b10e9a2f2a67, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMapOS: @@ -227,7 +228,7 @@ Material: - _ReceivesSSR: 1 - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _Smoothness: 0.5 + - _Smoothness: 0.226 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessTextureChannel: 0 diff --git a/Assets/1_House/Materials/Composite_Rubber.mat b/Assets/1_House/Materials/Composite_Rubber.mat index 9c48f0d..900771b 100644 --- a/Assets/1_House/Materials/Composite_Rubber.mat +++ b/Assets/1_House/Materials/Composite_Rubber.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: de3b186cadff94f11bf6e822ec88a392, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: de3b186cadff94f11bf6e822ec88a392, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/DefaultMaterial.mat b/Assets/1_House/Materials/DefaultMaterial.mat index 0ed76ea..7ec8882 100644 --- a/Assets/1_House/Materials/DefaultMaterial.mat +++ b/Assets/1_House/Materials/DefaultMaterial.mat @@ -13,6 +13,7 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP - _NORMALMAP_TANGENT_SPACE m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -35,7 +36,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: e21f57a00fc3f4671a5a6b795f8945fd, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +72,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: e21f57a00fc3f4671a5a6b795f8945fd, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -79,7 +80,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 1ce88710b827b482893e65b213bc7490, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMapOS: diff --git a/Assets/1_House/Materials/FabricPlainNatural011_4K.mat b/Assets/1_House/Materials/FabricPlainNatural011_4K.mat index 7026612..95613ad 100644 --- a/Assets/1_House/Materials/FabricPlainNatural011_4K.mat +++ b/Assets/1_House/Materials/FabricPlainNatural011_4K.mat @@ -29,6 +29,7 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP - _NORMALMAP_TANGENT_SPACE m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -51,7 +52,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 40e3a113935e142b9b3ea2dd81ba1305, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +88,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 40e3a113935e142b9b3ea2dd81ba1305, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -95,7 +96,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: ef2b1e0aae96442f0bedf61796b2e477, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMapOS: diff --git a/Assets/1_House/Materials/Glass.mat b/Assets/1_House/Materials/Glass.mat index a706c61..55cddcf 100644 --- a/Assets/1_House/Materials/Glass.mat +++ b/Assets/1_House/Materials/Glass.mat @@ -29,19 +29,22 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT + - _ENABLE_FOG_ON_TRANSPARENT - _NORMALMAP_TANGENT_SPACE + - _REFRACTION_PLANE + - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2225 - stringTagMap: {} + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent disabledShaderPasses: - - TransparentDepthPrepass + - MOTIONVECTORS - TransparentDepthPostpass - TransparentBackface - RayTracingPrepass - - MOTIONVECTORS m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -154,7 +157,7 @@ Material: - _AlphaCutoffPostpass: 0.5 - _AlphaCutoffPrepass: 0.5 - _AlphaCutoffShadow: 0.5 - - _AlphaDstBlend: 0 + - _AlphaDstBlend: 10 - _AlphaRemapMax: 1 - _AlphaRemapMin: 0 - _AlphaSrcBlend: 1 @@ -178,8 +181,8 @@ Material: - _DoubleSidedEnable: 0 - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 - - _DstBlend: 0 - - _DstBlend2: 0 + - _DstBlend: 10 + - _DstBlend2: 10 - _EmissiveColorMode: 1 - _EmissiveExposureWeight: 1 - _EmissiveIntensity: 1 @@ -226,8 +229,8 @@ Material: - _RayTracing: 0 - _ReceivesSSR: 1 - _ReceivesSSRTransparent: 0 - - _RefractionModel: 0 - - _Smoothness: 0.59999996 + - _RefractionModel: 1 + - _Smoothness: 0.95 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessTextureChannel: 0 @@ -237,16 +240,16 @@ Material: - _SpecularOcclusionMode: 1 - _SrcBlend: 1 - _StencilRef: 0 - - _StencilRefDepth: 8 - - _StencilRefGBuffer: 10 - - _StencilRefMV: 40 + - _StencilRefDepth: 16 + - _StencilRefGBuffer: 2 + - _StencilRefMV: 32 - _StencilWriteMask: 6 - - _StencilWriteMaskDepth: 9 + - _StencilWriteMaskDepth: 25 - _StencilWriteMaskGBuffer: 15 - _StencilWriteMaskMV: 41 - _SubsurfaceMask: 1 - _SupportDecals: 1 - - _SurfaceType: 0 + - _SurfaceType: 1 - _TexWorldScale: 1 - _TexWorldScaleEmissive: 1 - _Thickness: 1 @@ -265,14 +268,14 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 - - _ZTestDepthEqualForOpaque: 3 + - _ZTestDepthEqualForOpaque: 4 - _ZTestGBuffer: 4 - _ZTestTransparent: 4 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0.61222273, g: 0.61967814, b: 0.95468706, a: 1} + - _BaseColor: {r: 0, g: 0, b: 0, a: 0} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0.61222273, g: 0.61967814, b: 0.95468706, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 0} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/1_House/Materials/Henry_Face_Material.mat b/Assets/1_House/Materials/Henry_Face_Material.mat index a27a4ac..68d53f1 100644 --- a/Assets/1_House/Materials/Henry_Face_Material.mat +++ b/Assets/1_House/Materials/Henry_Face_Material.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: c63fff68edefd4573a15b6536fdc31ed, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: c63fff68edefd4573a15b6536fdc31ed, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/IVAR-Wood.mat b/Assets/1_House/Materials/IVAR-Wood.mat index 7e3f100..65d15d6 100644 --- a/Assets/1_House/Materials/IVAR-Wood.mat +++ b/Assets/1_House/Materials/IVAR-Wood.mat @@ -13,6 +13,7 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP - _NORMALMAP_TANGENT_SPACE m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -35,7 +36,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 037ca58b55e46427da1b330507f5e629, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +72,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 037ca58b55e46427da1b330507f5e629, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -79,7 +80,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: d6dd47b3760224193b49195333fe5754, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMapOS: diff --git a/Assets/1_House/Materials/M_CulteryOuterBody.mat b/Assets/1_House/Materials/M_CulteryOuterBody.mat index d22689f..2ce5169 100644 --- a/Assets/1_House/Materials/M_CulteryOuterBody.mat +++ b/Assets/1_House/Materials/M_CulteryOuterBody.mat @@ -190,7 +190,7 @@ Material: - _IridescenceThickness: 1 - _LinkDetailsWithBase: 1 - _MaterialID: 1 - - _Metallic: 0 + - _Metallic: 0.893 - _MetallicRemapMax: 1 - _MetallicRemapMin: 0 - _Mode: 0 diff --git a/Assets/1_House/Materials/M_Mug.001.mat b/Assets/1_House/Materials/M_Mug.001.mat index 03248dc..a6ce11c 100644 --- a/Assets/1_House/Materials/M_Mug.001.mat +++ b/Assets/1_House/Materials/M_Mug.001.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 8694c21bce8194d6e858fcedf851788a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 8694c21bce8194d6e858fcedf851788a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/Mat_Fiberglass_Ladder.mat b/Assets/1_House/Materials/Mat_Fiberglass_Ladder.mat index 53e02bc..e9b8089 100644 --- a/Assets/1_House/Materials/Mat_Fiberglass_Ladder.mat +++ b/Assets/1_House/Materials/Mat_Fiberglass_Ladder.mat @@ -29,6 +29,7 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP - _NORMALMAP_TANGENT_SPACE m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -51,7 +52,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 6ebee1ffffc224ee3a37464e904d80f1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +88,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 6ebee1ffffc224ee3a37464e904d80f1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -95,7 +96,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 4f702a7c56f284f67831df9714697a4e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMapOS: @@ -227,7 +228,7 @@ Material: - _ReceivesSSR: 1 - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _Smoothness: 0.4472136 + - _Smoothness: 0.248 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessTextureChannel: 0 diff --git a/Assets/1_House/Materials/Matal solid paint white.mat b/Assets/1_House/Materials/Matal solid paint white.mat index c0fe0ba..694ccfe 100644 --- a/Assets/1_House/Materials/Matal solid paint white.mat +++ b/Assets/1_House/Materials/Matal solid paint white.mat @@ -254,9 +254,9 @@ Material: - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _BaseColor: {r: 0.3773585, g: 0.32929868, b: 0.32929868, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.37735847, g: 0.32929865, b: 0.32929865, a: 1} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/1_House/Materials/Material 1.mat b/Assets/1_House/Materials/Material 1.mat index 0d47d12..e1bdd59 100644 --- a/Assets/1_House/Materials/Material 1.mat +++ b/Assets/1_House/Materials/Material 1.mat @@ -29,6 +29,7 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP - _NORMALMAP_TANGENT_SPACE m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -51,7 +52,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 9f587fb2f542740c68d10f692d8a8d0a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +88,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 9f587fb2f542740c68d10f692d8a8d0a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -95,7 +96,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: ced257fb439754ea98a7518dbf59e90e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMapOS: @@ -227,7 +228,7 @@ Material: - _ReceivesSSR: 1 - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _Smoothness: 0.5 + - _Smoothness: 0 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessTextureChannel: 0 diff --git a/Assets/1_House/Materials/Material.001.mat b/Assets/1_House/Materials/Material.001.mat index 92bf34d..990500b 100644 --- a/Assets/1_House/Materials/Material.001.mat +++ b/Assets/1_House/Materials/Material.001.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: cd8486cf98b5748618a095a1bccbff15, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: cd8486cf98b5748618a095a1bccbff15, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/Material.002.mat b/Assets/1_House/Materials/Material.002.mat index 490ab07..3d401ef 100644 --- a/Assets/1_House/Materials/Material.002.mat +++ b/Assets/1_House/Materials/Material.002.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: cd8486cf98b5748618a095a1bccbff15, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: cd8486cf98b5748618a095a1bccbff15, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/Material.003.mat b/Assets/1_House/Materials/Material.003.mat index 5da54d9..3ffc10d 100644 --- a/Assets/1_House/Materials/Material.003.mat +++ b/Assets/1_House/Materials/Material.003.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 79900105d65854e019f98530c03e333d, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 79900105d65854e019f98530c03e333d, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/Material.004.mat b/Assets/1_House/Materials/Material.004.mat index b105ab7..d6973df 100644 --- a/Assets/1_House/Materials/Material.004.mat +++ b/Assets/1_House/Materials/Material.004.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: cd8486cf98b5748618a095a1bccbff15, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: cd8486cf98b5748618a095a1bccbff15, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/Material.005.mat b/Assets/1_House/Materials/Material.005.mat index dc19052..ea80e91 100644 --- a/Assets/1_House/Materials/Material.005.mat +++ b/Assets/1_House/Materials/Material.005.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: cd8486cf98b5748618a095a1bccbff15, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: cd8486cf98b5748618a095a1bccbff15, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/Material.006.mat b/Assets/1_House/Materials/Material.006.mat index 28705e8..da33137 100644 --- a/Assets/1_House/Materials/Material.006.mat +++ b/Assets/1_House/Materials/Material.006.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: cd8486cf98b5748618a095a1bccbff15, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: cd8486cf98b5748618a095a1bccbff15, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/Material.009.mat b/Assets/1_House/Materials/Material.009.mat index c383766..205239d 100644 --- a/Assets/1_House/Materials/Material.009.mat +++ b/Assets/1_House/Materials/Material.009.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: cd8486cf98b5748618a095a1bccbff15, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: cd8486cf98b5748618a095a1bccbff15, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/Material.011.mat b/Assets/1_House/Materials/Material.011.mat index 1b88181..414182c 100644 --- a/Assets/1_House/Materials/Material.011.mat +++ b/Assets/1_House/Materials/Material.011.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: cd8486cf98b5748618a095a1bccbff15, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: cd8486cf98b5748618a095a1bccbff15, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/Material.014.mat b/Assets/1_House/Materials/Material.014.mat index 51f6c90..d492542 100644 --- a/Assets/1_House/Materials/Material.014.mat +++ b/Assets/1_House/Materials/Material.014.mat @@ -13,6 +13,7 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP - _NORMALMAP_TANGENT_SPACE m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -35,7 +36,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 41cbff186b7bd408d932d8fe3a665384, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +72,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 41cbff186b7bd408d932d8fe3a665384, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -79,7 +80,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 750bba8b3368344fc97b950822b657f3, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMapOS: diff --git a/Assets/1_House/Materials/Material.017.mat b/Assets/1_House/Materials/Material.017.mat index 4b1b49c..ce59156 100644 --- a/Assets/1_House/Materials/Material.017.mat +++ b/Assets/1_House/Materials/Material.017.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: c29d99f67e7fa475fa14ca769fa52728, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: c29d99f67e7fa475fa14ca769fa52728, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/Material.026.mat b/Assets/1_House/Materials/Material.026.mat index 7cf8cea..4f133e6 100644 --- a/Assets/1_House/Materials/Material.026.mat +++ b/Assets/1_House/Materials/Material.026.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 4a68d8a8cfcb24841b2266313236d1e2, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 4a68d8a8cfcb24841b2266313236d1e2, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/Material_0 1.mat b/Assets/1_House/Materials/Material_0 1.mat index 1737468..6d63400 100644 --- a/Assets/1_House/Materials/Material_0 1.mat +++ b/Assets/1_House/Materials/Material_0 1.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 3de47d096d8c24b08ae75ea48ca2eeb9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 3de47d096d8c24b08ae75ea48ca2eeb9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/Material_0.002.mat b/Assets/1_House/Materials/Material_0.002.mat index 91efd4c..7824105 100644 --- a/Assets/1_House/Materials/Material_0.002.mat +++ b/Assets/1_House/Materials/Material_0.002.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 08eb9e013332f45d2b67bc1a5fbeff15, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 08eb9e013332f45d2b67bc1a5fbeff15, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/Material_957.mat b/Assets/1_House/Materials/Material_957.mat index dabfab3..11a38e5 100644 --- a/Assets/1_House/Materials/Material_957.mat +++ b/Assets/1_House/Materials/Material_957.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 195126f5053d44a449ce3be137928be2, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 195126f5053d44a449ce3be137928be2, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/Material__3.mat b/Assets/1_House/Materials/Material__3.mat index a64d309..add1588 100644 --- a/Assets/1_House/Materials/Material__3.mat +++ b/Assets/1_House/Materials/Material__3.mat @@ -13,6 +13,7 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP - _NORMALMAP_TANGENT_SPACE m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -35,7 +36,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 556f17d2cd11440f5bc677e1060b279e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +72,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 556f17d2cd11440f5bc677e1060b279e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -79,7 +80,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 7ece77593066043aca055cb67feebaeb, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMapOS: @@ -211,7 +212,7 @@ Material: - _ReceivesSSR: 1 - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _Smoothness: 0.5 + - _Smoothness: 0 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessTextureChannel: 0 @@ -254,9 +255,9 @@ Material: - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0, g: 0, b: 0, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/1_House/Materials/MetalCladdingFrame002_4K.mat b/Assets/1_House/Materials/MetalCladdingFrame002_4K.mat index f5ef5be..92f1da9 100644 --- a/Assets/1_House/Materials/MetalCladdingFrame002_4K.mat +++ b/Assets/1_House/Materials/MetalCladdingFrame002_4K.mat @@ -29,6 +29,7 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP - _NORMALMAP_TANGENT_SPACE m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -95,7 +96,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 30eaa24c69ea34f7d9fed070f153dbc9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMapOS: @@ -206,7 +207,7 @@ Material: - _IridescenceThickness: 1 - _LinkDetailsWithBase: 1 - _MaterialID: 1 - - _Metallic: 0 + - _Metallic: 0.811 - _MetallicRemapMax: 1 - _MetallicRemapMin: 0 - _Mode: 0 @@ -270,9 +271,9 @@ Material: - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/1_House/Materials/MetalSteelBrushed001_4K.mat b/Assets/1_House/Materials/MetalSteelBrushed001_4K.mat index 56a1ac1..5a944ff 100644 --- a/Assets/1_House/Materials/MetalSteelBrushed001_4K.mat +++ b/Assets/1_House/Materials/MetalSteelBrushed001_4K.mat @@ -190,7 +190,7 @@ Material: - _IridescenceThickness: 1 - _LinkDetailsWithBase: 1 - _MaterialID: 1 - - _Metallic: 0 + - _Metallic: 0.955 - _MetallicRemapMax: 1 - _MetallicRemapMin: 0 - _Mode: 0 @@ -254,9 +254,9 @@ Material: - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _BaseColor: {r: 0.764151, g: 0.764151, b: 0.764151, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.764151, g: 0.764151, b: 0.764151, a: 1} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/1_House/Materials/NGM.005.mat b/Assets/1_House/Materials/NGM.005.mat index 8fc99f0..65e8055 100644 --- a/Assets/1_House/Materials/NGM.005.mat +++ b/Assets/1_House/Materials/NGM.005.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 55469224a8724491aa6bc705715c4038, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 55469224a8724491aa6bc705715c4038, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/NGM.006.mat b/Assets/1_House/Materials/NGM.006.mat index 836875a..7453ff5 100644 --- a/Assets/1_House/Materials/NGM.006.mat +++ b/Assets/1_House/Materials/NGM.006.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 8367c1711e4734d48a9fe6539f58a83b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 8367c1711e4734d48a9fe6539f58a83b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/NGM.007.mat b/Assets/1_House/Materials/NGM.007.mat index 98840be..701a2cd 100644 --- a/Assets/1_House/Materials/NGM.007.mat +++ b/Assets/1_House/Materials/NGM.007.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 42e01a8b6162540d0a0fe2edb8545816, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 42e01a8b6162540d0a0fe2edb8545816, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/NGM.008.mat b/Assets/1_House/Materials/NGM.008.mat index 4eb9140..be5d7bf 100644 --- a/Assets/1_House/Materials/NGM.008.mat +++ b/Assets/1_House/Materials/NGM.008.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 175c2eee7ef164f62aa849fead38170e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 175c2eee7ef164f62aa849fead38170e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/NGM.009.mat b/Assets/1_House/Materials/NGM.009.mat index cbab19e..ed4141d 100644 --- a/Assets/1_House/Materials/NGM.009.mat +++ b/Assets/1_House/Materials/NGM.009.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 5b41e6513427340fbb734c1adcf76594, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 5b41e6513427340fbb734c1adcf76594, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/NGM.010.mat b/Assets/1_House/Materials/NGM.010.mat index 9f1b5c3..a3800a0 100644 --- a/Assets/1_House/Materials/NGM.010.mat +++ b/Assets/1_House/Materials/NGM.010.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 2d2c7d45b3dce4d858c27b21c08ef3ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 2d2c7d45b3dce4d858c27b21c08ef3ad, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/cardboard_box_01.mat b/Assets/1_House/Materials/cardboard_box_01.mat index 2091b77..8eaf8cb 100644 --- a/Assets/1_House/Materials/cardboard_box_01.mat +++ b/Assets/1_House/Materials/cardboard_box_01.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: a80b754afb5284dc2859ff0d8cd5121c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: a80b754afb5284dc2859ff0d8cd5121c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/chair.001.mat b/Assets/1_House/Materials/chair.001.mat index bf78925..d98875b 100644 --- a/Assets/1_House/Materials/chair.001.mat +++ b/Assets/1_House/Materials/chair.001.mat @@ -29,6 +29,7 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP - _NORMALMAP_TANGENT_SPACE m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -51,7 +52,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: c912f58a887ef46adb8c2434bf4a13ca, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +88,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: c912f58a887ef46adb8c2434bf4a13ca, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -95,7 +96,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: ee920c0cb25634062a53bd035878eebd, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMapOS: diff --git a/Assets/1_House/Materials/compost_bags.mat b/Assets/1_House/Materials/compost_bags.mat index ddbc292..d201742 100644 --- a/Assets/1_House/Materials/compost_bags.mat +++ b/Assets/1_House/Materials/compost_bags.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: cf5d1448439e7457596f8479b91aaa7e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: cf5d1448439e7457596f8479b91aaa7e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -95,7 +95,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 0d1693f89988f4193a95383fa7f0ebe4, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMapOS: @@ -211,7 +211,7 @@ Material: - _MetallicRemapMin: 0 - _Mode: 0 - _NormalMapSpace: 0 - - _NormalScale: 1 + - _NormalScale: 0 - _ObjectSpaceUVMapping: 0 - _ObjectSpaceUVMappingEmissive: 0 - _OcclusionStrength: 1 diff --git a/Assets/1_House/Materials/cup_Baked blue.mat b/Assets/1_House/Materials/cup_Baked blue.mat index 7c11f56..a447d32 100644 --- a/Assets/1_House/Materials/cup_Baked blue.mat +++ b/Assets/1_House/Materials/cup_Baked blue.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: eb31de5d6efe74e9aae9e946dafe98f0, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: eb31de5d6efe74e9aae9e946dafe98f0, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/cup_Baked orange.mat b/Assets/1_House/Materials/cup_Baked orange.mat index dc2fef5..2fe9c8e 100644 --- a/Assets/1_House/Materials/cup_Baked orange.mat +++ b/Assets/1_House/Materials/cup_Baked orange.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: aab6f408c74b34090b92fab910b1efce, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: aab6f408c74b34090b92fab910b1efce, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/cup_Baked pink.mat b/Assets/1_House/Materials/cup_Baked pink.mat index d5551bb..ae094f1 100644 --- a/Assets/1_House/Materials/cup_Baked pink.mat +++ b/Assets/1_House/Materials/cup_Baked pink.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: d3c221c1949dd42c68fce50501b25250, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: d3c221c1949dd42c68fce50501b25250, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/cup_Baked purple.mat b/Assets/1_House/Materials/cup_Baked purple.mat index 3f8d601..82e5821 100644 --- a/Assets/1_House/Materials/cup_Baked purple.mat +++ b/Assets/1_House/Materials/cup_Baked purple.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 1159a9cc2277c4c088d67119ef7ffa37, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 1159a9cc2277c4c088d67119ef7ffa37, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/cup_Baked yellow.mat b/Assets/1_House/Materials/cup_Baked yellow.mat index 3c70377..5f8861c 100644 --- a/Assets/1_House/Materials/cup_Baked yellow.mat +++ b/Assets/1_House/Materials/cup_Baked yellow.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 170c6ac42183c427e8d0b13d459100c9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 170c6ac42183c427e8d0b13d459100c9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/eyelash.mat b/Assets/1_House/Materials/eyelash.mat index 4b855c7..3f60c77 100644 --- a/Assets/1_House/Materials/eyelash.mat +++ b/Assets/1_House/Materials/eyelash.mat @@ -254,9 +254,9 @@ Material: - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/1_House/Materials/feet.mat b/Assets/1_House/Materials/feet.mat index 3583538..a8e3bca 100644 --- a/Assets/1_House/Materials/feet.mat +++ b/Assets/1_House/Materials/feet.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 168d89116b5e745ec8f83e3ba90703c3, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 168d89116b5e745ec8f83e3ba90703c3, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/fg_funkoFluttershy.mat b/Assets/1_House/Materials/fg_funkoFluttershy.mat index 42f75ad..d5f4626 100644 --- a/Assets/1_House/Materials/fg_funkoFluttershy.mat +++ b/Assets/1_House/Materials/fg_funkoFluttershy.mat @@ -29,6 +29,7 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP - _NORMALMAP_TANGENT_SPACE m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -51,7 +52,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 6bd101210343244b0896297983cc38aa, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +88,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 6bd101210343244b0896297983cc38aa, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -95,7 +96,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: a52c680d255a34f318ad579d6a736f17, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMapOS: diff --git a/Assets/1_House/Materials/gamepad.mat b/Assets/1_House/Materials/gamepad.mat index 3dce52e..f859a9e 100644 --- a/Assets/1_House/Materials/gamepad.mat +++ b/Assets/1_House/Materials/gamepad.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: e89a236f8a8e249c8859933bd1f55604, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: e89a236f8a8e249c8859933bd1f55604, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/garden_hose_wall_mounted_01.mat b/Assets/1_House/Materials/garden_hose_wall_mounted_01.mat index 9f33545..f8912a5 100644 --- a/Assets/1_House/Materials/garden_hose_wall_mounted_01.mat +++ b/Assets/1_House/Materials/garden_hose_wall_mounted_01.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 7a14d9cbfadcc4cbaaedd988e069f3c7, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 7a14d9cbfadcc4cbaaedd988e069f3c7, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/hanging_picture_frame_01.mat b/Assets/1_House/Materials/hanging_picture_frame_01.mat index 9142508..4e46959 100644 --- a/Assets/1_House/Materials/hanging_picture_frame_01.mat +++ b/Assets/1_House/Materials/hanging_picture_frame_01.mat @@ -190,7 +190,7 @@ Material: - _IridescenceThickness: 1 - _LinkDetailsWithBase: 1 - _MaterialID: 1 - - _Metallic: 0 + - _Metallic: 0.726 - _MetallicRemapMax: 1 - _MetallicRemapMin: 0 - _Mode: 0 @@ -254,9 +254,9 @@ Material: - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/1_House/Materials/hanging_picture_frame_01_artwork.mat b/Assets/1_House/Materials/hanging_picture_frame_01_artwork.mat index c52e6d7..5698261 100644 --- a/Assets/1_House/Materials/hanging_picture_frame_01_artwork.mat +++ b/Assets/1_House/Materials/hanging_picture_frame_01_artwork.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: fd5a5805a03b742689d506750a1ac606, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: fd5a5805a03b742689d506750a1ac606, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -254,9 +254,9 @@ Material: - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.9063317, g: 0.41864687, b: 0.37242445, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0.9063317, g: 0.41864684, b: 0.37242442, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/1_House/Materials/lambert1.001.mat b/Assets/1_House/Materials/lambert1.001.mat index 0143aff..646be53 100644 --- a/Assets/1_House/Materials/lambert1.001.mat +++ b/Assets/1_House/Materials/lambert1.001.mat @@ -13,6 +13,7 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP - _NORMALMAP_TANGENT_SPACE m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -35,7 +36,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: b913748f750d14dfb8f64241ec44a13c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +72,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: b913748f750d14dfb8f64241ec44a13c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -79,7 +80,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 8aea1eec2d8084754b887419313fbac1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMapOS: diff --git a/Assets/1_House/Materials/lid_Baked blue.mat b/Assets/1_House/Materials/lid_Baked blue.mat index 9ac5c55..4cae479 100644 --- a/Assets/1_House/Materials/lid_Baked blue.mat +++ b/Assets/1_House/Materials/lid_Baked blue.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 36866d935832d412fac912e66abeb58b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 36866d935832d412fac912e66abeb58b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/lid_Baked orange.mat b/Assets/1_House/Materials/lid_Baked orange.mat index 351e69f..e605af6 100644 --- a/Assets/1_House/Materials/lid_Baked orange.mat +++ b/Assets/1_House/Materials/lid_Baked orange.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 37c4791b7fe1d45439bd412df9c45929, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 37c4791b7fe1d45439bd412df9c45929, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/lid_Baked pink.mat b/Assets/1_House/Materials/lid_Baked pink.mat index 6a88d63..3ab1085 100644 --- a/Assets/1_House/Materials/lid_Baked pink.mat +++ b/Assets/1_House/Materials/lid_Baked pink.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 83c61d73c07434a8b92a74387675becf, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 83c61d73c07434a8b92a74387675becf, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/lid_Baked purple.mat b/Assets/1_House/Materials/lid_Baked purple.mat index 4e7e6ee..29cc3b6 100644 --- a/Assets/1_House/Materials/lid_Baked purple.mat +++ b/Assets/1_House/Materials/lid_Baked purple.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: ba89a7e2064fc4d70aca0b4abfb2c817, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: ba89a7e2064fc4d70aca0b4abfb2c817, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/lid_Baked yellow.mat b/Assets/1_House/Materials/lid_Baked yellow.mat index 8525c1b..824d5d5 100644 --- a/Assets/1_House/Materials/lid_Baked yellow.mat +++ b/Assets/1_House/Materials/lid_Baked yellow.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: e3d412aafc15846dd81155777fb08792, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: e3d412aafc15846dd81155777fb08792, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/main.003.mat b/Assets/1_House/Materials/main.003.mat index b44a5a4..a09d9b0 100644 --- a/Assets/1_House/Materials/main.003.mat +++ b/Assets/1_House/Materials/main.003.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 5f59a4f6457c642c5bea46dba66e6f63, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 5f59a4f6457c642c5bea46dba66e6f63, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/material.001 1.mat b/Assets/1_House/Materials/material.001 1.mat index 326e26a..cf60809 100644 --- a/Assets/1_House/Materials/material.001 1.mat +++ b/Assets/1_House/Materials/material.001 1.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 9fd51497cff7b4a989396653bc65e955, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 9fd51497cff7b4a989396653bc65e955, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/material.mat b/Assets/1_House/Materials/material.mat index 4ae7d08..e27ee4d 100644 --- a/Assets/1_House/Materials/material.mat +++ b/Assets/1_House/Materials/material.mat @@ -13,6 +13,7 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP - _NORMALMAP_TANGENT_SPACE m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -35,7 +36,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 19519100fc6044f6b91f8727143eb4e4, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +72,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 19519100fc6044f6b91f8727143eb4e4, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -79,7 +80,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 0c8ab41728f894073a9a84fd8d881f43, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMapOS: @@ -211,7 +212,7 @@ Material: - _ReceivesSSR: 1 - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 - - _Smoothness: 0.5 + - _Smoothness: 0 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessTextureChannel: 0 diff --git a/Assets/1_House/Materials/material0.mat b/Assets/1_House/Materials/material0.mat index d895b16..e4a4e7e 100644 --- a/Assets/1_House/Materials/material0.mat +++ b/Assets/1_House/Materials/material0.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 1a5e505539783449ca9fc8706e81b704, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 1a5e505539783449ca9fc8706e81b704, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/material1.mat b/Assets/1_House/Materials/material1.mat index 355db67..592673f 100644 --- a/Assets/1_House/Materials/material1.mat +++ b/Assets/1_House/Materials/material1.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 5b18bf81961d040d6b8867226a03a54f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 5b18bf81961d040d6b8867226a03a54f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/material2.mat b/Assets/1_House/Materials/material2.mat index 9623352..eccf54d 100644 --- a/Assets/1_House/Materials/material2.mat +++ b/Assets/1_House/Materials/material2.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: a974a93112d114a7180f031e219d321e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: a974a93112d114a7180f031e219d321e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/material3.mat b/Assets/1_House/Materials/material3.mat index 53d15aa..bc89137 100644 --- a/Assets/1_House/Materials/material3.mat +++ b/Assets/1_House/Materials/material3.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: a09254b4244f247f68ded132faa2aed2, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: a09254b4244f247f68ded132faa2aed2, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/material_0.mat b/Assets/1_House/Materials/material_0.mat index 4b62ba6..54d3af2 100644 --- a/Assets/1_House/Materials/material_0.mat +++ b/Assets/1_House/Materials/material_0.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 108a9ca3acfa74da18e76ca2f815947f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 108a9ca3acfa74da18e76ca2f815947f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/material_10.mat b/Assets/1_House/Materials/material_10.mat index d0ae98c..e860a7d 100644 --- a/Assets/1_House/Materials/material_10.mat +++ b/Assets/1_House/Materials/material_10.mat @@ -51,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 14052d688b63248f4b6c246be8cd6f29, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -87,7 +87,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 14052d688b63248f4b6c246be8cd6f29, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/metal 004 silver.mat b/Assets/1_House/Materials/metal 004 silver.mat index fd099e8..ca20158 100644 --- a/Assets/1_House/Materials/metal 004 silver.mat +++ b/Assets/1_House/Materials/metal 004 silver.mat @@ -13,6 +13,7 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP - _NORMALMAP_TANGENT_SPACE m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -35,7 +36,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 3dc7da8e9682f4e0583b8a9925cf7c6b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +72,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 3dc7da8e9682f4e0583b8a9925cf7c6b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -79,7 +80,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 149e50d515ca74b7585d22482b458316, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMapOS: diff --git a/Assets/1_House/Materials/metal 007 bronze.mat b/Assets/1_House/Materials/metal 007 bronze.mat index 57c814f..4f7d34c 100644 --- a/Assets/1_House/Materials/metal 007 bronze.mat +++ b/Assets/1_House/Materials/metal 007 bronze.mat @@ -13,6 +13,7 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP - _NORMALMAP_TANGENT_SPACE m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -35,7 +36,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: fe196222b484a4e549e59e5d3fea70e3, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +72,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: fe196222b484a4e549e59e5d3fea70e3, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: @@ -79,7 +80,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 125a146ca93f445a7a13b28f25418071, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _NormalMapOS: diff --git a/Assets/1_House/Materials/metal.mat b/Assets/1_House/Materials/metal.mat index 25f7b8f..e74de8c 100644 --- a/Assets/1_House/Materials/metal.mat +++ b/Assets/1_House/Materials/metal.mat @@ -206,7 +206,7 @@ Material: - _IridescenceThickness: 1 - _LinkDetailsWithBase: 1 - _MaterialID: 1 - - _Metallic: 0 + - _Metallic: 0.925 - _MetallicRemapMax: 1 - _MetallicRemapMin: 0 - _Mode: 0 @@ -270,9 +270,9 @@ Material: - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _BaseColor: {r: 0.6320754, g: 0.62909395, b: 0.62909395, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} + - _Color: {r: 0.6320754, g: 0.629094, b: 0.629094, a: 1} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/1_House/Materials/model_Material_u1_v1.mat b/Assets/1_House/Materials/model_Material_u1_v1.mat index 23277cf..d41fc31 100644 --- a/Assets/1_House/Materials/model_Material_u1_v1.mat +++ b/Assets/1_House/Materials/model_Material_u1_v1.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 7ba91db44e0714dacb739b483ae654d4, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 7ba91db44e0714dacb739b483ae654d4, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: diff --git a/Assets/1_House/Materials/pages.mat b/Assets/1_House/Materials/pages.mat index 6cd4f75..627b1e9 100644 --- a/Assets/1_House/Materials/pages.mat +++ b/Assets/1_House/Materials/pages.mat @@ -35,7 +35,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseColorMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 2429f819c3a774a2ea23a5c25b7e6a8e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -71,7 +71,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 2429f819c3a774a2ea23a5c25b7e6a8e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskMap: