Client/Assets/Scripts/Data/DefineManager.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Xml.Linq;
 using UnityEngine;
+using UnityEngine.Rendering;
 using Utils;
 
 namespace Data
@@ -15,148 +17,18 @@ namespace Data
         const string coreNamespace = "Data";
         
         public Dictionary<string, Dictionary<string, Define>> defines = new();
+        public Dictionary<string, DefinePack> packs = new();
         
         public void Init()
         {
-            // 加载所有 XML 文件路径
+            var packFolder = Directory.GetDirectories(dataSetFilePath[0]);
-            var xmlFilePaths = FileHandler.GetXmlFilePathsFromPaths(dataSetFilePath);
+            foreach (var folder in packFolder)
-
-            // 遍历并加载每个 XML 文件
-            foreach (var xmlFilePath in xmlFilePaths)
             {
-                LoadXmlData(xmlFilePath);
+                var pack=new DefinePack();
+                if (pack.LoadPack(folder))
+                {
+                    packs.Add(pack.packID, pack);
                 }
-            
-        }
-        public void LoadXmlData(string xmlFilePath)
-        {
-            // 检查文件是否存在
-            if (!File.Exists(xmlFilePath))
-            {
-                Debug.LogWarning($"XML文件不存在: {xmlFilePath}");
-                return;
-            }
-            var xdoc = XDocument.Load(xmlFilePath);
-            // 解析Define节点
-            var rootElement = xdoc.Root;
-
-            if (rootElement != null)
-            {
-                if (rootElement.Name == "Define")
-                {
-                    foreach (var element in rootElement.Elements())
-                    {
-                        var def = LoadDefine(element);
-                        var className = element.Name.ToString();
-                        var name = element.Element("defName")?.Value;
-                        if (def != null && !string.IsNullOrEmpty(name) && !string.IsNullOrEmpty(className))
-                        {
-                            defines.TryAdd(className, new Dictionary<string, Define>());
-                            defines[className][name] = (Define)def;
-                        }
-                    }
-                }
-            }
-
-        }
-        public object LoadDefine(XElement xElement)
-        {
-            var className = xElement.Name.ToString();
-            var assembly = Assembly.GetExecutingAssembly();
-
-            Type type;
-            if (!className.Contains('.'))
-            {
-                // 尝试拼接默认命名空间   
-                var fullClassName = coreNamespace + className;
-                type = assembly.GetType(fullClassName);
-
-                // 如果拼接命名空间后仍找不到，尝试直接查找（可能是全局命名空间下的类）
-                
-                if (type == null)
-                {
-                    type = assembly.GetType(className);
-                }
-            }
-            else
-            {
-                // 直接查找
-                type = assembly.GetType(className);
-            }
-
-            if (type == null)
-            {
-                Debug.LogError($"未定义的类型: {className}");
-                return null;
-            }
-
-            var constructor = type.GetConstructor(Type.EmptyTypes);
-            if (constructor == null)
-            {
-                Debug.LogError($"{className} 必须包含无参构造函数");
-                return null;
-            }
-
-            // 3. 创建实例
-            object instance;
-            try
-            {
-                instance = Activator.CreateInstance(type);
-            }
-            catch (Exception ex)
-            {
-                Debug.LogError($"创建 {className} 实例失败: {ex.Message}");
-                return null;
-            }
-
-            // 4. 检查是否继承自 Define
-            if (instance is not Define define)
-            {
-                Debug.LogError($"{className} 必须继承自 Define");
-                return null;
-            }
-
-            if (define.Init(xElement))
-            {
-                return define;
-            }
-            // 获取类的所有字段（不包括私有字段）
-            var fields = type.GetFields(BindingFlags.Public | BindingFlags.Instance);
-
-            // 遍历字段并尝试从 XElement 中赋值
-            foreach (var field in fields)
-            {
-                // 查找对应的 XElement 子元素
-                var element = xElement.Element(field.Name);
-                if (element != null)
-                {
-                    try
-                    {
-                        // 将子元素的值转换为目标类型并赋值
-                        object value = Convert.ChangeType(element.Value, field.FieldType);
-                        field.SetValue(define, value);
-                    }
-                    catch (Exception ex)
-                    {
-                        Debug.LogWarning($"Error setting field {field.Name}: {ex.Message}");
-                    }
-                }
-            }
-            return define;
-        }
-
-        public static void SetField(object obj, string fieldName, object value)
-        {
-            var type = obj.GetType();
-            var field = type.GetField(fieldName);
-
-            if (field != null)
-            {
-                field.SetValue(obj, Convert.ChangeType(value, field.FieldType));
-            }
-            else
-            {
-                Debug.LogWarning($"Field '{fieldName}' not found.");
             }
         }
     }

Client/Assets/Scripts/Data/DefinePack.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Xml.Linq;
 using UnityEngine;
 
@@ -27,23 +28,19 @@ namespace Data
         /// <returns>初始化的 PackAbout 实例。</returns>
         public static PackAbout FromXDocument(XDocument doc)
         {
-            var aboutElement = doc.Element("About"); // Assuming "about" is the root element name
+            var aboutElement = doc.Element("About");
             if (aboutElement == null)
             {
                 throw new ArgumentException("XML 文档无效，根节点为空或不是 'About'。");
             }
-
-            // Initialize PackAbout instance
             PackAbout result = new();
 
-            // Read element content
             result.name = aboutElement.Element("name")?.Value ?? "Unknown";
             result.description = aboutElement.Element("description")?.Value ?? "Unknown";
-            result.author = aboutElement.Element("author")?.Value ?? "Unknown"; // Assuming 'author' is also a direct child
+            result.author = aboutElement.Element("author")?.Value ?? "Unknown"; 
             result.version = aboutElement.Element("version")?.Value ?? "Unknown";
             result.packID = aboutElement.Element("packID")?.Value ?? "Unknown";
             
-            // Read child elements under the "sort" element
             XElement sortElement = aboutElement.Element("sort");
             if (sortElement != null)
             {
@@ -83,7 +80,13 @@ namespace Data
     {
         public string packID;
         public PackAbout packAbout;
-        public List<Define> defines;
+        /// <summary>
+        /// define类别及其定义
+        /// </summary>
+        public Dictionary<string,List<Define>> defines;
+
+        private const string CoreNamespace = "Data.";
+        
         
         public bool LoadPack(string packPath)
         {
@@ -113,7 +116,107 @@ namespace Data
 
         private void LoadDefines(XDocument defineDoc)
         {
+            var rootElement = defineDoc.Root;
+            if(rootElement==null||rootElement.Name != "Define")
+                return;
             
+            foreach (var element in rootElement.Elements())
+            {
+                var className = element.Name.ToString();
+                if (string.IsNullOrEmpty(className))
+                    continue;
+                var def = LoadDefineClass(element);
+                if (def == null)
+                    continue;
+                if (!defines.ContainsKey(className))
+                    defines.Add(className,new List<Define>());
+                defines[className].Add(def);
+            }
+        }
+
+        private Define LoadDefineClass(XElement defineDoc)
+        { 
+            var className = defineDoc.Name.ToString();
+            var assembly = Assembly.GetExecutingAssembly();
+
+            Type type;
+            if (!className.Contains('.'))
+            {
+                // 尝试拼接默认命名空间   
+                var fullClassName = CoreNamespace + className;
+                type = assembly.GetType(fullClassName);
+
+                // 如果拼接命名空间后仍找不到，尝试直接查找（可能是全局命名空间下的类）
+                if (type == null)
+                {
+                    type = assembly.GetType(className);
+                }
+            }
+            else
+            {
+                // 直接查找
+                type = assembly.GetType(className);
+            }
+
+            if (type == null)
+            {
+                Debug.LogError($"未定义的类型: {className}");
+                return null;
+            }
+
+            var constructor = type.GetConstructor(Type.EmptyTypes);
+            if (constructor == null)
+            {
+                Debug.LogError($"{className} 必须包含无参构造函数");
+                return null;
+            }
+
+            // 3. 创建实例
+            object instance;
+            try
+            {
+                instance = Activator.CreateInstance(type);
+            }
+            catch (Exception ex)
+            {
+                Debug.LogError($"创建 {className} 实例失败: {ex.Message}");
+                return null;
+            }
+
+            // 4. 检查是否继承自 Define
+            if (instance is not Define define)
+            {
+                Debug.LogError($"{className} 必须继承自 Define");
+                return null;
+            }
+
+            if (define.Init(defineDoc))
+            {
+                return define;
+            }
+            // 获取类的所有字段（不包括私有字段）
+            var fields = type.GetFields(BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic);
+
+            // 遍历字段并尝试从 XElement 中赋值
+            foreach (var field in fields)
+            {
+                // 查找对应的 XElement 子元素
+                var element = defineDoc.Element(field.Name);
+                if (element != null)
+                {
+                    try
+                    {
+                        // 将子元素的值转换为目标类型并赋值
+                        object value = Convert.ChangeType(element.Value, field.FieldType);
+                        field.SetValue(define, value);
+                    }
+                    catch (Exception ex)
+                    {
+                        Debug.LogWarning($"Error setting field {field.Name}: {ex.Message}");
+                    }
+                }
+            }
+            return define;
         }
         
         /// <summary>