From cf4e1f9833c810e18429ddf40f4bcf9052ff17ac Mon Sep 17 00:00:00 2001 From: chai Date: Sun, 29 Aug 2021 19:44:31 +0800 Subject: *monster --- .../Scripts/Unit/Controller/MonsterController.cs | 27 ++++++++++++++++++++++ .../Unit/Controller/MonsterController.cs.meta | 11 +++++++++ Assets/Scripts/Unit/Controller/PCController.cs | 11 +++++---- Assets/Scripts/Unit/Controller/UnitController.cs | 11 ++++----- 4 files changed, 50 insertions(+), 10 deletions(-) create mode 100644 Assets/Scripts/Unit/Controller/MonsterController.cs create mode 100644 Assets/Scripts/Unit/Controller/MonsterController.cs.meta (limited to 'Assets/Scripts/Unit/Controller') 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(); + unitState.Initialize(); + + unitAnimation = gameObject.GetOrAddComponent(); + 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(); + unitState.Initialize(); + + unitAnimation = gameObject.GetOrAddComponent(); + 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.Initialize(); - unitState = gameObject.GetOrAddComponent(); - unitState.Initialize(); - - unitAnimation = gameObject.GetOrAddComponent(); - unitAnimation.Initialize(); - unitSkill = gameObject.GetOrAddComponent(); unitSkill.Initialize(); -- cgit v1.1-26-g67d0