(client) feat:完成实体生成函数，修复行为树加载错误，改进Define打印缩进

Client/Assets/Scripts/Managers/DefineManager.cs

@@ -44,16 +44,14 @@ namespace Managers
 
 
             Dictionary<Type, FieldInfo[]> fieldCache = new();
+            // 需要链接的定义、需要链接的字段、链接信息
             List<Tuple<Define, FieldInfo, Define>> defineCache = new();
-            HashSet<Define> processedDefines = new(); // 用于跟踪已处理的 Define 对象
 
-            void ProcessDefine(Define def, Define parentDef, FieldInfo parentField)
+            void ProcessDefine(Define def)
             {
-                if (def == null || def.isReferene || processedDefines.Contains(def))
+                if (def == null || def.isReferene)
                     return;
-
-                processedDefines.Add(def);
-
+                
                 // 如果字段信息已经缓存，则直接使用缓存
                 if (!fieldCache.TryGetValue(def.GetType(), out var defineFields))
                 {
@@ -73,7 +71,7 @@ namespace Managers
                         continue;
                     if (defRef.isReferene)
                     {
-                        defineCache.Add(new Tuple<Define, FieldInfo, Define>(parentDef, parentField, defRef));
+                        defineCache.Add(new Tuple<Define, FieldInfo, Define>(def, defineField, defRef));
                     }
                     else
                     {
@@ -84,33 +82,54 @@ namespace Managers
                                 anonymousDefines.Add(typeName, new List<Define>());
                             anonymousDefines[typeName].Add(defRef);
                         }
-                        ProcessDefine(defRef, def, defineField);
+                        ProcessDefine(defRef);
                     }
                 }
             }
 
             foreach (var pack in packs)
             {
-                foreach (var define in pack.Value.defines)
+                foreach (var (typeName, defList) in pack.Value.defines)
                 {
-                    var typeName = define.Key;
-                    var defList = define.Value;
-
                     if (!defines.ContainsKey(typeName))
                         defines[typeName] = new Dictionary<string, Define>();
 
                     foreach (var def in defList)
                     {
                         defines[typeName][def.defName] = def;
-
-                        // 处理顶层 Define
-                        ProcessDefine(def, null, null);
+                        ProcessDefine(def);
                     }
                 }
             }
             foreach (var defRef in defineCache)
             {
-                defRef.Item2.SetValue(defRef.Item1, FindDefine(defRef.Item3.description, defRef.Item3.defName));
+                if (defRef.Item1 == null)
+                {
+                    Debug.LogError("defRef.Item1 为 null！");
+                    continue;
+                }
+
+                if (defRef.Item2 == null)
+                {
+                    Debug.LogError("defRef.Item2 为 null！");
+                    continue;
+                }
+
+                var value = FindDefine(defRef.Item3.description, defRef.Item3.defName);
+                if (value == null)
+                {
+                    Debug.LogError($"FindDefine 返回 null: description={defRef.Item3.description}, defName={defRef.Item3.defName}");
+                    continue;
+                }
+
+                try
+                {
+                    defRef.Item2.SetValue(defRef.Item1, value);
+                }
+                catch (Exception ex)
+                {
+                    Debug.LogError($"SetValue 出错: {ex.Message}");
+                }
             }
         }
 
@@ -138,7 +157,23 @@ namespace Managers
             }
             return null;
         }
-
+        /// <summary>
+        /// 使用模板查找并返回指定类型的 Define 对象。
+        /// </summary>
+        /// <typeparam name="T">目标类型</typeparam>
+        /// <param name="defineName">定义名</param>
+        /// <returns>如果找到，返回转换为目标类型的 Define 对象；否则返回 null。</returns>
+        public T FindDefine<T>(string defineName) where T : Define
+        {
+            foreach (var typeDict in defines.Values)
+            {
+                if (typeDict.TryGetValue(defineName, out var define) && define is T result)
+                {
+                    return result;
+                }
+            }
+            return null;
+        }
         public DefinePack GetDefinePackage(Define define)
         {
             if (define == null || define.packID == null)

Client/Assets/Scripts/Managers/EntityManage.cs

@@ -0,0 +1,88 @@
+using System.Collections.Generic;
+using System.Linq;
+using Prefab;
+using UnityEngine;
+
+namespace Managers
+{
+    public class EntityManage:MonoBehaviour
+    {
+        public Dictionary<string, List<EntityPrefab>> factionEntities = new();
+        
+        public GameObject entityLevel;
+        public EntityPrefab entityPrefab;
+        void Update()
+        {
+            // 检测鼠标左键是否按下
+            if (Input.GetMouseButtonDown(0))
+            {
+                var ray = Camera.main.ScreenPointToRay(Input.mousePosition);  // 获取从相机发出的射线
+
+                if (Physics.Raycast(ray, out var hit))  // 检测射线是否击中物体
+                {
+                    Debug.Log("点击了物体: " + hit.collider.gameObject.name);
+                    
+                }
+            }
+        }
+        /// <summary>
+        /// 根据给定的PawnDef生成一个实体对象。
+        /// </summary>
+        /// <param name="pawnDef">定义实体属性的PawnDef对象。</param>
+        /// <param name="pos">实体生成的位置。</param>
+        /// <remarks>
+        /// 1. 如果entityPrefab或pawnDef为null，则不会生成实体。
+        /// 2. 实体将被创建在entityLevel.transform下。
+        /// 3. 使用EntityPrefab组件初始化实体。
+        /// </remarks>
+        public void GenerateEntity(Data.PawnDef pawnDef, Vector3 pos)
+        {
+            // 检查entityPrefab是否为空
+            if (entityPrefab == null)
+            {
+                Debug.LogError("Error: entityPrefab is null. Please assign a valid prefab.");
+                return;
+            }
+
+            // 检查pawnDef是否为空
+            if (pawnDef == null)
+            {
+                Debug.LogError("Error: PawnDef is null. Cannot generate entity without a valid PawnDef.");
+                return;
+            }
+
+            try
+            {
+                // 实例化实体对象
+                var entity = Instantiate(entityPrefab.gameObject, pos, Quaternion.identity, entityLevel.transform);
+
+                // 获取EntityPrefab组件
+                var entityComponent = entity.GetComponent<EntityPrefab>();
+
+                // 检查EntityPrefab组件是否存在
+                if (entityComponent == null)
+                {
+                    Debug.LogError($"Error: EntityPrefab component not found on the instantiated object: {entity.name}");
+                    return;
+                }
+
+                // 初始化实体组件
+                entityComponent.Init(pawnDef);
+                // 确保派系键存在，并初始化对应的列表
+                var factionKey = pawnDef.attributes.label == null ? "default" : pawnDef.attributes.label;
+                if (!factionEntities.ContainsKey(factionKey))
+                {
+                    factionEntities[factionKey] = new List<EntityPrefab>();
+                }
+                factionEntities[factionKey].Add(entityComponent);
+
+                Base.Clock.AddTick(entity.GetComponent<Entity.Entity>());
+            }
+            catch (System.Exception ex)
+            {
+                // 捕获并记录任何异常
+                Debug.LogError($"An error occurred while generating the entity: {ex.Message}");
+            }
+        }
+    }
+}

Client/Assets/Scripts/Managers/EntityManage.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: aa378b7511b04429b8b6b0efbcce825a
+timeCreated: 1753149728

Client/Assets/Scripts/Managers/Generator.cs

@@ -1,22 +0,0 @@
-using Prefab;
-using UnityEngine;
-
-namespace Managers
-{
-    public class Generator:MonoBehaviour
-    {
-        public GameObject entityLevel;
-        public EntityPrefab entityPrefab;
-
-        public void GenerateEntity(Data.PawnDef pawnDef, Vector3 pos)
-        {
-            if (entityPrefab == null || pawnDef == null)
-                return;
-
-            GameObject entity = Instantiate(entityPrefab.gameObject, pos, Quaternion.identity, entityLevel.transform);
-            // entity.name = pawnDef.name;
-            var entityComponent = entity.GetComponent<EntityPrefab>();
-            entityComponent?.Init(pawnDef);
-        }
-    }
-}

Client/Assets/Scripts/Managers/Generator.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: d78f1b5a44344a4a987e308d3b9478cc
-timeCreated: 1752937967

Client/Assets/Scripts/Managers/PackagesImageManager.cs

@@ -31,7 +31,7 @@ namespace Managers
                 if (!packagesImages.ContainsKey(packId))
                     packagesImages[packId] = new Dictionary<string, Texture2D>();
                 packagesImages[packId].Add(ima.name, texture);
-
+                
                 SplitTextureIntoSprites(packId, ima.name, texture, ima.hCount, ima.wCount, ima.pixelsPerUnit);
             }
         }
@@ -44,15 +44,31 @@ namespace Managers
             int cols,
             int pixelsPerUnit)
         {
-            if (texture == null || rows <= 0 || cols <= 0)
+            if (texture == null)
             {
-                Debug.LogError("Invalid parameters for splitting texture.");
+                Debug.LogError("Texture is null.");
                 return;
             }
 
+            // 如果行数或列数小于1，则设为1（不分割）
+            rows = Mathf.Max(1, rows);
+            cols = Mathf.Max(1, cols);
+
             var textureWidth = texture.width;
             var textureHeight = texture.height;
 
+            // 如果不分割（rows和cols都为1），直接创建单个Sprite
+            if (rows == 1 && cols == 1)
+            {
+                if (!sprites.ContainsKey(packId))
+                    sprites[packId] = new Dictionary<string, Sprite>();
+
+                Rect spriteRect = new Rect(0, 0, textureWidth, textureHeight);
+                var sprite = Sprite.Create(texture, spriteRect, new Vector2(0.5f, 0.5f), pixelsPerUnit);
+                sprites[packId][baseName] = sprite;
+                return;
+            }
+
             var tileWidth = textureWidth / cols;
             var tileHeight = textureHeight / rows;
 
@@ -61,7 +77,7 @@ namespace Managers
                 Debug.LogError("Texture dimensions are not divisible by the specified rows and columns.");
                 return;
             }
-            
+    
             if (!sprites.ContainsKey(packId))
                 sprites[packId] = new Dictionary<string, Sprite>();
 
@@ -71,7 +87,7 @@ namespace Managers
                 {
                     Rect spriteRect = new(col * tileWidth, row * tileHeight, tileWidth, tileHeight);
                     var sprite = Sprite.Create(texture, spriteRect, new Vector2(0.5f, 0.5f), pixelsPerUnit);
-                    
+            
                     var index = (rows - row - 1) * cols + col;
                     var spriteName = $"{baseName}_{index}";