1 files changed, 37 insertions, 11 deletions
diff --git a/Assets/Scripts/Unit/Controller/UnitController.cs b/Assets/Scripts/Unit/Controller/UnitController.cs
index ff3d9df2..6ccf124b 100644
--- a/Assets/Scripts/Unit/Controller/UnitController.cs
+++ b/Assets/Scripts/Unit/Controller/UnitController.cs
@@ -44,6 +44,8 @@ public class UnitController : MonoBehaviour/*, Interactable*/
 
 	public GameObject unitObj; // 角色模型
 
+    protected List<UnitComponent> unitComponents;
+
 	#region 事件监听
 	public delegate void OnTimelineEventHandle(AnimationEventBase animEvent);
 	public OnTimelineEventHandle onTimelineEvent { get; set; }
@@ -107,29 +109,53 @@ public class UnitController : MonoBehaviour/*, Interactable*/
     public virtual void Initialize( GameObject obj , string folder)
     {
 		unitObj = obj;
-
         m_Folder = folder;
+        unitComponents = new List<UnitComponent>();
 
-        unitRender = gameObject.GetOrAddComponent<UnitRender>();
-		unitRender.Initialize(); 
+        Initialize();
+
+        OnPostInitailize();
+    }
 
-		unitSkill = gameObject.GetOrAddComponent<UnitSkill>();
-		unitSkill.Initialize();
+    protected virtual void Initialize()
+    {
+        unitSkill = GetOrAddUnitComponent<UnitSkill>();
+        unitSkill.Initialize();
 
-		unitRootMotion = gameObject.GetOrAddComponent<UnitRootMotion>();
-		unitRootMotion.Initialize();
+        unitRootMotion = GetOrAddUnitComponent<UnitRootMotion>();
+        unitRootMotion.Initialize();
 
-        unitCollider = gameObject.GetOrAddComponent<UnitCollider>();
+        unitCollider = GetOrAddUnitComponent<UnitCollider>();
         unitCollider.Initialize();
 
-        unitBody = gameObject.GetOrAddComponent<UnitBody>();
+        unitBody = GetOrAddUnitComponent<UnitBody>();
         unitBody.Initialize();
 
+        unitRender = GetOrAddUnitComponent<UnitRender>();
+        unitRender.Initialize();
+
         unitDetail = gameObject.GetComponentInChildren<UnitDetail>();
+    }
 
-	}
+    private void OnPostInitailize()
+    {
+        if (unitComponents == null)
+            return;
+        for(int i = 0; i < unitComponents.Count; ++i)
+        {
+            unitComponents[i].OnPostInitialize();
+        }
+    }
+
+    protected T GetOrAddUnitComponent<T>() where T : UnitComponent
+    {
+        T comp = gameObject.GetOrAddComponent<T>();
+        Debug.Assert(unitComponents != null);
+        unitComponents.Add(comp);
+        return comp;
+    }
 
-	public virtual void Update()
+    public virtual void Update()
 	{
 		unitRender.OnUpdate();
 		unitState.OnUpdate();