diff --git a/GQ_TongXin/Assets/New Lighting Settings.lighting b/GQ_TongXin/Assets/New Lighting Settings.lighting index b1f816d24..562d6f70f 100644 --- a/GQ_TongXin/Assets/New Lighting Settings.lighting +++ b/GQ_TongXin/Assets/New Lighting Settings.lighting @@ -15,7 +15,7 @@ LightingSettings: m_BounceScale: 1 m_AlbedoBoost: 1 m_IndirectOutputScale: 1 - m_UsingShadowmask: 1 + m_UsingShadowmask: 0 m_BakeBackend: 2 m_LightmapMaxSize: 1024 m_BakeResolution: 40 @@ -26,8 +26,8 @@ LightingSettings: m_CompAOExponent: 1 m_CompAOExponentDirect: 0 m_ExtractAO: 0 - m_MixedBakeMode: 2 - m_LightmapsBakeMode: 1 + m_MixedBakeMode: 0 + m_LightmapsBakeMode: 0 m_FilterMode: 1 m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} m_ExportTrainingData: 0 @@ -45,8 +45,8 @@ LightingSettings: m_PVREnvironmentSampleCount: 256 m_PVREnvironmentReferencePointCount: 2048 m_LightProbeSampleCountMultiplier: 4 - m_PVRBounces: 2 - m_PVRMinBounces: 1 + m_PVRBounces: 4 + m_PVRMinBounces: 2 m_PVREnvironmentMIS: 1 m_PVRFilteringMode: 1 m_PVRDenoiserTypeDirect: 1 diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG.unity b/GQ_TongXin/Assets/Scenes/SampleSceneG.unity index 8bf5e0f38..5aa8a6ffe 100644 --- a/GQ_TongXin/Assets/Scenes/SampleSceneG.unity +++ b/GQ_TongXin/Assets/Scenes/SampleSceneG.unity @@ -92116,6 +92116,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 469675410} m_Modifications: + - target: {fileID: 702178166669631502, guid: 57cfbcffbbe9796468208a81628506dd, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2328099279807547259, guid: 57cfbcffbbe9796468208a81628506dd, type: 3} propertyPath: m_RootOrder value: 3 @@ -92160,6 +92164,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2369135805684391221, guid: 57cfbcffbbe9796468208a81628506dd, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2647823816270787252, guid: 57cfbcffbbe9796468208a81628506dd, type: 3} propertyPath: m_Name value: "\u84C4\u7535\u6C60\u5BA41" @@ -92176,6 +92184,10 @@ PrefabInstance: propertyPath: m_Name value: "\u673A\u623F1" objectReference: {fileID: 0} + - target: {fileID: 8927896662121550122, guid: 57cfbcffbbe9796468208a81628506dd, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 57cfbcffbbe9796468208a81628506dd, type: 3} --- !u!1 &856686022 stripped diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/LightingData.asset b/GQ_TongXin/Assets/Scenes/SampleSceneG/LightingData.asset index fcea23dbb..b563b2919 100644 Binary files a/GQ_TongXin/Assets/Scenes/SampleSceneG/LightingData.asset and b/GQ_TongXin/Assets/Scenes/SampleSceneG/LightingData.asset differ diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_dir.png b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_dir.png deleted file mode 100644 index 617333add..000000000 Binary files a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_dir.png and /dev/null differ diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_dir.png.meta b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_dir.png.meta deleted file mode 100644 index 30e4fe54c..000000000 --- a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_dir.png.meta +++ /dev/null @@ -1,98 +0,0 @@ -fileFormatVersion: 2 -guid: b7fdf0696e1cb9941b7f453fa820e88a -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 0 - 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 - isReadable: 0 - streamingMipmaps: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 3 - 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: 12 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_light.exr b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_light.exr index e0dbb45f9..d0c41dfb5 100644 Binary files a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_light.exr and b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-0_comp_light.exr differ diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_dir.png b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_dir.png deleted file mode 100644 index 6cb46acb5..000000000 Binary files a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_dir.png and /dev/null differ diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_dir.png.meta b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_dir.png.meta deleted file mode 100644 index ea1a0f8d8..000000000 --- a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_dir.png.meta +++ /dev/null @@ -1,98 +0,0 @@ -fileFormatVersion: 2 -guid: 164a10852d9345947a689f5daa4a4c47 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 0 - 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 - isReadable: 0 - streamingMipmaps: 1 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 3 - 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: 12 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 2 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_light.exr b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_light.exr index 4b69e0b5d..fcfa2a9e9 100644 Binary files a/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_light.exr and b/GQ_TongXin/Assets/Scenes/SampleSceneG/Lightmap-1_comp_light.exr differ diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/ReflectionProbe-0.exr b/GQ_TongXin/Assets/Scenes/SampleSceneG/ReflectionProbe-0.exr index 785e18899..836e25e39 100644 Binary files a/GQ_TongXin/Assets/Scenes/SampleSceneG/ReflectionProbe-0.exr and b/GQ_TongXin/Assets/Scenes/SampleSceneG/ReflectionProbe-0.exr differ diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/ReflectionProbe-1.exr b/GQ_TongXin/Assets/Scenes/SampleSceneG/ReflectionProbe-1.exr index 3c2d8224a..10c61a217 100644 Binary files a/GQ_TongXin/Assets/Scenes/SampleSceneG/ReflectionProbe-1.exr and b/GQ_TongXin/Assets/Scenes/SampleSceneG/ReflectionProbe-1.exr differ diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG/ReflectionProbe-2.exr b/GQ_TongXin/Assets/Scenes/SampleSceneG/ReflectionProbe-2.exr index f2e0c3baa..fe090c541 100644 Binary files a/GQ_TongXin/Assets/Scenes/SampleSceneG/ReflectionProbe-2.exr and b/GQ_TongXin/Assets/Scenes/SampleSceneG/ReflectionProbe-2.exr differ