From 5f88172d00b6375cbe3fd306ef06828d50cb9492 Mon Sep 17 00:00:00 2001 From: zxl Date: Fri, 14 Feb 2025 17:59:27 +0800 Subject: [PATCH] =?UTF-8?q?mod=EF=BC=9A=E5=85=B6=E4=BB=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../Settings/URP-HighFidelity-Renderer.asset | 4 +- JinChanChan.sln | 44 +++++++++++++++++++ ProjectSettings/EditorSettings.asset | 4 +- ProjectSettings/ProjectSettings.asset | 5 ++- 5 files changed, 54 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6e92a2f..c0f7347 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ Temp/ yoo /Assets/DemoGame/GameScript/Hotfix/Generate *.user +*.sln diff --git a/Assets/Settings/URP-HighFidelity-Renderer.asset b/Assets/Settings/URP-HighFidelity-Renderer.asset index 9bb7a06..be527e4 100644 --- a/Assets/Settings/URP-HighFidelity-Renderer.asset +++ b/Assets/Settings/URP-HighFidelity-Renderer.asset @@ -43,6 +43,7 @@ MonoBehaviour: m_RendererFeatureMap: adc0de57c6d2eee5 m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} + xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} @@ -58,7 +59,7 @@ MonoBehaviour: type: 3} objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} - m_AssetVersion: 1 + m_AssetVersion: 2 m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 @@ -75,6 +76,7 @@ MonoBehaviour: m_ShadowTransparentReceive: 1 m_RenderingMode: 0 m_DepthPrimingMode: 1 + m_CopyDepthMode: 0 m_AccurateGbufferNormals: 0 m_ClusteredRendering: 0 m_TileSize: 32 diff --git a/JinChanChan.sln b/JinChanChan.sln index c9696ca..1eb89e4 100644 --- a/JinChanChan.sln +++ b/JinChanChan.sln @@ -3,8 +3,30 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{db430628-afcc-15b9-a13d-1b1445c0ac9e}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask", "UniTask.csproj", "{b33caf15-00db-b242-2798-94edfc2cf1ca}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Linq", "UniTask.Linq.csproj", "{1e901612-5c3c-b94d-9db5-2be9b9df0073}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IngameDebugConsole.Runtime", "IngameDebugConsole.Runtime.csproj", "{7be0dff6-09ef-113f-7cd3-fef37a443a86}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{661b6135-93f9-52e6-06de-5ff2d18ce282}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.TextMeshPro", "UniTask.TextMeshPro.csproj", "{c8404026-038c-5766-1448-fc8a21f634ef}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.DOTween", "UniTask.DOTween.csproj", "{d741516d-fe49-ad54-6737-d1a789d3fd68}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Addressables", "UniTask.Addressables.csproj", "{984919b2-accc-eb35-0e1e-d329cdd4ed80}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{545f664e-4dc3-d197-fc2a-dc342731d9f8}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Editor", "UniTask.Editor.csproj", "{1a76d137-0d21-c471-5d99-592d7abeae97}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor-firstpass", "Assembly-CSharp-Editor-firstpass.csproj", "{01b899be-da25-212b-20cb-9f7efc1eb26d}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IngameDebugConsole.Editor", "IngameDebugConsole.Editor.csproj", "{ad421ac5-8ea7-b58b-bdb3-3168c60dfc12}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sirenix.OdinInspector.Modules.UnityMathematics", "Sirenix.OdinInspector.Modules.UnityMathematics.csproj", "{6e2d16b1-6570-c20b-4370-8c536f56d41b}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -12,8 +34,30 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {db430628-afcc-15b9-a13d-1b1445c0ac9e}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {db430628-afcc-15b9-a13d-1b1445c0ac9e}.Debug|Any CPU.Build.0 = Debug|Any CPU + {b33caf15-00db-b242-2798-94edfc2cf1ca}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {b33caf15-00db-b242-2798-94edfc2cf1ca}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1e901612-5c3c-b94d-9db5-2be9b9df0073}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1e901612-5c3c-b94d-9db5-2be9b9df0073}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7be0dff6-09ef-113f-7cd3-fef37a443a86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7be0dff6-09ef-113f-7cd3-fef37a443a86}.Debug|Any CPU.Build.0 = Debug|Any CPU + {661b6135-93f9-52e6-06de-5ff2d18ce282}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {661b6135-93f9-52e6-06de-5ff2d18ce282}.Debug|Any CPU.Build.0 = Debug|Any CPU + {c8404026-038c-5766-1448-fc8a21f634ef}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {c8404026-038c-5766-1448-fc8a21f634ef}.Debug|Any CPU.Build.0 = Debug|Any CPU + {d741516d-fe49-ad54-6737-d1a789d3fd68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {d741516d-fe49-ad54-6737-d1a789d3fd68}.Debug|Any CPU.Build.0 = Debug|Any CPU + {984919b2-accc-eb35-0e1e-d329cdd4ed80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {984919b2-accc-eb35-0e1e-d329cdd4ed80}.Debug|Any CPU.Build.0 = Debug|Any CPU {545f664e-4dc3-d197-fc2a-dc342731d9f8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {545f664e-4dc3-d197-fc2a-dc342731d9f8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1a76d137-0d21-c471-5d99-592d7abeae97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1a76d137-0d21-c471-5d99-592d7abeae97}.Debug|Any CPU.Build.0 = Debug|Any CPU + {01b899be-da25-212b-20cb-9f7efc1eb26d}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {01b899be-da25-212b-20cb-9f7efc1eb26d}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ad421ac5-8ea7-b58b-bdb3-3168c60dfc12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ad421ac5-8ea7-b58b-bdb3-3168c60dfc12}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6e2d16b1-6570-c20b-4370-8c536f56d41b}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6e2d16b1-6570-c20b-4370-8c536f56d41b}.Debug|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index 0b0999b..b242eee 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -26,7 +26,7 @@ EditorSettings: m_EnterPlayModeOptionsEnabled: 0 m_EnterPlayModeOptions: 3 m_GameObjectNamingDigits: 1 - m_GameObjectNamingScheme: 0 + m_GameObjectNamingScheme: 2 m_AssetNamingUsesSpace: 1 m_UseLegacyProbeSampleCount: 0 m_SerializeInlineMappingsOnOneLine: 0 @@ -40,3 +40,5 @@ EditorSettings: m_CacheServerEnableUpload: 1 m_CacheServerEnableAuth: 0 m_CacheServerEnableTls: 0 + m_CacheServerValidationMode: 2 + m_CacheServerDownloadBatchSize: 128 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index fc9240c..64dbfb6 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -791,7 +791,8 @@ PlayerSettings: webGLThreadsSupport: 0 webGLDecompressionFallback: 0 webGLPowerPreference: 2 - scriptingDefineSymbols: {} + scriptingDefineSymbols: + Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1 additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} @@ -812,7 +813,7 @@ PlayerSettings: tvOS: 1 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 - allowUnsafeCode: 0 + allowUnsafeCode: 1 useDeterministicCompilation: 1 enableRoslynAnalyzers: 1 selectedPlatform: 0