diff --git a/Assets/Art/Render/URP/Settings/AVP8_Lighting_Settings_Low.lighting b/Assets/Art/Render/URP/Settings/AVP8_Lighting_Settings_Low.lighting index 2555527..adb47b9 100644 --- a/Assets/Art/Render/URP/Settings/AVP8_Lighting_Settings_Low.lighting +++ b/Assets/Art/Render/URP/Settings/AVP8_Lighting_Settings_Low.lighting @@ -22,8 +22,8 @@ LightingSettings: m_Padding: 5 m_LightmapCompression: 0 m_AO: 1 - m_AOMaxDistance: 0.6 - m_CompAOExponent: 0.6 + m_AOMaxDistance: 0.4 + m_CompAOExponent: 0.4 m_CompAOExponentDirect: 0 m_ExtractAO: 0 m_MixedBakeMode: 2 diff --git a/Assets/JingMai/Materials/mat_3 1.mat b/Assets/JingMai/Materials/mat_3 1.mat new file mode 100644 index 0000000..2190e71 --- /dev/null +++ b/Assets/JingMai/Materials/mat_3 1.mat @@ -0,0 +1,132 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: mat_3 1 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: f329c63a3ab80b3478227ce3f5c65611, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: f329c63a3ab80b3478227ce3f5c65611, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _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: [] +--- !u!114 &3429122563166172396 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Assets/JingMai/Materials/mat_3 1.mat.meta b/Assets/JingMai/Materials/mat_3 1.mat.meta new file mode 100644 index 0000000..84612e5 --- /dev/null +++ b/Assets/JingMai/Materials/mat_3 1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3a6a257c57e06884caa219506527c293 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/JingMai/Materials/mat_3.mat b/Assets/JingMai/Materials/mat_3.mat index c240cdf..190c5a2 100644 --- a/Assets/JingMai/Materials/mat_3.mat +++ b/Assets/JingMai/Materials/mat_3.mat @@ -102,7 +102,7 @@ Material: - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.4 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -112,8 +112,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.9245283, g: 0.9245283, b: 0.9245283, a: 1} - - _Color: {r: 0.9245283, g: 0.9245283, b: 0.9245283, a: 1} + - _BaseColor: {r: 0.9716981, g: 0.9716981, b: 0.9716981, a: 1} + - _Color: {r: 0.9716981, g: 0.9716981, b: 0.9716981, 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/JingLuoXueWei.unity b/Assets/_Scenes/JingLuoXueWei.unity index 9901dc3..e02576b 100644 --- a/Assets/_Scenes/JingLuoXueWei.unity +++ b/Assets/_Scenes/JingLuoXueWei.unity @@ -25599,11 +25599,21 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 3797743042184522722, guid: 2fcc585133d55174b945e1146b751a7e, + type: 3} + propertyPath: m_StaticEditorFlags + value: 64 + objectReference: {fileID: 0} - target: {fileID: 4281558791077558241, guid: 2fcc585133d55174b945e1146b751a7e, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4598975290448150360, guid: 2fcc585133d55174b945e1146b751a7e, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 3a6a257c57e06884caa219506527c293, type: 2} - target: {fileID: 4934430705091764743, guid: 2fcc585133d55174b945e1146b751a7e, type: 3} propertyPath: m_IsActive @@ -25619,6 +25629,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6789136708599968801, guid: 2fcc585133d55174b945e1146b751a7e, + type: 3} + propertyPath: m_StaticEditorFlags + value: 64 + objectReference: {fileID: 0} - target: {fileID: 6948636873388728682, guid: 2fcc585133d55174b945e1146b751a7e, type: 3} propertyPath: m_Name @@ -25684,6 +25699,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8844705950777907698, guid: 2fcc585133d55174b945e1146b751a7e, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 3a6a257c57e06884caa219506527c293, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2fcc585133d55174b945e1146b751a7e, type: 3} --- !u!1 &969931211 stripped diff --git a/Assets/_Scenes/JingLuoXueWei/LightingData.asset b/Assets/_Scenes/JingLuoXueWei/LightingData.asset index 7ea768d..6f21258 100644 Binary files a/Assets/_Scenes/JingLuoXueWei/LightingData.asset and b/Assets/_Scenes/JingLuoXueWei/LightingData.asset differ diff --git a/Assets/_Scenes/JingLuoXueWei/Lightmap-0_comp_light.exr b/Assets/_Scenes/JingLuoXueWei/Lightmap-0_comp_light.exr index 50b6216..786e37a 100644 Binary files a/Assets/_Scenes/JingLuoXueWei/Lightmap-0_comp_light.exr and b/Assets/_Scenes/JingLuoXueWei/Lightmap-0_comp_light.exr differ diff --git a/Assets/_Scenes/JingLuoXueWei/Lightmap-1_comp_light.exr b/Assets/_Scenes/JingLuoXueWei/Lightmap-1_comp_light.exr index b943730..427ff8e 100644 Binary files a/Assets/_Scenes/JingLuoXueWei/Lightmap-1_comp_light.exr and b/Assets/_Scenes/JingLuoXueWei/Lightmap-1_comp_light.exr differ diff --git a/Assets/_Scenes/JingLuoXueWei/Lightmap-2_comp_light.exr b/Assets/_Scenes/JingLuoXueWei/Lightmap-2_comp_light.exr index 7db6474..ec5033b 100644 Binary files a/Assets/_Scenes/JingLuoXueWei/Lightmap-2_comp_light.exr and b/Assets/_Scenes/JingLuoXueWei/Lightmap-2_comp_light.exr differ diff --git a/Assets/_Scenes/JingLuoXueWei/ReflectionProbe-0.exr b/Assets/_Scenes/JingLuoXueWei/ReflectionProbe-0.exr index 86dead7..3ab3fdf 100644 Binary files a/Assets/_Scenes/JingLuoXueWei/ReflectionProbe-0.exr and b/Assets/_Scenes/JingLuoXueWei/ReflectionProbe-0.exr differ