From 8dd244e90c57276cc266f316ad20c96f32f48c7d Mon Sep 17 00:00:00 2001 From: m0_75251201 Date: Fri, 29 Aug 2025 08:58:36 +0800 Subject: [PATCH] =?UTF-8?q?(client)=20fix:=E4=BF=AE=E5=A4=8D=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=B5=8F=E8=A7=88=E7=95=8C=E9=9D=A2=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Client/Assets/Scripts/Data/AudioDef.cs | 7 ++++ Client/Assets/Scripts/Data/AudioDef.cs.meta | 3 ++ Client/Assets/Scripts/Logging/LogCapturer.cs | 4 +-- .../Scripts/Logging/LoggerManagerWrapper.cs | 1 + ...niversalRenderPipelineGlobalSettings.asset | 5 +++ Client/Packages/packages-lock.json | 32 +++++++++---------- .../ProjectSettings/ShaderGraphSettings.asset | 1 - 7 files changed, 33 insertions(+), 20 deletions(-) create mode 100644 Client/Assets/Scripts/Data/AudioDef.cs create mode 100644 Client/Assets/Scripts/Data/AudioDef.cs.meta diff --git a/Client/Assets/Scripts/Data/AudioDef.cs b/Client/Assets/Scripts/Data/AudioDef.cs new file mode 100644 index 0000000..35d5460 --- /dev/null +++ b/Client/Assets/Scripts/Data/AudioDef.cs @@ -0,0 +1,7 @@ +namespace Data +{ + public class AudioDef:Define + { + public string path; + } +} \ No newline at end of file diff --git a/Client/Assets/Scripts/Data/AudioDef.cs.meta b/Client/Assets/Scripts/Data/AudioDef.cs.meta new file mode 100644 index 0000000..e63dd23 --- /dev/null +++ b/Client/Assets/Scripts/Data/AudioDef.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ea58fdcb622943429532fd1b9d264340 +timeCreated: 1756397633 \ No newline at end of file diff --git a/Client/Assets/Scripts/Logging/LogCapturer.cs b/Client/Assets/Scripts/Logging/LogCapturer.cs index 80ef3f9..29f19f4 100644 --- a/Client/Assets/Scripts/Logging/LogCapturer.cs +++ b/Client/Assets/Scripts/Logging/LogCapturer.cs @@ -35,10 +35,10 @@ namespace Logging } } - static LogCapturer() + public static void Init() { - // 注册全局日志回调 Application.logMessageReceivedThreaded += HandleLog; + } // 日志处理回调 diff --git a/Client/Assets/Scripts/Logging/LoggerManagerWrapper.cs b/Client/Assets/Scripts/Logging/LoggerManagerWrapper.cs index 7c460ce..bad65f3 100644 --- a/Client/Assets/Scripts/Logging/LoggerManagerWrapper.cs +++ b/Client/Assets/Scripts/Logging/LoggerManagerWrapper.cs @@ -9,6 +9,7 @@ namespace Logging public void Init() { Logging.UnityLogger.Init(); + LogCapturer.Init(); } public void Clear() { diff --git a/Client/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Client/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index e17bd8d..2a5b23e 100644 --- a/Client/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Client/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -94,6 +94,8 @@ MonoBehaviour: references: version: 2 RefIds: + - rid: -2 + type: {class: , ns: , asm: } - rid: 6852985685364965376 type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -107,6 +109,9 @@ MonoBehaviour: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3} m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} + m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} + m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} + m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} diff --git a/Client/Packages/packages-lock.json b/Client/Packages/packages-lock.json index 76e1efc..9fb16e3 100644 --- a/Client/Packages/packages-lock.json +++ b/Client/Packages/packages-lock.json @@ -20,8 +20,8 @@ "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.tilemap": "1.0.0", "com.unity.2d.tilemap": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" @@ -36,7 +36,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.24", + "version": "1.8.23", "depth": 2, "source": "registry", "dependencies": { @@ -53,14 +53,13 @@ "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "2.5.7", + "version": "2.5.1", "depth": 2, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.19", - "com.unity.mathematics": "1.3.2", - "com.unity.nuget.mono-cecil": "1.11.5", - "com.unity.test-framework": "1.4.6", + "com.unity.burst": "1.8.17", + "com.unity.test-framework": "1.4.5", + "com.unity.nuget.mono-cecil": "1.11.4", "com.unity.test-framework.performance": "3.0.3" }, "url": "https://packages.unity.com" @@ -114,14 +113,14 @@ } }, "com.unity.nuget.mono-cecil": { - "version": "1.11.5", + "version": "1.11.4", "depth": 3, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "17.2.0", + "version": "17.1.0", "depth": 1, "source": "builtin", "dependencies": { @@ -136,12 +135,12 @@ } }, "com.unity.render-pipelines.universal": { - "version": "17.2.0", + "version": "17.1.0", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.2.0", - "com.unity.shadergraph": "17.2.0", + "com.unity.render-pipelines.core": "17.1.0", + "com.unity.shadergraph": "17.1.0", "com.unity.render-pipelines.universal-config": "17.0.3" } }, @@ -171,11 +170,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "17.2.0", + "version": "17.1.0", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.2.0", + "com.unity.render-pipelines.core": "17.1.0", "com.unity.searcher": "4.9.3" } }, @@ -204,9 +203,9 @@ "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" @@ -378,8 +377,7 @@ "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.hierarchycore": "1.0.0", - "com.unity.modules.physics": "1.0.0" + "com.unity.modules.hierarchycore": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/Client/ProjectSettings/ShaderGraphSettings.asset b/Client/ProjectSettings/ShaderGraphSettings.asset index ce8c243..e66042a 100644 --- a/Client/ProjectSettings/ShaderGraphSettings.asset +++ b/Client/ProjectSettings/ShaderGraphSettings.asset @@ -13,7 +13,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: shaderVariantLimit: 128 - overrideShaderVariantLimit: 0 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16 customHeatmapValues: {fileID: 0}