diff --git a/Assets/Projects/AnHuiSheYing/Models/SM_changjing.fbm/3d66Model-19205632-files-022.jpg.meta b/Assets/Projects/AnHuiSheYing/Models/SM_changjing.fbm/3d66Model-19205632-files-022.jpg.meta index b53c8770..b380c78c 100644 --- a/Assets/Projects/AnHuiSheYing/Models/SM_changjing.fbm/3d66Model-19205632-files-022.jpg.meta +++ b/Assets/Projects/AnHuiSheYing/Models/SM_changjing.fbm/3d66Model-19205632-files-022.jpg.meta @@ -7,7 +7,7 @@ TextureImporter: mipmaps: mipMapMode: 0 enableMipMap: 1 - sRGBTexture: 0 + sRGBTexture: 1 linearTexture: 0 fadeOut: 0 borderMipMap: 0 diff --git a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity index 7bb38bba..3ad6c839 100644 --- a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity +++ b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity @@ -193,6 +193,7 @@ Transform: - {fileID: 722070298} - {fileID: 256649180} - {fileID: 1204774725} + - {fileID: 721823679} - {fileID: 1416013661} - {fileID: 1578028595} - {fileID: 419199240} @@ -200,6 +201,7 @@ Transform: - {fileID: 714900930} - {fileID: 1002305258} - {fileID: 1205656812} + - {fileID: 1509203873} m_Father: {fileID: 1820601762} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &125072917 @@ -1960,7 +1962,7 @@ Light: m_Type: 3 m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 2 + m_Intensity: 3 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -2002,7 +2004,7 @@ Light: m_Lightmapping: 2 m_LightShadowCasterMode: 0 m_AreaSize: {x: 0.27035338, y: 1.0417852} - m_BounceIntensity: 1 + m_BounceIntensity: 2 m_ColorTemperature: 6570 m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} @@ -2750,6 +2752,124 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!1 &721823678 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 721823679} + - component: {fileID: 721823681} + - component: {fileID: 721823680} + m_Layer: 0 + m_Name: Area Light (8) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &721823679 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 721823678} + serializedVersion: 2 + m_LocalRotation: {x: 0.99953485, y: -0, z: -0, w: -0.030497864} + m_LocalPosition: {x: -0.854, y: 1.017, z: -2.038} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 106129971} + m_LocalEulerAnglesHint: {x: 183.495, y: 0, z: 0} +--- !u!114 &721823680 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 721823678} + 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: 0 +--- !u!108 &721823681 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 721823678} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 3 + 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: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.02 + m_NormalBias: 0.1 + m_NearPlane: 0.1 + 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: 2 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 3.8263876, y: 0.46257198} + 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!1 &722070297 GameObject: m_ObjectHideFlags: 0 @@ -3890,13 +4010,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1204774724} serializedVersion: 2 - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: -0.854, y: 2.193, z: -2.372} + m_LocalRotation: {x: 0.8184408, y: -0, z: -0, w: 0.5745909} + m_LocalPosition: {x: -0.854, y: 2.219, z: -2.443} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 106129971} - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 109.858, y: 0, z: 0} --- !u!114 &1204774726 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3932,7 +4052,7 @@ Light: m_Type: 3 m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 2 + m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -3973,7 +4093,7 @@ Light: m_RenderingLayerMask: 1 m_Lightmapping: 2 m_LightShadowCasterMode: 0 - m_AreaSize: {x: 5.2747984, y: 0.1563043} + m_AreaSize: {x: 5.2747984, y: 0.46257198} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 @@ -5550,6 +5670,124 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1509203872 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1509203873} + - component: {fileID: 1509203875} + - component: {fileID: 1509203874} + m_Layer: 0 + m_Name: Point Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1509203873 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1509203872} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.378, y: 0.674, z: -2.326} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 106129971} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1509203874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1509203872} + 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: 0 +--- !u!108 &1509203875 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1509203872} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 2 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 0.3 + 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.02 + m_NormalBias: 0.1 + m_NearPlane: 0.1 + 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!1001 &1519644345 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/LightingData.asset b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/LightingData.asset index 163b9535..f59af6a0 100644 Binary files a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/LightingData.asset and b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/LightingData.asset differ diff --git a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-0_comp_dir.png b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-0_comp_dir.png index 1eb377ab..3ca205ee 100644 Binary files a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-0_comp_dir.png and b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-0_comp_dir.png differ diff --git a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-0_comp_light.exr b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-0_comp_light.exr index b4d7aeec..d02b857d 100644 Binary files a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-0_comp_light.exr and b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-0_comp_light.exr differ diff --git a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-1_comp_dir.png b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-1_comp_dir.png index 1ca0cdec..0f407f2a 100644 Binary files a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-1_comp_dir.png and b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-1_comp_dir.png differ diff --git a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-1_comp_light.exr b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-1_comp_light.exr index 505b8d88..cf167b0f 100644 Binary files a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-1_comp_light.exr and b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-1_comp_light.exr differ diff --git a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-2_comp_dir.png b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-2_comp_dir.png index 9a24f663..27eb75ed 100644 Binary files a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-2_comp_dir.png and b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-2_comp_dir.png differ diff --git a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-2_comp_light.exr b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-2_comp_light.exr index 9600745d..cd7c8fc7 100644 Binary files a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-2_comp_light.exr and b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-2_comp_light.exr differ diff --git a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-3_comp_dir.png b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-3_comp_dir.png index bb0454ed..ae49299c 100644 Binary files a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-3_comp_dir.png and b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-3_comp_dir.png differ diff --git a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-3_comp_light.exr b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-3_comp_light.exr index f772ab22..8255f16e 100644 Binary files a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-3_comp_light.exr and b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/Lightmap-3_comp_light.exr differ diff --git a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/ReflectionProbe-0.exr b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/ReflectionProbe-0.exr index 547148c6..a89c3aeb 100644 Binary files a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/ReflectionProbe-0.exr and b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe/ReflectionProbe-0.exr differ