diff --git a/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi01.mat b/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi01.mat index 2bd7d89..e4dafb0 100644 --- a/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi01.mat +++ b/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi01.mat @@ -25,7 +25,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 7654a8f08005271408e2535db376027e, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -49,7 +49,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 7654a8f08005271408e2535db376027e, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -99,13 +99,13 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.14142135 - _GlossyReflections: 1 - - _Metallic: 0 + - _Metallic: 0.4 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.14142135 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -115,8 +115,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 0.3669455, g: 0.47056592, b: 0.5849056, a: 1} + - _Color: {r: 0.3669455, g: 0.47056592, b: 0.5849056, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi02.mat b/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi02.mat index 9aea1f0..0bc5fa3 100644 --- a/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi02.mat +++ b/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi02.mat @@ -99,13 +99,13 @@ Material: - _GlossMapScale: 1 - _Glossiness: 0.25491214 - _GlossyReflections: 1 - - _Metallic: 1 + - _Metallic: 0.4 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 0.7 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi05.mat b/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi05.mat index 1b8498f..3b6707c 100644 --- a/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi05.mat +++ b/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi05.mat @@ -38,7 +38,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: b037361debf001644bb2b7d53b592fd6, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -62,7 +62,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: b037361debf001644bb2b7d53b592fd6, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -128,8 +128,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1} + - _Color: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi23 1.mat b/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi23 1.mat index 8874946..43043ba 100644 --- a/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi23 1.mat +++ b/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi23 1.mat @@ -132,8 +132,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0.9339623, g: 0.8190886, b: 0.6123621, a: 1} - - _Color: {r: 0.9339623, g: 0.8190886, b: 0.6123621, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi23.mat b/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi23.mat index d347cc9..e29aa04 100644 --- a/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi23.mat +++ b/Assets/Art/Models/LouDi/SM_ShiYanShi/Materials/TX_shiyanshi23.mat @@ -128,8 +128,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.9339623, g: 0.8190886, b: 0.6123621, a: 1} - - _Color: {r: 0.9339623, g: 0.8190886, b: 0.6123621, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_Scenes/TrainExam.unity b/Assets/_Scenes/TrainExam.unity index 2c8fdc2..281d031 100644 --- a/Assets/_Scenes/TrainExam.unity +++ b/Assets/_Scenes/TrainExam.unity @@ -26986,7 +26986,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, type: 3} propertyPath: m_LocalPosition.z - value: 2.587 + value: 2.578 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 535cb80b23ea14242891d8d17c3d5ea7, type: 3} @@ -34179,7 +34179,7 @@ ReflectionProbe: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 - m_IntensityMultiplier: 1 + m_IntensityMultiplier: 1.2 m_BlendDistance: 1 m_HDR: 1 m_BoxProjection: 0 diff --git a/Assets/_Scenes/TrainExam/LightingData.asset b/Assets/_Scenes/TrainExam/LightingData.asset index 2ab6276..1b077d8 100644 Binary files a/Assets/_Scenes/TrainExam/LightingData.asset and b/Assets/_Scenes/TrainExam/LightingData.asset differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-0_comp_dir.png b/Assets/_Scenes/TrainExam/Lightmap-0_comp_dir.png index 7a20b99..2116b19 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-0_comp_dir.png and b/Assets/_Scenes/TrainExam/Lightmap-0_comp_dir.png differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-0_comp_light.exr b/Assets/_Scenes/TrainExam/Lightmap-0_comp_light.exr index 593abac..c7a4198 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-0_comp_light.exr and b/Assets/_Scenes/TrainExam/Lightmap-0_comp_light.exr differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-1_comp_dir.png b/Assets/_Scenes/TrainExam/Lightmap-1_comp_dir.png index 18d5091..1c61f42 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-1_comp_dir.png and b/Assets/_Scenes/TrainExam/Lightmap-1_comp_dir.png differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-1_comp_light.exr b/Assets/_Scenes/TrainExam/Lightmap-1_comp_light.exr index cd9e80d..e49c924 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-1_comp_light.exr and b/Assets/_Scenes/TrainExam/Lightmap-1_comp_light.exr differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-2_comp_dir.png b/Assets/_Scenes/TrainExam/Lightmap-2_comp_dir.png index c69ea62..f89e3a1 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-2_comp_dir.png and b/Assets/_Scenes/TrainExam/Lightmap-2_comp_dir.png differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-2_comp_light.exr b/Assets/_Scenes/TrainExam/Lightmap-2_comp_light.exr index 46f44bc..99e3ffa 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-2_comp_light.exr and b/Assets/_Scenes/TrainExam/Lightmap-2_comp_light.exr differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-3_comp_dir.png b/Assets/_Scenes/TrainExam/Lightmap-3_comp_dir.png index bbfb928..9ed14fd 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-3_comp_dir.png and b/Assets/_Scenes/TrainExam/Lightmap-3_comp_dir.png differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-3_comp_light.exr b/Assets/_Scenes/TrainExam/Lightmap-3_comp_light.exr index 44ba266..fd0755c 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-3_comp_light.exr and b/Assets/_Scenes/TrainExam/Lightmap-3_comp_light.exr differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-4_comp_dir.png b/Assets/_Scenes/TrainExam/Lightmap-4_comp_dir.png index bf25f74..39013ce 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-4_comp_dir.png and b/Assets/_Scenes/TrainExam/Lightmap-4_comp_dir.png differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-4_comp_light.exr b/Assets/_Scenes/TrainExam/Lightmap-4_comp_light.exr index df26d90..e46e6ea 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-4_comp_light.exr and b/Assets/_Scenes/TrainExam/Lightmap-4_comp_light.exr differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-5_comp_dir.png b/Assets/_Scenes/TrainExam/Lightmap-5_comp_dir.png index cc6eeec..02f909f 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-5_comp_dir.png and b/Assets/_Scenes/TrainExam/Lightmap-5_comp_dir.png differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-5_comp_light.exr b/Assets/_Scenes/TrainExam/Lightmap-5_comp_light.exr index 0334b82..25dc62b 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-5_comp_light.exr and b/Assets/_Scenes/TrainExam/Lightmap-5_comp_light.exr differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-6_comp_dir.png b/Assets/_Scenes/TrainExam/Lightmap-6_comp_dir.png index eaeff5b..243f314 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-6_comp_dir.png and b/Assets/_Scenes/TrainExam/Lightmap-6_comp_dir.png differ diff --git a/Assets/_Scenes/TrainExam/Lightmap-6_comp_light.exr b/Assets/_Scenes/TrainExam/Lightmap-6_comp_light.exr index a4883ce..20ded3f 100644 Binary files a/Assets/_Scenes/TrainExam/Lightmap-6_comp_light.exr and b/Assets/_Scenes/TrainExam/Lightmap-6_comp_light.exr differ diff --git a/Assets/_Scenes/TrainExam/ReflectionProbe-0.exr b/Assets/_Scenes/TrainExam/ReflectionProbe-0.exr index 26a801c..f243b9b 100644 Binary files a/Assets/_Scenes/TrainExam/ReflectionProbe-0.exr and b/Assets/_Scenes/TrainExam/ReflectionProbe-0.exr differ diff --git a/Assets/_Scenes/TrainExam/ReflectionProbe-1.exr b/Assets/_Scenes/TrainExam/ReflectionProbe-1.exr index 64a53a6..b8265e2 100644 Binary files a/Assets/_Scenes/TrainExam/ReflectionProbe-1.exr and b/Assets/_Scenes/TrainExam/ReflectionProbe-1.exr differ diff --git a/Assets/_Scenes/TrainExam/ReflectionProbe-2.exr b/Assets/_Scenes/TrainExam/ReflectionProbe-2.exr index ccfa411..07aa81f 100644 Binary files a/Assets/_Scenes/TrainExam/ReflectionProbe-2.exr and b/Assets/_Scenes/TrainExam/ReflectionProbe-2.exr differ