diff --git a/Assets/Art/头颈面部解剖FBX/Materials/0000000086C0A938.mat b/Assets/Art/头颈面部解剖FBX/Materials/0000000086C0A938.mat index f7e88285..4ef8cd5b 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/0000000086C0A938.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/0000000086C0A938.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 0000000086C0A938 - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -120,7 +120,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.49999997 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/00000000873B2B78.mat b/Assets/Art/头颈面部解剖FBX/Materials/00000000873B2B78.mat index 9488dfe3..c87e6cb3 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/00000000873B2B78.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/00000000873B2B78.mat @@ -8,10 +8,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 00000000873B2B78 - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -87,7 +88,7 @@ Material: - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BlendOp: 0 - - _BumpScale: 1 + - _BumpScale: 2 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 @@ -107,7 +108,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.49999997 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/0000000093266A38.mat b/Assets/Art/头颈面部解剖FBX/Materials/0000000093266A38.mat index 3a3140f9..1289abb7 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/0000000093266A38.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/0000000093266A38.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 0000000093266A38 - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -107,7 +107,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.49999997 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/00000000957A53B8.mat b/Assets/Art/头颈面部解剖FBX/Materials/00000000957A53B8.mat index 607b7252..8d9b1ce9 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/00000000957A53B8.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/00000000957A53B8.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 00000000957A53B8 - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -120,7 +120,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.49999997 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/00000000961242F8.mat b/Assets/Art/头颈面部解剖FBX/Materials/00000000961242F8.mat index 4b63eeb1..58b8036f 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/00000000961242F8.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/00000000961242F8.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 00000000961242F8 - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -107,7 +107,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.49999997 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/20fe2d40.mat b/Assets/Art/头颈面部解剖FBX/Materials/20fe2d40.mat index f68d2d71..131a0784 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/20fe2d40.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/20fe2d40.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 20fe2d40 - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -100,14 +100,14 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.49999997 - _GlossyReflections: 1 - - _Metallic: 0 + - _Metallic: 0.299 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.49999997 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/Eyelashes_alp.mat b/Assets/Art/头颈面部解剖FBX/Materials/Eyelashes_alp.mat index 6eb8afd0..cf6c5ecf 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/Eyelashes_alp.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/Eyelashes_alp.mat @@ -8,10 +8,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Eyelashes_alp - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -110,10 +111,10 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.5 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 5 + - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/Male_Bushy_Base_Diffuse.mat b/Assets/Art/头颈面部解剖FBX/Materials/Male_Bushy_Base_Diffuse.mat index b454cebd..0dffeca6 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/Male_Bushy_Base_Diffuse.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/Male_Bushy_Base_Diffuse.mat @@ -8,10 +8,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Male_Bushy_Base_Diffuse - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -110,10 +111,10 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.31622776 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 5 + - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/Male_Bushy_Diffuse.mat b/Assets/Art/头颈面部解剖FBX/Materials/Male_Bushy_Diffuse.mat index 74f459ad..27c3650c 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/Male_Bushy_Diffuse.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/Male_Bushy_Diffuse.mat @@ -8,10 +8,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Male_Bushy_Diffuse - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -110,10 +111,10 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.31622776 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 5 + - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/SM_RenTi_Std_Cornea_L_Diffuse.mat b/Assets/Art/头颈面部解剖FBX/Materials/SM_RenTi_Std_Cornea_L_Diffuse.mat index 2c386c2d..1ae3d54c 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/SM_RenTi_Std_Cornea_L_Diffuse.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/SM_RenTi_Std_Cornea_L_Diffuse.mat @@ -21,10 +21,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SM_RenTi_Std_Cornea_L_Diffuse - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -123,10 +124,10 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.33166248 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 5 + - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/SM_RenTi_Std_Cornea_R_Diffuse.mat b/Assets/Art/头颈面部解剖FBX/Materials/SM_RenTi_Std_Cornea_R_Diffuse.mat index d3f5585d..37f84938 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/SM_RenTi_Std_Cornea_R_Diffuse.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/SM_RenTi_Std_Cornea_R_Diffuse.mat @@ -8,10 +8,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SM_RenTi_Std_Cornea_R_Diffuse - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 2100000, guid: 4ee029cbc9e15414ebebd11416ca21b4, type: 2} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -36,7 +37,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] - m_Floats: [] + m_Floats: + - _Smoothness: 1 m_Colors: [] m_BuildTextureStacks: [] --- !u!114 &7259690608283339364 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/SM_RenTi_Std_Eye_L_Diffuse.mat b/Assets/Art/头颈面部解剖FBX/Materials/SM_RenTi_Std_Eye_L_Diffuse.mat index 2a9663f5..f9bcea5f 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/SM_RenTi_Std_Eye_L_Diffuse.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/SM_RenTi_Std_Eye_L_Diffuse.mat @@ -21,10 +21,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SM_RenTi_Std_Eye_L_Diffuse - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -120,7 +121,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.4472136 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/SM_RenTi_Std_Eye_R_Diffuse.mat b/Assets/Art/头颈面部解剖FBX/Materials/SM_RenTi_Std_Eye_R_Diffuse.mat index 3442f817..2479f129 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/SM_RenTi_Std_Eye_R_Diffuse.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/SM_RenTi_Std_Eye_R_Diffuse.mat @@ -8,10 +8,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SM_RenTi_Std_Eye_R_Diffuse - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -107,7 +108,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.4472136 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/T_M_PiFu1_BaseColor.mat b/Assets/Art/头颈面部解剖FBX/Materials/T_M_PiFu1_BaseColor.mat index 329f0c66..84e68073 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/T_M_PiFu1_BaseColor.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/T_M_PiFu1_BaseColor.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: T_M_PiFu1_BaseColor - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -120,7 +120,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.4472136 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/bone_uv1_d.mat b/Assets/Art/头颈面部解剖FBX/Materials/bone_uv1_d.mat index 8ebd9683..b078e78e 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/bone_uv1_d.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/bone_uv1_d.mat @@ -21,10 +21,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: bone_uv1_d - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -120,7 +121,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/bone_uv2_d.mat b/Assets/Art/头颈面部解剖FBX/Materials/bone_uv2_d.mat index 518bd278..cf1b8184 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/bone_uv2_d.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/bone_uv2_d.mat @@ -21,10 +21,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: bone_uv2_d - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -120,7 +121,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/bone_uv3_d.mat b/Assets/Art/头颈面部解剖FBX/Materials/bone_uv3_d.mat index f13ebc46..216accbe 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/bone_uv3_d.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/bone_uv3_d.mat @@ -21,10 +21,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: bone_uv3_d - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -120,7 +121,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/bone_uv4_d.mat b/Assets/Art/头颈面部解剖FBX/Materials/bone_uv4_d.mat index bd6b8e2c..5df0be23 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/bone_uv4_d.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/bone_uv4_d.mat @@ -21,10 +21,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: bone_uv4_d - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -120,7 +121,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/dongmai.mat b/Assets/Art/头颈面部解剖FBX/Materials/dongmai.mat index 07d4dbf6..7a7dc807 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/dongmai.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/dongmai.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: dongmai - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -120,7 +120,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.49999997 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/jingmai.mat b/Assets/Art/头颈面部解剖FBX/Materials/jingmai.mat index 7379d5e6..0b4c770b 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/jingmai.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/jingmai.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: jingmai - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -120,7 +120,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.49999997 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/mat_0.mat b/Assets/Art/头颈面部解剖FBX/Materials/mat_0.mat index a0405b9b..d4d355cd 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/mat_0.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/mat_0.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mat_0 - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -29,7 +29,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 + m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -120,7 +120,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.49999997 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/muscle_2_uv1_d.mat b/Assets/Art/头颈面部解剖FBX/Materials/muscle_2_uv1_d.mat index f5c17d80..d2c52d56 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/muscle_2_uv1_d.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/muscle_2_uv1_d.mat @@ -21,10 +21,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: muscle_2_uv1_d - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -120,7 +121,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.49999997 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/muscle_uv1_d.mat b/Assets/Art/头颈面部解剖FBX/Materials/muscle_uv1_d.mat index 9ac26c1d..b128665b 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/muscle_uv1_d.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/muscle_uv1_d.mat @@ -8,10 +8,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: muscle_uv1_d - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -107,7 +108,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.49999997 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/muscle_uv2_d.mat b/Assets/Art/头颈面部解剖FBX/Materials/muscle_uv2_d.mat index bab65d03..b5395c59 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/muscle_uv2_d.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/muscle_uv2_d.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: muscle_uv2_d - m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: @@ -110,7 +110,7 @@ Material: - _ReceiveShadows: 1 - _SampleGI: 0 - _Shininess: 0 - - _Smoothness: 0.49999997 + - _Smoothness: 1 - _SmoothnessSource: 0 - _SmoothnessTextureChannel: 0 - _SpecSource: 0 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/muscle_uv3_d.mat b/Assets/Art/头颈面部解剖FBX/Materials/muscle_uv3_d.mat index 005c37f1..78e0ad75 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/muscle_uv3_d.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/muscle_uv3_d.mat @@ -21,10 +21,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: muscle_uv3_d - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -120,7 +121,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.49999997 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/muscle_uv4_d.mat b/Assets/Art/头颈面部解剖FBX/Materials/muscle_uv4_d.mat index 18dd8020..77df0e12 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/muscle_uv4_d.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/muscle_uv4_d.mat @@ -8,10 +8,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: muscle_uv4_d - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -107,7 +108,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.49999997 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/neizang.mat b/Assets/Art/头颈面部解剖FBX/Materials/neizang.mat index 0f19fb97..df7cfa89 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/neizang.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/neizang.mat @@ -8,10 +8,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: neizang - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -107,7 +108,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/neizang_1.mat b/Assets/Art/头颈面部解剖FBX/Materials/neizang_1.mat index 07cff0ce..0a511120 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/neizang_1.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/neizang_1.mat @@ -8,10 +8,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: neizang_1 - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -107,7 +108,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/rendai_c_a.mat b/Assets/Art/头颈面部解剖FBX/Materials/rendai_c_a.mat index 654c4e1b..c2906b01 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/rendai_c_a.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/rendai_c_a.mat @@ -21,10 +21,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: rendai_c_a - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -120,7 +121,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/头颈面部解剖FBX/Materials/zhongshu_c_a.mat b/Assets/Art/头颈面部解剖FBX/Materials/zhongshu_c_a.mat index 54fad896..61d27f49 100644 --- a/Assets/Art/头颈面部解剖FBX/Materials/zhongshu_c_a.mat +++ b/Assets/Art/头颈面部解剖FBX/Materials/zhongshu_c_a.mat @@ -8,10 +8,11 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: zhongshu_c_a - m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -107,7 +108,7 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 - - _Smoothness: 0.49999997 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 846ac140..f0ce54a0 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -372,7 +372,7 @@ MonoBehaviour: m_Bits: 1 m_VolumeTrigger: {fileID: 0} m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 + m_RenderPostProcessing: 1 m_Antialiasing: 0 m_AntialiasingQuality: 2 m_StopNaN: 0 diff --git a/Assets/Scenes/Test.unity b/Assets/Scenes/Test.unity index fb57da80..beeca0b1 100644 --- a/Assets/Scenes/Test.unity +++ b/Assets/Scenes/Test.unity @@ -23,7 +23,7 @@ RenderSettings: m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 2.356 + m_AmbientIntensity: 1 m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 1, g: 1, b: 1, a: 1} m_SkyboxMaterial: {fileID: 2100000, guid: 534150bfd1d0c6e4a8d54ab18eb47db8, type: 2} @@ -97,7 +97,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 112000000, guid: a320b09162e0c0948943bf065963a9cd, type: 2} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -7071,7 +7071,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &203844587 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7094,7 +7094,7 @@ MonoBehaviour: m_ShadowRenderingLayers: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 1 + m_SoftShadowQuality: 3 --- !u!108 &203844588 Light: m_ObjectHideFlags: 0 @@ -7113,7 +7113,7 @@ Light: m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: - m_Type: 2 + m_Type: 0 m_Resolution: -1 m_CustomResolution: -1 m_Strength: 1 @@ -7165,13 +7165,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 203844586} serializedVersion: 2 - m_LocalRotation: {x: 0.5279602, y: -0.21673603, z: 0.14146648, w: 0.80887} + m_LocalRotation: {x: 0.08682413, y: 0.08682413, z: -0.0075961305, w: 0.99240386} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 66.266, y: -30, z: 0} + m_LocalEulerAnglesHint: {x: 10, y: 10, z: 0} --- !u!1 &204198432 stripped GameObject: m_CorrespondingSourceObject: {fileID: -521820879441198205, guid: 5755b628fc33efd4bb8984f770e4e884, type: 3} @@ -31137,7 +31137,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1160234426 MonoBehaviour: m_ObjectHideFlags: 0 @@ -31145,7 +31145,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1160234425} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: @@ -45205,6 +45205,124 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 6870026117193709375, guid: b436b6a86c9d4ea45b307ea81996bb1a, type: 3} +--- !u!1 &1584068653 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1584068656} + - component: {fileID: 1584068655} + - component: {fileID: 1584068654} + m_Layer: 0 + m_Name: Directional Light (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1584068654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1584068653} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 3 +--- !u!108 &1584068655 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1584068653} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1584068656 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1584068653} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0.9961947, z: -0.08715578, w: 0} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 10, y: 180, z: 0} --- !u!1 &1591108661 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5217488183841692923, guid: 3a238d0d1a934684a8db230279184d7d, type: 3} @@ -46959,6 +47077,71 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 5433204362087043647, guid: 5755b628fc33efd4bb8984f770e4e884, type: 3} +--- !u!1 &1670551016 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1670551018} + - component: {fileID: 1670551017} + m_Layer: 0 + m_Name: Reflection Probe + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!215 &1670551017 +ReflectionProbe: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1670551016} + m_Enabled: 1 + serializedVersion: 2 + m_Type: 0 + m_Mode: 0 + m_RefreshMode: 0 + m_TimeSlicingMode: 0 + m_Resolution: 512 + m_UpdateFrequency: 0 + m_BoxSize: {x: 100, y: 100, z: 100} + m_BoxOffset: {x: 0, y: 0, z: 0} + m_NearClip: 0.3 + m_FarClip: 1000 + m_ShadowDistance: 100 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_IntensityMultiplier: 1 + m_BlendDistance: 1 + m_HDR: 1 + m_BoxProjection: 0 + m_RenderDynamicObjects: 0 + m_UseOcclusionCulling: 1 + m_Importance: 1 + m_CustomBakedTexture: {fileID: 0} +--- !u!4 &1670551018 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1670551016} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.0016298672, y: 0.037974283, z: -0.016496142} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1672726558 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3414458884203761849, guid: f7442974e616de94f96b97cd045fd94e, type: 3} @@ -64723,5 +64906,7 @@ SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 203844589} + - {fileID: 1584068656} - {fileID: 1160234427} - {fileID: 1645790457} + - {fileID: 1670551018} diff --git a/Assets/Scenes/Test/GlobalVolumeProfile.asset b/Assets/Scenes/Test/GlobalVolumeProfile.asset index c76f07b9..5266285e 100644 --- a/Assets/Scenes/Test/GlobalVolumeProfile.asset +++ b/Assets/Scenes/Test/GlobalVolumeProfile.asset @@ -1,5 +1,33 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1533120936878871154 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66f335fb1ffd8684294ad653bf1c7564, type: 3} + m_Name: ColorAdjustments + m_EditorClassIdentifier: + active: 0 + postExposure: + m_OverrideState: 1 + m_Value: 1 + contrast: + m_OverrideState: 1 + m_Value: 5 + colorFilter: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} + hueShift: + m_OverrideState: 0 + m_Value: 0 + saturation: + m_OverrideState: 1 + m_Value: 30 --- !u!114 &-32820517437979890 MonoBehaviour: m_ObjectHideFlags: 3 @@ -12,16 +40,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0b2db86121404754db890f4c8dfe81b2, type: 3} m_Name: Bloom m_EditorClassIdentifier: - active: 1 + active: 0 skipIterations: m_OverrideState: 0 m_Value: 1 threshold: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 0.9 intensity: m_OverrideState: 1 - m_Value: 1 + m_Value: 0.1 scatter: m_OverrideState: 0 m_Value: 0.7 @@ -62,6 +90,7 @@ MonoBehaviour: components: - {fileID: 1881579288749618558} - {fileID: -32820517437979890} + - {fileID: -1533120936878871154} --- !u!114 &1881579288749618558 MonoBehaviour: m_ObjectHideFlags: 3 @@ -74,10 +103,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 97c23e3b12dc18c42a140437e53d3951, type: 3} m_Name: Tonemapping m_EditorClassIdentifier: - active: 1 + active: 0 mode: m_OverrideState: 1 - m_Value: 1 + m_Value: 2 neutralHDRRangeReductionMode: m_OverrideState: 0 m_Value: 2 diff --git a/Assets/Scenes/Test/LightingData.asset b/Assets/Scenes/Test/LightingData.asset new file mode 100644 index 00000000..38a82b98 Binary files /dev/null and b/Assets/Scenes/Test/LightingData.asset differ diff --git a/Assets/Scenes/Test/LightingData.asset.meta b/Assets/Scenes/Test/LightingData.asset.meta new file mode 100644 index 00000000..e11c1e6f --- /dev/null +++ b/Assets/Scenes/Test/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a320b09162e0c0948943bf065963a9cd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Test/ReflectionProbe-0.exr b/Assets/Scenes/Test/ReflectionProbe-0.exr new file mode 100644 index 00000000..37afcedc Binary files /dev/null and b/Assets/Scenes/Test/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/Test/ReflectionProbe-0.exr.meta b/Assets/Scenes/Test/ReflectionProbe-0.exr.meta new file mode 100644 index 00000000..6cf68646 --- /dev/null +++ b/Assets/Scenes/Test/ReflectionProbe-0.exr.meta @@ -0,0 +1,179 @@ +fileFormatVersion: 2 +guid: 26b86725542bdde469aab726e136c905 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 2 + 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: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + 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: iPhone + maxTextureSize: 8192 + 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: 8192 + 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: Windows Store Apps + maxTextureSize: 8192 + 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: WebGL + maxTextureSize: 8192 + 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: Server + maxTextureSize: 8192 + 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/Scenes/Test/ReflectionProbe-1.exr b/Assets/Scenes/Test/ReflectionProbe-1.exr new file mode 100644 index 00000000..c74939e4 Binary files /dev/null and b/Assets/Scenes/Test/ReflectionProbe-1.exr differ diff --git a/Assets/Scenes/Test/ReflectionProbe-1.exr.meta b/Assets/Scenes/Test/ReflectionProbe-1.exr.meta new file mode 100644 index 00000000..405b0371 --- /dev/null +++ b/Assets/Scenes/Test/ReflectionProbe-1.exr.meta @@ -0,0 +1,179 @@ +fileFormatVersion: 2 +guid: 8910747b4b98dc041afaba4498053344 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 2 + 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: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + 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: iPhone + maxTextureSize: 8192 + 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: 8192 + 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: Windows Store Apps + maxTextureSize: 8192 + 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: WebGL + maxTextureSize: 8192 + 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: Server + maxTextureSize: 8192 + 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: