From 5220b634ec96aad2c50068480fa66af1f1bfb303 Mon Sep 17 00:00:00 2001 From: m0_75251201 Date: Sun, 13 Jul 2025 09:37:23 +0800 Subject: [PATCH] =?UTF-8?q?(client)=20fix:=20=E4=BF=AE=E5=A4=8DDefine?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=97=B6=E7=9A=84=E9=80=BB=E8=BE=91=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=88=E9=94=99=E8=AF=AF=E4=BB=8Eabout=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E7=AD=9B=E9=80=89define=EF=BC=8C=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E6=96=87=E4=BB=B6=E4=B8=8D=E5=86=8D=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=AE=8C=E6=95=B4=E8=B7=AF=E5=BE=84=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Client/Assets/Scenes/Test.unity | 13 +++++++++ .../Assets/Scripts/Configs/ConfigProcessor.cs | 28 +++++++++---------- Client/Assets/Scripts/Data/DefinePack.cs | 7 +++-- Client/Assets/Scripts/Test/ClockTest.cs | 2 +- 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/Client/Assets/Scenes/Test.unity b/Client/Assets/Scenes/Test.unity index 5ea5d1d..0973207 100644 --- a/Client/Assets/Scenes/Test.unity +++ b/Client/Assets/Scenes/Test.unity @@ -616,6 +616,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1371068282} + - component: {fileID: 1371068283} m_Layer: 0 m_Name: Loader m_TagString: Untagged @@ -638,6 +639,18 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1371068283 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1371068281} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 147e91e6929d90a4fb877c0b0a6b608c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Scripts/Configs/ConfigProcessor.cs b/Client/Assets/Scripts/Configs/ConfigProcessor.cs index 86b6108..774dfea 100644 --- a/Client/Assets/Scripts/Configs/ConfigProcessor.cs +++ b/Client/Assets/Scripts/Configs/ConfigProcessor.cs @@ -160,27 +160,25 @@ namespace Configs foreach (var path in paths) { - // 获取程序所在的目录路径 - var appDirectory = AppDomain.CurrentDomain.BaseDirectory; - - // 构建目标目录的完整路径 - var dataDirectory = Path.Combine(appDirectory, path); try { // 检查目录是否存在 - if (Directory.Exists(dataDirectory)) + if (!Directory.Exists(path)) { - // 获取目录下的所有子文件夹 - var subDirectories = Directory.GetDirectories(dataDirectory); - - // 遍历并收集每个子文件夹中的 XML 文件 - foreach (var dir in subDirectories) - { - var xmlFiles = Directory.GetFiles(dir, "*.xml", SearchOption.AllDirectories); - xmlFilePaths.AddRange(xmlFiles); - } + continue; } + + // 获取目录下的所有子文件夹 + var subDirectories = Directory.GetDirectories(path); + + // 遍历并收集每个子文件夹中的 XML 文件 + foreach (var dir in subDirectories) + { + var xmlFiles = Directory.GetFiles(dir, "*.xml", SearchOption.AllDirectories); + xmlFilePaths.AddRange(xmlFiles); + } + } catch (Exception ex) { diff --git a/Client/Assets/Scripts/Data/DefinePack.cs b/Client/Assets/Scripts/Data/DefinePack.cs index a36cdef..1c69288 100644 --- a/Client/Assets/Scripts/Data/DefinePack.cs +++ b/Client/Assets/Scripts/Data/DefinePack.cs @@ -123,9 +123,9 @@ namespace Data packID = packAbout.packID; if (aboutXmls.Count > 1) Debug.LogWarning($"{packAbout.name}包拥有多个配置文件，系统选择了加载序的第一个，请避免这种情况"); - var defineXmls = FindDocumentsWithRootName(aboutXmls, "Define"); + var defineXmls = FindDocumentsWithRootName(packDatas, "Define"); + // Debug.Log($"Define文件数量{defineXmls.Count}"); foreach (var defineXml in defineXmls) LoadDefines(defineXml); - return true; } @@ -140,12 +140,15 @@ namespace Data var className = element.Name.ToString(); if (string.IsNullOrEmpty(className)) continue; + // Debug.Log("1"); var def = LoadDefineClass(element); if (def == null) continue; + // Debug.Log("2"); if (!defines.ContainsKey(className)) defines.Add(className, new List()); defines[className].Add(def); + // Debug.Log($"插入{className},{def.defName}"); } } diff --git a/Client/Assets/Scripts/Test/ClockTest.cs b/Client/Assets/Scripts/Test/ClockTest.cs index b8e753b..25bdf66 100644 --- a/Client/Assets/Scripts/Test/ClockTest.cs +++ b/Client/Assets/Scripts/Test/ClockTest.cs @@ -5,7 +5,7 @@ namespace Test { public class ClockTest : MonoBehaviour { - private static float timer = 0; + //private static float timer = 0; // Start is called once before the first execution of Update after the MonoBehaviour is created private void Start()