*monster

4 files changed, 50 insertions, 10 deletions

diff --git a/Assets/Scripts/Unit/Controller/MonsterController.cs b/Assets/Scripts/Unit/Controller/MonsterController.cs
new file mode 100644
index 00000000..ba738dfc
--- /dev/null
+++ b/Assets/Scripts/Unit/Controller/MonsterController.cs
@@ -0,0 +1,27 @@
+using System.Collections;

+using System.Collections.Generic;

+using UnityEngine;

+

+public class MonsterController : UnitController

+{

+

+    public override void Initialize(GameObject obj, string folder)

+    {

+        base.Initialize(obj, folder);

+

+        unitState = gameObject.GetOrAddComponent<MonsterState>();

+        unitState.Initialize();

+

+        unitAnimation = gameObject.GetOrAddComponent<MonsterAnimation>();

+        unitAnimation.Initialize();

+    }

+

+    public override void Update()

+    {

+        base.Update();

+

+

+    }

+

+

+}

diff --git a/Assets/Scripts/Unit/Controller/MonsterController.cs.meta b/Assets/Scripts/Unit/Controller/MonsterController.cs.meta
new file mode 100644
index 00000000..4762487a
--- /dev/null
+++ b/Assets/Scripts/Unit/Controller/MonsterController.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ba16c8e0e6cac0c43b8a80d13dafdda1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Unit/Controller/PCController.cs b/Assets/Scripts/Unit/Controller/PCController.cs
index 5834470a..5ad3abc1 100644
--- a/Assets/Scripts/Unit/Controller/PCController.cs
+++ b/Assets/Scripts/Unit/Controller/PCController.cs
@@ -17,13 +17,16 @@ public class PCController : UnitController
 	{

 		base.Initialize(obj, folder);

 

-	}

+        unitState = gameObject.GetOrAddComponent<PCState>();

+        unitState.Initialize();

+

+        unitAnimation = gameObject.GetOrAddComponent<PCAnimation>();

+        unitAnimation.Initialize();

+    }

 

-	public override void Update()

+    public override void Update()

 	{

 		base.Update();

-

-

 	}

 

 }

diff --git a/Assets/Scripts/Unit/Controller/UnitController.cs b/Assets/Scripts/Unit/Controller/UnitController.cs
index 5523f256..b1db29d4 100644
--- a/Assets/Scripts/Unit/Controller/UnitController.cs
+++ b/Assets/Scripts/Unit/Controller/UnitController.cs
@@ -16,8 +16,13 @@ public class UnitController : MonoBehaviour/*, Interactable*/
     public UnitRender unitRender;

 

     public UnitState unitState;

+    public PCState pcState { get { return unitState as PCState; } }

+    public MonsterState monsterState { get { return unitState as MonsterState; } }

+

 

     public UnitAnimation unitAnimation;

+    public PCAnimation pcAnimation { get { return unitAnimation as PCAnimation; } }

+    public MonsterAnimation monsterAnimation { get { return unitAnimation as MonsterAnimation; } }

 

     public UnitSkill unitSkill;

 

@@ -78,12 +83,6 @@ public class UnitController : MonoBehaviour/*, Interactable*/
         unitRender = gameObject.GetOrAddComponent<UnitRender>();

 		unitRender.Initialize(); 

 

-		unitState = gameObject.GetOrAddComponent<UnitState>();

-		unitState.Initialize(); 

-

-		unitAnimation = gameObject.GetOrAddComponent<UnitAnimation>();

-		unitAnimation.Initialize(); 

-

 		unitSkill = gameObject.GetOrAddComponent<UnitSkill>();

 		unitSkill.Initialize();