更新

933ae970 · 杨泽宇 · d714a262 · 933ae970 · 933ae970 · 933ae970
Commit 933ae970 authored May 18, 2024 by 杨泽宇
40 changed files
--- a/Assets/BakeryLightmaps.meta
+++ b/Assets/BakeryLightmaps.meta
+fileFormatVersion: 2
+guid: 717deaeb4bb70e745a09653270a79f87
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/BakeryLightmaps/场景.meta
+++ b/Assets/BakeryLightmaps/场景.meta
+fileFormatVersion: 2
+guid: ea7f0ad6697d04f40844bc7433f7d4b7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Components/TouristModeController.cs
+++ b/Assets/Scripts/Components/TouristModeController.cs
@@ -18,8 +18,12 @@ public class TouristModeController : MonoBehaviour
    public GameObject FreeCamera;
    [Tooltip("固定摄像头中动画的名字")]
    public string animName;
+    [Tooltip("模式选择UI")]
+    public GameObject ModeSelectionUI;
    [Tooltip("导览模式UI")]
    public GameObject VisitUI;
+    [Tooltip("机器巡检模式UI")]
+    public GameObject MachineInspectionUI;
    [Tooltip("复位按钮")]
    public Button ResetBtn;
    [Tooltip("播/放按钮")]
@@ -85,6 +89,8 @@ public class TouristModeController : MonoBehaviour
        ExitObserve();
        RobotInspection.SetActive(true);
        IsArtificial = true;
+        ModeSelectionUI.SetActive(false);
+        MachineInspectionUI.SetActive(true);
    }


@@ -107,6 +113,8 @@ public class TouristModeController : MonoBehaviour
        ExitObserve();
        FixCamera.SetActive(true);
        VisitUI.SetActive(true);
+        ModeSelectionUI.SetActive(false);
+        MachineInspectionUI.SetActive(false);
        Player.BackToInitPosition();
        Player.IsPause = true;
    }
@@ -196,6 +204,8 @@ public class TouristModeController : MonoBehaviour
        //FreeCamera.SetActive(false);
        FixCamera.SetActive(false);
        VisitUI.SetActive(false);
+        ModeSelectionUI.SetActive(true);
+        MachineInspectionUI.SetActive(false);
        Player.BackToInitPosition();
        Player.IsPause = false;
        Player.AutoRotate = false;

--- a/Assets/URP设置/URP-HighFidelity.asset
+++ b/Assets/URP设置/URP-HighFidelity.asset
@@ -87,7 +87,7 @@ MonoBehaviour:
  m_PrefilteringModeAdditionalLightShadows: 2
  m_PrefilterXRKeywords: 1
  m_PrefilteringModeForwardPlus: 0
-  m_PrefilteringModeDeferredRendering: 0
+  m_PrefilteringModeDeferredRendering: 2
  m_PrefilteringModeScreenSpaceOcclusion: 2
  m_PrefilterDebugKeywords: 1
  m_PrefilterWriteRenderingLayers: 1

--- a/Assets/_Scenes/1_Main.meta
+++ b/Assets/_Scenes/1_Main.meta
+fileFormatVersion: 2
+guid: 4dd7bebcf7410144ba243fc67ebb139e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Scenes/1_Main.unity
+++ b/Assets/_Scenes/1_Main.unity
--- a/Assets/_Scenes/1_Main/1_Main_371857150_probes.asset
+++ b/Assets/_Scenes/1_Main/1_Main_371857150_probes.asset
--- a/Assets/_Scenes/1_Main/1_Main_371857150_probes.asset.meta
+++ b/Assets/_Scenes/1_Main/1_Main_371857150_probes.asset.meta
+fileFormatVersion: 2
+guid: 4ea29f599fe714d428a5dbbbfee8fd8b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Scenes/1_Main/ReflectionProbe-0.exr
+++ b/Assets/_Scenes/1_Main/ReflectionProbe-0.exr
--- a/Assets/_Scenes/1_Main/ReflectionProbe-0.exr.meta
+++ b/Assets/_Scenes/1_Main/ReflectionProbe-0.exr.meta
+fileFormatVersion: 2
+guid: abbc5e0d97878d84a99342c5e6c7dcd7
+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: 2048
+    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: 2048
+    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: 2048
+    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: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Scenes/1_Main/场景.meta
+++ b/Assets/_Scenes/1_Main/场景.meta
+fileFormatVersion: 2
+guid: 1f1d1fe15d9e4c442923e26c59fe7169
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Scenes/1_Main/场景/1_Main_LM0_final.hdr
+++ b/Assets/_Scenes/1_Main/场景/1_Main_LM0_final.hdr
--- a/Assets/_Scenes/1_Main/场景/1_Main_LM0_final.hdr.meta
+++ b/Assets/_Scenes/1_Main/场景/1_Main_LM0_final.hdr.meta
+fileFormatVersion: 2
+guid: 800acfd8ca5c7f54cbb4bc4408e54dad
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    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: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 16, y: 16, z: 16, w: 16}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 0
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 6
+  textureShape: 1
+  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: 512
+    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: Standalone
+    maxTextureSize: 2048
+    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: 2048
+    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: 2048
+    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: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Scenes/1_Main/场景/1_Main_LMA1_final.hdr
+++ b/Assets/_Scenes/1_Main/场景/1_Main_LMA1_final.hdr
--- a/Assets/_Scenes/1_Main/场景/1_Main_LMA1_final.hdr.meta
+++ b/Assets/_Scenes/1_Main/场景/1_Main_LMA1_final.hdr.meta
+fileFormatVersion: 2
+guid: 871809be0aafdc94880e7da1e444a991
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    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: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 16, y: 16, z: 16, w: 16}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 0
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 6
+  textureShape: 1
+  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: 512
+    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: Standalone
+    maxTextureSize: 2048
+    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: 2048
+    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: 2048
+    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: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Scenes/1_Main/场景/1_Main_LMA2_final.hdr
+++ b/Assets/_Scenes/1_Main/场景/1_Main_LMA2_final.hdr
--- a/Assets/_Scenes/1_Main/场景/1_Main_LMA2_final.hdr.meta
+++ b/Assets/_Scenes/1_Main/场景/1_Main_LMA2_final.hdr.meta
+fileFormatVersion: 2
+guid: f3645f27f44e7d740af4ece2f5ae1128
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    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: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 16, y: 16, z: 16, w: 16}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 0
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 6
+  textureShape: 1
+  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: 512
+    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: Standalone
+    maxTextureSize: 2048
+    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: 2048
+    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: 2048
+    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: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Scenes/1_Main/场景/1_Main_LMA3_final.hdr
+++ b/Assets/_Scenes/1_Main/场景/1_Main_LMA3_final.hdr
--- a/Assets/_Scenes/1_Main/场景/1_Main_LMA3_final.hdr.meta
+++ b/Assets/_Scenes/1_Main/场景/1_Main_LMA3_final.hdr.meta
+fileFormatVersion: 2
+guid: 4bbc7b614852f8942aa57d939871918d
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    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: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 16, y: 16, z: 16, w: 16}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 0
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 6
+  textureShape: 1
+  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: 256
+    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: Standalone
+    maxTextureSize: 2048
+    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: 2048
+    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: 2048
+    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: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_Scenes/测试场景/HJL.unity
+++ b/Assets/_Scenes/测试场景/HJL.unity
--- a/Assets/_Scenes/测试场景/HJL/Box Volume Profile 1.asset
+++ b/Assets/_Scenes/测试场景/HJL/Box Volume Profile 1.asset
@@ -133,7 +133,7 @@ MonoBehaviour:
  active: 1
  postExposure:
    m_OverrideState: 1
-    m_Value: -0.22
+    m_Value: 0.43
  contrast:
    m_OverrideState: 1
    m_Value: -27.9

--- a/Assets/_Scenes/测试场景/HJL/HJL_371857150_probes.asset
+++ b/Assets/_Scenes/测试场景/HJL/HJL_371857150_probes.asset
--- a/Assets/_Scenes/测试场景/HJL/场景/HJL_LM0_final.hdr
+++ b/Assets/_Scenes/测试场景/HJL/场景/HJL_LM0_final.hdr
--- a/Assets/_Scenes/测试场景/HJL/场景/HJL_LMA1_final.hdr
+++ b/Assets/_Scenes/测试场景/HJL/场景/HJL_LMA1_final.hdr
--- a/Assets/_Scenes/测试场景/HJL/场景/HJL_LMA1_final.hdr.meta
+++ b/Assets/_Scenes/测试场景/HJL/场景/HJL_LMA1_final.hdr.meta
@@ -6,7 +6,7 @@ TextureImporter:
  serializedVersion: 12
  mipmaps:
    mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
    sRGBTexture: 1
    linearTexture: 0
    fadeOut: 0
@@ -37,10 +37,10 @@ TextureImporter:
    filterMode: 1
    aniso: 1
    mipBias: 0
-    wrapU: 0
-    wrapV: 0
-    wrapW: 0
-  nPOTScale: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 1
  lightmap: 0
  compressionQuality: 50
  spriteMode: 1
@@ -51,10 +51,10 @@ TextureImporter:
  spritePixelsToUnits: 100
  spriteBorder: {x: 16, y: 16, z: 16, w: 16}
  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
+  alphaUsage: 0
  alphaIsTransparency: 0
  spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 6
  textureShape: 1
  singleChannelComponent: 0
  flipbookRows: 1

--- a/Assets/_Scenes/测试场景/HJL/场景/HJL_LMA2_final.hdr
+++ b/Assets/_Scenes/测试场景/HJL/场景/HJL_LMA2_final.hdr
--- a/Assets/_Scenes/测试场景/HJL/场景/HJL_LMA2_final.hdr.meta
+++ b/Assets/_Scenes/测试场景/HJL/场景/HJL_LMA2_final.hdr.meta
@@ -6,7 +6,7 @@ TextureImporter:
  serializedVersion: 12
  mipmaps:
    mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
    sRGBTexture: 1
    linearTexture: 0
    fadeOut: 0
@@ -37,10 +37,10 @@ TextureImporter:
    filterMode: 1
    aniso: 1
    mipBias: 0
-    wrapU: 0
-    wrapV: 0
-    wrapW: 0
-  nPOTScale: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 1
  lightmap: 0
  compressionQuality: 50
  spriteMode: 1
@@ -51,10 +51,10 @@ TextureImporter:
  spritePixelsToUnits: 100
  spriteBorder: {x: 16, y: 16, z: 16, w: 16}
  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
+  alphaUsage: 0
  alphaIsTransparency: 0
  spriteTessellationDetail: -1
-  textureType: 0
+  textureType: 6
  textureShape: 1
  singleChannelComponent: 0
  flipbookRows: 1

--- a/Assets/_Scenes/测试场景/HJL/场景/HJL_LMA3_final.hdr
+++ b/Assets/_Scenes/测试场景/HJL/场景/HJL_LMA3_final.hdr
--- a/Assets/_Scenes/测试场景/HJL/场景/HJL_LMA3_final.hdr.meta
+++ b/Assets/_Scenes/测试场景/HJL/场景/HJL_LMA3_final.hdr.meta
+fileFormatVersion: 2
+guid: ad38d845fd2ac9341a00fb1176fd82a3
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    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: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 16, y: 16, z: 16, w: 16}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 0
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 6
+  textureShape: 1
+  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: 256
+    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: Standalone
+    maxTextureSize: 2048
+    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: 2048
+    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: 2048
+    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: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/_美术资源/模型/建筑/地面_蓝色瓷砖.mat
+++ b/Assets/_美术资源/模型/建筑/地面_蓝色瓷砖.mat
@@ -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.8773585, g: 0.8773585, b: 0.8773585, a: 1}
+    - _Color: {r: 0.8773585, g: 0.8773585, b: 0.8773585, a: 1}
    - _EmissionColor: {r: 1.4017444, g: 1.6688899, b: 1.6981132, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
--- a/Assets/_美术资源/模型/建筑/白色_墙_粗糙.mat
+++ b/Assets/_美术资源/模型/建筑/白色_墙_粗糙.mat
@@ -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.7169812, g: 0.7169812, b: 0.7169812, a: 1}
+    - _Color: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1}
    - _EmissionColor: {r: 1.4017444, g: 1.6688899, b: 1.6981132, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
--- a/Assets/_美术资源/模型/建筑/科曼_墙体.fbx.meta
+++ b/Assets/_美术资源/模型/建筑/科曼_墙体.fbx.meta
@@ -53,7 +53,7 @@ ModelImporter:
    nodeNameCollisionStrategy: 0
    fileIdsGeneration: 2
    swapUVChannels: 0
-    generateSecondaryUV: 1
+    generateSecondaryUV: 0
    useFileUnits: 1
    keepQuads: 0
    weldVertices: 1

--- a/Assets/_预设/场景.prefab
+++ b/Assets/_预设/场景.prefab
--- a/Assets/第三方库/Bakery/Editor/x64/Bakery/.denoiserlog.txt
+++ b/Assets/第三方库/Bakery/Editor/x64/Bakery/.denoiserlog.txt
@@ -506,3 +506,98 @@ Tiles: 1
 Loading shader denoisePrepareOIDN.ptx::oxMain...
 Loading shader denoiseFinishOIDN.ptx::oxMain...
 Done
+2024-5-18
+Init...
+Tiles: 1
+Error (-1): Unknown error (Details: Function "_rtBufferCreate" caught exception: Encountered a rtcore error: m_exports->rtcDeviceContextCreateForCUDA( context, devctx ) returned (2): Invalid device context)
+
+2024-5-18
+Init...
+Tiles: 1
+Loading shader denoisePrepare.ptx::oxMain...
+Loading shader denoiseFinish.ptx::oxMain...
+Done
+2024-5-18
+Init...
+Tiles: 1
+Loading shader denoisePrepare72.ptx::oxMain...
+Loading shader denoiseFinish72.ptx::oxMain...
+Done
+2024-5-18
+Init...
+Tiles: 1
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
+2024-5-18
+Init...
+Tiles: 1
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
+2024-5-18
+Init...
+Tiles: 1
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
+2024-5-18
+Init...
+Tiles: 1
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
+2024-5-18
+Init...
+Tiles: 1
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
+2024-5-18
+Init...
+Tiles: 1
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
+2024-5-18
+Init...
+Tiles: 1
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
+2024-5-18
+Init...
+Tiles: 1
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
+2024-5-18
+Init...
+Tiles: 1
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
+2024-5-18
+Init...
+Tiles: 1
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
+2024-5-18
+Init...
+Tiles: 1
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
+2024-5-18
+Init...
+Tiles: 1
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
+2024-5-18
+Init...
+Tiles: 1
+Loading shader denoisePrepareOIDN.ptx::oxMain...
+Loading shader denoiseFinishOIDN.ptx::oxMain...
+Done
--- a/Assets/第三方库/Bakery/Editor/x64/Bakery/.ftracelog.txt
+++ b/Assets/第三方库/Bakery/Editor/x64/Bakery/.ftracelog.txt
--- a/Assets/第三方库/Bakery/Editor/x64/Bakery/hwtestdata/image.lz4
+++ b/Assets/第三方库/Bakery/Editor/x64/Bakery/hwtestdata/image.lz4
--- a/Assets/第三方库/Bakery/_tempScene.unity
+++ b/Assets/第三方库/Bakery/_tempScene.unity
@@ -97,9 +97,9 @@ LightmapSettings:
    m_ExportTrainingData: 0
    m_TrainingDataDestination: TrainingData
    m_LightProbeSampleCountMultiplier: 4
-  m_LightingDataAsset: {fileID: 112000000, guid: 3da91021da143524ebb597b5349121e6,
+  m_LightingDataAsset: {fileID: 112000000, guid: 4ea29f599fe714d428a5dbbbfee8fd8b,
    type: 2}
-  m_LightingSettings: {fileID: 1112314491}
+  m_LightingSettings: {fileID: 517136768}
 --- !u!196 &4
 NavMeshSettings:
  serializedVersion: 2
@@ -124,71 +124,7 @@ NavMeshSettings:
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
--- !u!850595691 &1112314491
-LightingSettings:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  serializedVersion: 6
-  m_GIWorkflowMode: 1
-  m_EnableBakedLightmaps: 1
-  m_EnableRealtimeLightmaps: 0
-  m_RealtimeEnvironmentLighting: 1
-  m_BounceScale: 1
-  m_AlbedoBoost: 1
-  m_IndirectOutputScale: 1
-  m_UsingShadowmask: 1
-  m_BakeBackend: 1
-  m_LightmapMaxSize: 1024
-  m_BakeResolution: 40
-  m_Padding: 2
-  m_LightmapCompression: 3
-  m_AO: 0
-  m_AOMaxDistance: 1
-  m_CompAOExponent: 1
-  m_CompAOExponentDirect: 0
-  m_ExtractAO: 0
-  m_MixedBakeMode: 2
-  m_LightmapsBakeMode: 1
-  m_FilterMode: 1
-  m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
-  m_ExportTrainingData: 0
-  m_TrainingDataDestination: TrainingData
-  m_RealtimeResolution: 2
-  m_ForceWhiteAlbedo: 0
-  m_ForceUpdates: 0
-  m_FinalGather: 0
-  m_FinalGatherRayCount: 256
-  m_FinalGatherFiltering: 1
-  m_PVRCulling: 1
-  m_PVRSampling: 1
-  m_PVRDirectSampleCount: 32
-  m_PVRSampleCount: 512
-  m_PVREnvironmentSampleCount: 256
-  m_PVREnvironmentReferencePointCount: 2048
-  m_LightProbeSampleCountMultiplier: 4
-  m_PVRBounces: 2
-  m_PVRMinBounces: 2
-  m_PVREnvironmentImportanceSampling: 1
-  m_PVRFilteringMode: 1
-  m_PVRDenoiserTypeDirect: 1
-  m_PVRDenoiserTypeIndirect: 1
-  m_PVRDenoiserTypeAO: 1
-  m_PVRFilterTypeDirect: 0
-  m_PVRFilterTypeIndirect: 0
-  m_PVRFilterTypeAO: 0
-  m_PVRFilteringGaussRadiusDirect: 1
-  m_PVRFilteringGaussRadiusIndirect: 5
-  m_PVRFilteringGaussRadiusAO: 2
-  m_PVRFilteringAtrousPositionSigmaDirect: 0.5
-  m_PVRFilteringAtrousPositionSigmaIndirect: 2
-  m_PVRFilteringAtrousPositionSigmaAO: 1
-  m_PVRTiledBaking: 0
-  m_NumRaysToShootPerTexel: -1
-  m_RespectSceneVisibilityWhenBakingGI: 0
--- !u!1 &2110513475
+--- !u!1 &73149619
 GameObject:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@@ -196,8 +132,8 @@ GameObject:
  m_PrefabAsset: {fileID: 0}
  serializedVersion: 6
  m_Component:
-  - component: {fileID: 2110513477}
-  - component: {fileID: 2110513476}
+  - component: {fileID: 73149621}
+  - component: {fileID: 73149620}
  m_Layer: 0
  m_Name: New Game Object
  m_TagString: Untagged
@@ -205,13 +141,13 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!220 &2110513476
+--- !u!220 &73149620
 LightProbeGroup:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2110513475}
+  m_GameObject: {fileID: 73149619}
  m_Enabled: 1
  m_SourcePositions:
  - {x: -5.4475265, y: 3.5612288, z: 23.521616}
@@ -2347,13 +2283,13 @@ LightProbeGroup:
  - {x: 6.396854, y: 0.87462497, z: -19.130678}
  - {x: 6.396854, y: 2.2716587, z: -19.130678}
  m_Dering: 1
--- !u!4 &2110513477
+--- !u!4 &73149621
 Transform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2110513475}
+  m_GameObject: {fileID: 73149619}
  serializedVersion: 2
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 1.54, z: 0}
@@ -2362,8 +2298,72 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!850595691 &517136768
+LightingSettings:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  serializedVersion: 6
+  m_GIWorkflowMode: 1
+  m_EnableBakedLightmaps: 1
+  m_EnableRealtimeLightmaps: 0
+  m_RealtimeEnvironmentLighting: 1
+  m_BounceScale: 1
+  m_AlbedoBoost: 1
+  m_IndirectOutputScale: 1
+  m_UsingShadowmask: 1
+  m_BakeBackend: 1
+  m_LightmapMaxSize: 1024
+  m_BakeResolution: 40
+  m_Padding: 2
+  m_LightmapCompression: 3
+  m_AO: 0
+  m_AOMaxDistance: 1
+  m_CompAOExponent: 1
+  m_CompAOExponentDirect: 0
+  m_ExtractAO: 0
+  m_MixedBakeMode: 2
+  m_LightmapsBakeMode: 1
+  m_FilterMode: 1
+  m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
+  m_ExportTrainingData: 0
+  m_TrainingDataDestination: TrainingData
+  m_RealtimeResolution: 2
+  m_ForceWhiteAlbedo: 0
+  m_ForceUpdates: 0
+  m_FinalGather: 0
+  m_FinalGatherRayCount: 256
+  m_FinalGatherFiltering: 1
+  m_PVRCulling: 1
+  m_PVRSampling: 1
+  m_PVRDirectSampleCount: 32
+  m_PVRSampleCount: 512
+  m_PVREnvironmentSampleCount: 256
+  m_PVREnvironmentReferencePointCount: 2048
+  m_LightProbeSampleCountMultiplier: 4
+  m_PVRBounces: 2
+  m_PVRMinBounces: 2
+  m_PVREnvironmentImportanceSampling: 1
+  m_PVRFilteringMode: 1
+  m_PVRDenoiserTypeDirect: 1
+  m_PVRDenoiserTypeIndirect: 1
+  m_PVRDenoiserTypeAO: 1
+  m_PVRFilterTypeDirect: 0
+  m_PVRFilterTypeIndirect: 0
+  m_PVRFilterTypeAO: 0
+  m_PVRFilteringGaussRadiusDirect: 1
+  m_PVRFilteringGaussRadiusIndirect: 5
+  m_PVRFilteringGaussRadiusAO: 2
+  m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+  m_PVRFilteringAtrousPositionSigmaIndirect: 2
+  m_PVRFilteringAtrousPositionSigmaAO: 1
+  m_PVRTiledBaking: 0
+  m_NumRaysToShootPerTexel: -1
+  m_RespectSceneVisibilityWhenBakingGI: 0
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
  m_ObjectHideFlags: 0
  m_Roots:
-  - {fileID: 2110513477}
+  - {fileID: 73149621}
--- a/Assets/第三方库/Bakery/_tempScene/LightingData.asset
+++ b/Assets/第三方库/Bakery/_tempScene/LightingData.asset
--- a/Assets/第三方库/Bakery/ftGlobalStorage.asset
+++ b/Assets/第三方库/Bakery/ftGlobalStorage.asset
--- a/bakery_times.log
+++ b/bakery_times.log
@@ -23,3 +23,6 @@
 05/18/2024 19:13 | HJL | 0h 1m 4s
 05/18/2024 19:19 | HJL | 0h 1m 3s
 05/18/2024 19:23 | HJL | 0h 0m 58s
+05/18/2024 20:01 | HJL | 0h 1m 3s
+05/18/2024 20:04 | HJL | 0h 1m 3s
+05/18/2024 20:09 | 1_Main | 0h 0m 44s