From e4288313618c74f5d43c5610f878cc06dfb516ea Mon Sep 17 00:00:00 2001 From: bzx <496597135@qq.com> Date: Sat, 27 Sep 2025 16:30:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Shaders/ControllerRay.mat.meta | 2 +- Assets/Shaders/Fresnel.mat.meta | 2 +- Assets/Shaders/GhostGlow.shadergraph.meta | 2 +- Assets/Shaders/MRObStacle.shader.meta | 2 +- Assets/Shaders/MRObstacle.mat.meta | 2 +- Assets/Shaders/MRParticle.shader.meta | 2 +- Assets/Shaders/MRSKY.mat.meta | 2 +- Assets/Shaders/MRSky.shader.meta | 2 +- Assets/Shaders/Overlay.shader.meta | 2 +- Assets/Shaders/nengliangzhao.shadergraph.meta | 2 +- ProjectSettings/DynamicsManager.asset | 8 +- ProjectSettings/GraphicsSettings.asset | 9 +- ProjectSettings/InputManager.asset | 192 ------------------ 13 files changed, 18 insertions(+), 211 deletions(-) diff --git a/Assets/Shaders/ControllerRay.mat.meta b/Assets/Shaders/ControllerRay.mat.meta index 7560e02e..19c3de74 100644 --- a/Assets/Shaders/ControllerRay.mat.meta +++ b/Assets/Shaders/ControllerRay.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 90670cf001d1eed48bc91b14b67fb5ad +guid: 4022bb8ca47d1de468993152b805f7ee NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/Shaders/Fresnel.mat.meta b/Assets/Shaders/Fresnel.mat.meta index e8df27db..f177516b 100644 --- a/Assets/Shaders/Fresnel.mat.meta +++ b/Assets/Shaders/Fresnel.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5657ba7c13269bd40a6d7b7432cd3474 +guid: 3fa28d0156beb554a9c1fb11f9172d20 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Shaders/GhostGlow.shadergraph.meta b/Assets/Shaders/GhostGlow.shadergraph.meta index 46835f86..680937a8 100644 --- a/Assets/Shaders/GhostGlow.shadergraph.meta +++ b/Assets/Shaders/GhostGlow.shadergraph.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0820a0e982543984ba06bc715cb33c89 +guid: 69150944c9e16de4ebd3cceaa94267c2 ScriptedImporter: fileIDToRecycleName: 4800000: MainAsset diff --git a/Assets/Shaders/MRObStacle.shader.meta b/Assets/Shaders/MRObStacle.shader.meta index 68f379f7..86320c19 100644 --- a/Assets/Shaders/MRObStacle.shader.meta +++ b/Assets/Shaders/MRObStacle.shader.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 05558404f84764b4ba348a7fc31469aa +guid: 175b9957198fb9046ae7b39ef5781d1b ShaderImporter: externalObjects: {} defaultTextures: [] diff --git a/Assets/Shaders/MRObstacle.mat.meta b/Assets/Shaders/MRObstacle.mat.meta index 4599605a..756bfc53 100644 --- a/Assets/Shaders/MRObstacle.mat.meta +++ b/Assets/Shaders/MRObstacle.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f497d0849aa05ab4fbde939793107402 +guid: cfe4109c93880bb43a107d28e517bfd0 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/Shaders/MRParticle.shader.meta b/Assets/Shaders/MRParticle.shader.meta index 02de7ae2..4bbe633a 100644 --- a/Assets/Shaders/MRParticle.shader.meta +++ b/Assets/Shaders/MRParticle.shader.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 18ab32eb7444174499d422a08d7cd77d +guid: 428edde3dd86f0e419ef6538d61962f6 ShaderImporter: externalObjects: {} defaultTextures: [] diff --git a/Assets/Shaders/MRSKY.mat.meta b/Assets/Shaders/MRSKY.mat.meta index 60d58470..a83d70d8 100644 --- a/Assets/Shaders/MRSKY.mat.meta +++ b/Assets/Shaders/MRSKY.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3f380a5a0ae41bb42b595d132a3b6c3e +guid: d89b9f3501b393d429ae9c7fe2d8088a NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/Shaders/MRSky.shader.meta b/Assets/Shaders/MRSky.shader.meta index 1856e53b..8389f6a7 100644 --- a/Assets/Shaders/MRSky.shader.meta +++ b/Assets/Shaders/MRSky.shader.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dd976aede5787e34ebf4ad3f3e07c0f5 +guid: 20642da28439d1441affd10faef4a44b ShaderImporter: externalObjects: {} defaultTextures: [] diff --git a/Assets/Shaders/Overlay.shader.meta b/Assets/Shaders/Overlay.shader.meta index 3cce0d0e..5771f4c5 100644 --- a/Assets/Shaders/Overlay.shader.meta +++ b/Assets/Shaders/Overlay.shader.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 27806b13bc70d3047a431df16ee82117 +guid: ce81209073e9a6145a163d0f66b5b2b5 ShaderImporter: externalObjects: {} defaultTextures: [] diff --git a/Assets/Shaders/nengliangzhao.shadergraph.meta b/Assets/Shaders/nengliangzhao.shadergraph.meta index 77f81640..684100d9 100644 --- a/Assets/Shaders/nengliangzhao.shadergraph.meta +++ b/Assets/Shaders/nengliangzhao.shadergraph.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9b2a8ecf8286b544ba62ebb6967aacb4 +guid: 2630cda134c8f7f44903d8599eda1a6b ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index d9ea6315..aa8696df 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -3,7 +3,7 @@ --- !u!55 &1 PhysicsManager: m_ObjectHideFlags: 0 - serializedVersion: 14 + serializedVersion: 13 m_Gravity: {x: 0, y: -9.81, z: 0} m_DefaultMaterial: {fileID: 0} m_BounceThreshold: 2 @@ -18,11 +18,10 @@ PhysicsManager: m_ClothInterCollisionDistance: 0.1 m_ClothInterCollisionStiffness: 0.2 m_ContactsGeneration: 1 - m_LayerCollisionMatrix: fffff0fffffff0fffff7f0fffffff4fffff7f0fffff7f0ffffc7f0ff7ffdf3ffffcff0ff7ffff0fffff7f0ff8bf3f8ffbffef0ffbffef0fffffff0fffffff0ff8000f0ff8000f0ff0800f4ff0008f0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - m_SimulationMode: 0 + m_LayerCollisionMatrix: fffff0fffff7f0fffff7f0fffffff4fffff7f0fffff7f0ffffc7f0ff7ffdf3ffffcff0ff7ffff0fffff7f0ff89f3f8ffbffef0ffbffef0fffffff0fffffff0ff8000f0ff8000f0ff0800f4ff0008f0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_AutoSimulation: 1 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 0 - m_InvokeCollisionCallbacks: 1 m_ClothInterCollisionSettingsToggle: 0 m_ClothGravity: {x: 0, y: -9.81, z: 0} m_ContactPairsMode: 0 @@ -37,4 +36,3 @@ PhysicsManager: m_ImprovedPatchFriction: 0 m_SolverType: 0 m_DefaultMaxAngularSpeed: 50 - m_FastMotionThreshold: 3.4028235e+38 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index b7aec058..c0ca1652 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 15 + serializedVersion: 14 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -13,6 +13,9 @@ GraphicsSettings: m_ScreenSpaceShadows: m_Mode: 1 m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} + m_LegacyDeferred: + m_Mode: 1 + m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} m_DepthNormals: m_Mode: 1 m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} @@ -97,7 +100,6 @@ GraphicsSettings: m_LightmapStripping: 0 m_FogStripping: 0 m_InstancingStripping: 0 - m_BrgStripping: 0 m_LightmapKeepPlain: 1 m_LightmapKeepDirCombined: 1 m_LightmapKeepDynamicPlain: 1 @@ -108,12 +110,11 @@ GraphicsSettings: m_FogKeepExp: 1 m_FogKeepExp2: 1 m_AlbedoSwatchInfos: [] - m_LightsUseLinearIntensity: 0 + m_LightsUseLinearIntensity: 1 m_LightsUseColorTemperature: 1 m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 m_SRPDefaultSettings: UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: e6e8a36f6e6603a4281459ece690eb0f, type: 2} - m_LightProbeOutsideHullStrategy: 0 m_CameraRelativeLightCulling: 0 m_CameraRelativeShadowCulling: 0 diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 05cf9550..b00cb797 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -293,196 +293,4 @@ InputManager: type: 0 axis: 0 joyNum: 0 - - serializedVersion: 3 - m_Name: Enable Debug Button 1 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left ctrl - altNegativeButton: - altPositiveButton: joystick button 8 - gravity: 0 - dead: 0 - sensitivity: 0 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Enable Debug Button 2 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: backspace - altNegativeButton: - altPositiveButton: joystick button 9 - gravity: 0 - dead: 0 - sensitivity: 0 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Debug Reset - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left alt - altNegativeButton: - altPositiveButton: joystick button 1 - gravity: 0 - dead: 0 - sensitivity: 0 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Debug Next - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: page down - altNegativeButton: - altPositiveButton: joystick button 5 - gravity: 0 - dead: 0 - sensitivity: 0 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Debug Previous - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: page up - altNegativeButton: - altPositiveButton: joystick button 4 - gravity: 0 - dead: 0 - sensitivity: 0 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Debug Validate - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: return - altNegativeButton: - altPositiveButton: joystick button 0 - gravity: 0 - dead: 0 - sensitivity: 0 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Debug Persistent - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: right shift - altNegativeButton: - altPositiveButton: joystick button 2 - gravity: 0 - dead: 0 - sensitivity: 0 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Debug Multiplier - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left shift - altNegativeButton: - altPositiveButton: joystick button 3 - gravity: 0 - dead: 0 - sensitivity: 0 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Debug Horizontal - descriptiveName: - descriptiveNegativeName: - negativeButton: left - positiveButton: right - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Debug Vertical - descriptiveName: - descriptiveNegativeName: - negativeButton: down - positiveButton: up - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Debug Vertical - descriptiveName: - descriptiveNegativeName: - negativeButton: down - positiveButton: up - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 2 - axis: 6 - joyNum: 0 - - serializedVersion: 3 - m_Name: Debug Horizontal - descriptiveName: - descriptiveNegativeName: - negativeButton: left - positiveButton: right - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 2 - axis: 5 - joyNum: 0 m_UsePhysicalKeys: 0