#44 스킬 시스템 구현 중2

2023-11-13 03:54:37 +09:00 · 2023-11-13 03:54:37 +09:00 · bd43540064
commit bd43540064
parent b0650b9eb3
23 changed files with 4424 additions and 246 deletions
--- a/BlueWater/Assets/01.Scenes/03.Stage_Test.unity
+++ b/BlueWater/Assets/01.Scenes/03.Stage_Test.unity
@ -3362,7 +3362,7 @@ MonoBehaviour:
        byteDataArray: 
      Version: 1.7.7
  gizmoViewMode: 2
-  showBehaviorDesignerGizmo: 1
+  showBehaviorDesignerGizmo: 0
 --- !u!195 &418278349
 NavMeshAgent:
  m_ObjectHideFlags: 0
@ -7450,8 +7450,9 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 1fbb68ccbcfcf4c4c9f4304a726038e3, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  skillObjList:
-  - {fileID: 164134471025804824, guid: 56cddf44e719dd6478faf9c3f90a53d0, type: 3}
+  activeSkillPrefab: {fileID: 8036009942072287766, guid: 4f41724a136974b45ac0e4cb77ea2446,
+    type: 3}
+  activeSkillDataSo: {fileID: 11400000, guid: 97ebd289c10598a458425fbefd7db39f, type: 2}
 --- !u!4 &1037063016 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 489124, guid: a70152ac9ec4ea14e94da160b98b6fad,
--- a/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs
+++ b/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs
@ -121,7 +121,6 @@ namespace BlueWaterProject
        private ParticleSystem afterImageTrail;
        private Canvas worldSpaceCanvas;
        private SkillController skillController;
-        private GameObject mySkillObj;
        private ActiveSkill myActiveSkill;
        
        // Hash
@ -255,8 +254,7 @@ namespace BlueWaterProject
            hitColliders = new Collider[MAX_COLLIDERS];
            TargetLayer = LayerMask.GetMask("Enemy");
            waitAtkCooldown = new WaitForSeconds(AtkCooldown);
-            mySkillObj = skillController.GetSkillByName("FireBoom");
-            myActiveSkill = Instantiate(mySkillObj).GetComponent<ActiveSkill>();
+            myActiveSkill = skillController.InstantiateActiveSkillByName("FireBoom");
            myActiveSkill.SetUser(transform);

            if (Agent.enabled)
@ -300,7 +298,7 @@ namespace BlueWaterProject
        {
            if (CurrentHp <= 0) return;
            
-            if (UseRigidbody && !isRolling && !(myActiveSkill.IsCasting && myActiveSkill.GetActiveSkillData().CastingType == 0))
+            if (UseRigidbody && !isRolling && !(myActiveSkill.IsCasting && myActiveSkill.ActiveSkillData.CastingType == 0))
            {
                var localMovement = new Vector3(movementInput.x, 0, movementInput.y);
                var worldDirection = transform.TransformDirection(localMovement).normalized;
@ -308,7 +306,7 @@ namespace BlueWaterProject
                var movement = worldDirection * MoveSpd;
                Rb.velocity = new Vector3(movement.x, 0, movement.z);
            }
-            else if (myActiveSkill.IsCasting && myActiveSkill.GetActiveSkillData().CastingType == 0)
+            else if (myActiveSkill.IsCasting && myActiveSkill.ActiveSkillData.CastingType == 0)
            {
                Rb.velocity = Vector3.zero;
            }
@ -586,7 +584,7 @@ namespace BlueWaterProject

            usedActiveSkill = true;
            myActiveSkill.Execute(TargetLayer, transform.position);
-            StartCoroutine(CoolDown(myActiveSkill.GetActiveSkillData().Cooldown, () => usedActiveSkill = false));
+            StartCoroutine(CoolDown(myActiveSkill.ActiveSkillData.Cooldown, () => usedActiveSkill = false));
        }

        public void OnRoll()
--- a/BlueWater/Assets/02.Scripts/Skill/ActiveSkill/ActiveSkill.cs
+++ b/BlueWater/Assets/02.Scripts/Skill/ActiveSkill/ActiveSkill.cs
@ -3,19 +3,11 @@ using System.Collections;
 using Sirenix.OdinInspector;
 using UnityEngine;
 using UnityEngine.Rendering.Universal;
+using UnityEngine.Serialization;

 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
 {
-    public enum EIndicatorType
-    {
-        NONE,
-        RADIUS,
-        AREA,
-        CONE,
-        LINE
-    }
-    
    [Serializable]
    public class ActiveSkill : MonoBehaviour
    {
@ -24,18 +16,14 @@ namespace BlueWaterProject
        // So
        [Title("DataSo")]
        [Required("So를 추가해주세요.")]
-        [SerializeField] private SkillIndicatorData skillIndicatorDataSo;
+        [SerializeField] private SkillIndicatorDataSo skillIndicatorDataSo;
        
-        [Required("So를 추가해주세요.")]
-        [SerializeField] private ActiveSkillData activeSkillDataSo;
+        [field: SerializeField] public ActiveSkillData ActiveSkillData { get; set; }

        // Data
        [Title("Indicator Data")]
        [SerializeField] private DecalProjector indicator;
        
-        [OnValueChanged("ChangeIndicatorType")]
-        [SerializeField] private EIndicatorType indicatorType;
-        
        [field: DisableIf("@true")]
        [field: SerializeField] public bool IsCasting { get; set; }
        
@ -57,7 +45,6 @@ namespace BlueWaterProject
        private void Awake()
        {
            InitComponent();
-            InitData();
        }

        private void Update()
@ -82,33 +69,34 @@ namespace BlueWaterProject

            mainCam = Camera.main;
        }
-
-        private void InitData()
-        {
-            ChangeIndicatorType();
-            BasicSetting();
-            HideIndicator();
-            
-            hitColliders = new Collider[activeSkillDataSo.MaxAttackTargets];
-        }
        
        private void BasicSetting()
        {
            transform.localPosition = Vector3.zero;
-            indicator.transform.localScale = new Vector3(activeSkillDataSo.Range, activeSkillDataSo.Range, 1);
+            indicator.transform.localScale = new Vector3(ActiveSkillData.Range, ActiveSkillData.Range, 1);
            indicator.scaleMode = DecalScaleMode.InheritFromHierarchy;
            indicator.material.SetFloat(FillHash, 0f);
        }

-        private void ChangeIndicatorType()
+        public void ChangeIndicatorType()
        {
-            if (activeSkillDataSo.Indicator != null)
+            if (ActiveSkillData == null)
            {
-                indicator.material = activeSkillDataSo.Indicator;
+                print("스킬의 대한 정보가 입력되지 않았습니다.");
                return;
            }
            
-            switch (indicatorType)
+            HideIndicator();
+            BasicSetting();
+            hitColliders = new Collider[ActiveSkillData.MaxAttackTargets];
+            
+            if (ActiveSkillData.Indicator != null)
+            {
+                indicator.material = ActiveSkillData.Indicator;
+                return;
+            }
+            
+            switch (ActiveSkillData.IndicatorType)
            {
                case EIndicatorType.NONE:
                    indicator.material = null;
@ -145,7 +133,7 @@ namespace BlueWaterProject
        
        public void Execute(LayerMask targetLayer, Vector3 targetPos)
        {
-            switch (indicatorType)
+            switch (ActiveSkillData.IndicatorType)
            {
                case EIndicatorType.NONE:
                    indicator.material = null;
@ -154,7 +142,7 @@ namespace BlueWaterProject
                    StartCoroutine(RadiusSkill(targetLayer, targetPos));
                    break;
                case EIndicatorType.AREA:
-                    
+                    StartCoroutine(AreaSkill(targetLayer, targetPos));
                    break;
                case EIndicatorType.CONE:
                    
@ -169,13 +157,13 @@ namespace BlueWaterProject
        
        private IEnumerator RadiusSkill(LayerMask targetLayer, Vector3 targetPos)
        {
-            transform.position = targetPos;
+            indicator.transform.position = targetPos;
            indicator.enabled = true;

-            if (activeSkillDataSo.CastingTime > 0)
+            if (ActiveSkillData.CastingTime > 0)
            {
                IsCasting = true;
-                var castingTime = 1 / activeSkillDataSo.CastingTime;
+                var castingTime = 1 / ActiveSkillData.CastingTime;
                
                while (IsCasting && indicator.material.GetFloat(FillHash) < 1f)
                {
@ -185,7 +173,7 @@ namespace BlueWaterProject
                    yield return null;
                }
            }
-            else if (activeSkillDataSo.CastingTime == 0)
+            else if (ActiveSkillData.CastingTime == 0)
            {
                
            }
@ -194,19 +182,56 @@ namespace BlueWaterProject
            
            HideIndicator();
            
-            Array.Clear(hitColliders, 0,activeSkillDataSo.MaxAttackTargets);
-            var maxSize = Physics.OverlapSphereNonAlloc(transform.position, activeSkillDataSo.Range, hitColliders, targetLayer);
+            Array.Clear(hitColliders, 0,ActiveSkillData.MaxAttackTargets);
+            var maxSize = Physics.OverlapSphereNonAlloc(transform.position, ActiveSkillData.Range, hitColliders, targetLayer);
        
            for (var i = 0; i < maxSize; i++)
            {
                var iDamageable = hitColliders[i].GetComponent<IDamageable>();
-                iDamageable.TakeDamage(activeSkillDataSo.Damage);
+                iDamageable.TakeDamage(ActiveSkillData.Damage);
+            }
+        }
+        
+        private IEnumerator AreaSkill(LayerMask targetLayer, Vector3 targetPos)
+        {
+            followMouse = true;
+            indicator.enabled = true;
+
+            if (ActiveSkillData.CastingTime > 0)
+            {
+                IsCasting = true;
+                var castingTime = 1 / ActiveSkillData.CastingTime;
+                
+                while (IsCasting && indicator.material.GetFloat(FillHash) < 1f)
+                {
+                    CastingMove();
+                    var fillValue = indicator.material.GetFloat(FillHash) + Time.deltaTime * castingTime;
+                    indicator.material.SetFloat(FillHash, fillValue);
+                    yield return null;
+                }
+            }
+            else if (ActiveSkillData.CastingTime == 0)
+            {
+                
+            }
+            
+            // TODO : 터지는 효과 추가하기
+            
+            HideIndicator();
+            
+            Array.Clear(hitColliders, 0,ActiveSkillData.MaxAttackTargets);
+            var maxSize = Physics.OverlapSphereNonAlloc(transform.position, ActiveSkillData.Range, hitColliders, targetLayer);
+        
+            for (var i = 0; i < maxSize; i++)
+            {
+                var iDamageable = hitColliders[i].GetComponent<IDamageable>();
+                iDamageable.TakeDamage(ActiveSkillData.Damage);
            }
        }

        private void CastingMove()
        {
-            switch (activeSkillDataSo.CastingType)
+            switch (ActiveSkillData.CastingType)
            {
                case 0:
                    break;
@ -226,12 +251,11 @@ namespace BlueWaterProject
                var userPos = user.position;
                var targetPos = (userPos + raycastHit.point) / 2;
                var distance = targetPos - userPos;
-                distance = Vector3.ClampMagnitude((distance * 2), activeSkillDataSo.Range);
+                distance = Vector3.ClampMagnitude((distance * 2), ActiveSkillData.Range);
                indicator.transform.position = userPos + distance;
            }
        }
-
-        public ActiveSkillData GetActiveSkillData() => activeSkillDataSo;
+        
        public void SetUser(Transform value) => user = value;

        #endregion
--- a/BlueWater/Assets/02.Scripts/Skill/Data/ActiveSkillData.cs
+++ b/BlueWater/Assets/02.Scripts/Skill/Data/ActiveSkillData.cs
@ -5,9 +5,17 @@ using UnityEngine;
 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
 {
+    public enum EIndicatorType
+    {
+        NONE,
+        RADIUS,
+        AREA,
+        CONE,
+        LINE
+    }
+    
    [Serializable]
-    [CreateAssetMenu(fileName = "ActiveSkillData", menuName = "ScriptableObjects/Skills/ActiveSkillData", order = 0)]
-    public class ActiveSkillData : ScriptableObject
+    public class ActiveSkillData
    {
        [field: Tooltip("이름")]
        [field: SerializeField] public string Name { get; set; }
@ -22,6 +30,9 @@ namespace BlueWaterProject
        [field: Tooltip("고유의 Skill Material이 있는 경우에만 넣기")]
        [field: SerializeField] public Material Indicator { get; set; }
        
+        [field: Tooltip("스킬의 형태")]
+        [field: SerializeField] public EIndicatorType IndicatorType { get; set; }
+        
        [field: Tooltip("재사용 대기 시간")]
        [field: SerializeField] public float Cooldown { get; set; }
        
--- a/BlueWater/Assets/02.Scripts/Skill/Data/ActiveSkillDataSo.cs
+++ b/BlueWater/Assets/02.Scripts/Skill/Data/ActiveSkillDataSo.cs
@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    [CreateAssetMenu(fileName = "ActiveSkillDataSo", menuName = "ScriptableObjects/Skills/ActiveSkillDataSo", order = 0)]
+    public class ActiveSkillDataSo : ScriptableObject
+    {
+        [field: SerializeField] public List<ActiveSkillData> ActiveSkillDataList { get; set; }
+    }
+}
--- a/BlueWater/Assets/02.Scripts/Skill/Data/ActiveSkillDataSo.cs.meta
+++ b/BlueWater/Assets/02.Scripts/Skill/Data/ActiveSkillDataSo.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5c8c152ebe4f36f47aea1661f3d4dea5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/BlueWater/Assets/02.Scripts/Skill/Data/SkillIndicatorDataSo.cs
+++ b/BlueWater/Assets/02.Scripts/Skill/Data/SkillIndicatorDataSo.cs
@ -4,8 +4,8 @@ using UnityEngine;
 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
 {
-    [CreateAssetMenu(fileName = "SkillIndicatorData", menuName = "ScriptableObjects/Skills/SkillIndicatorData", order = 1)]
-    public class SkillIndicatorData : ScriptableObject
+    [CreateAssetMenu(fileName = "SkillIndicatorDataSo", menuName = "ScriptableObjects/Skills/SkillIndicatorDataSo", order = 1)]
+    public class SkillIndicatorDataSo : ScriptableObject
    {
        [field: Title("Materials")]
        [field: SerializeField] public Material RadiusIndicator { get; set; }
--- a/BlueWater/Assets/02.Scripts/Skill/Data/SkillIndicatorDataSo.cs.meta
+++ b/BlueWater/Assets/02.Scripts/Skill/Data/SkillIndicatorDataSo.cs.meta
--- a/BlueWater/Assets/02.Scripts/Skill/Data/So/ActiveSkillDataSo.asset
+++ b/BlueWater/Assets/02.Scripts/Skill/Data/So/ActiveSkillDataSo.asset
@ -0,0 +1,41 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5c8c152ebe4f36f47aea1661f3d4dea5, type: 3}
+  m_Name: ActiveSkillDataSo
+  m_EditorClassIdentifier: 
+  <ActiveSkillDataList>k__BackingField:
+  - <Name>k__BackingField: FireBoom
+    <DisplayName>k__BackingField: "\uBD88\uAF43 \uD3ED\uD0C4"
+    <Description>k__BackingField: "\uCE90\uB9AD\uD130 \uC704\uCE58\uC5D0 \uD3ED\uBC1C\uC774
+      \uC77C\uC5B4\uB098\uB294 \uC2A4\uD0AC"
+    <Indicator>k__BackingField: {fileID: 0}
+    <IndicatorType>k__BackingField: 1
+    <Cooldown>k__BackingField: 5
+    <CastingTime>k__BackingField: 2
+    <CastingType>k__BackingField: 1
+    <Duration>k__BackingField: 0
+    <Damage>k__BackingField: 20
+    <Range>k__BackingField: 7
+    <MaxAttackTargets>k__BackingField: 30
+  - <Name>k__BackingField: AreaBoom
+    <DisplayName>k__BackingField: "\uC6D0\uAC70\uB9AC \uD3ED\uD0C4"
+    <Description>k__BackingField: "\uB9C8\uC6B0\uC2A4 \uC704\uCE58\uC5D0 \uD3ED\uBC1C\uC774
+      \uC77C\uC5B4\uB098\uB294 \uC2A4\uD0AC"
+    <Indicator>k__BackingField: {fileID: 0}
+    <IndicatorType>k__BackingField: 2
+    <Cooldown>k__BackingField: 5
+    <CastingTime>k__BackingField: 2
+    <CastingType>k__BackingField: 0
+    <Duration>k__BackingField: 0
+    <Damage>k__BackingField: 30
+    <Range>k__BackingField: 4
+    <MaxAttackTargets>k__BackingField: 30
--- a/BlueWater/Assets/02.Scripts/Skill/Data/So/ActiveSkillDataSo.asset.meta
+++ b/BlueWater/Assets/02.Scripts/Skill/Data/So/ActiveSkillDataSo.asset.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 193ff13eb8d75d24e870f062adbecfff
+guid: 97ebd289c10598a458425fbefd7db39f
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/BlueWater/Assets/02.Scripts/Skill/Data/So/FireBoom.asset
+++ b/BlueWater/Assets/02.Scripts/Skill/Data/So/FireBoom.asset
@ -1,22 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe75732105ea34648b25dd5b009f7261, type: 3}
-  m_Name: FireBoom
-  m_EditorClassIdentifier: 
-  <Name>k__BackingField: FireBoom
-  <Description>k__BackingField: "\uC81C\uC790\uB9AC \uAD11\uC5ED \uBD88\uAF43 \uD3ED\uD0C4"
-  <Cooldown>k__BackingField: 5
-  <CastingTime>k__BackingField: 2
-  <Duration>k__BackingField: 0
-  <Damage>k__BackingField: 30
-  <Range>k__BackingField: 7
-  <MaxAttackTargets>k__BackingField: 30
--- a/BlueWater/Assets/02.Scripts/Skill/Data/So/SkillIndicatorDataSo.asset
+++ b/BlueWater/Assets/02.Scripts/Skill/Data/So/SkillIndicatorDataSo.asset
@ -10,10 +10,11 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 72c34ec48ae377546a04387e0623b342, type: 3}
-  m_Name: SkillIndicatorData
+  m_Name: SkillIndicatorDataSo
  m_EditorClassIdentifier: 
  <RadiusIndicator>k__BackingField: {fileID: 2100000, guid: 8f2de9bf6c88b604da4f18203849c0dd,
    type: 2}
-  <AreaIndicator>k__BackingField: {fileID: 0}
+  <AreaIndicator>k__BackingField: {fileID: 2100000, guid: 4be0607f5d48fc44e85b941b37384b22,
+    type: 2}
  <ConeIndicator>k__BackingField: {fileID: 0}
  <LineIndicator>k__BackingField: {fileID: 0}
--- a/BlueWater/Assets/02.Scripts/Skill/Data/So/SkillIndicatorDataSo.asset.meta
+++ b/BlueWater/Assets/02.Scripts/Skill/Data/So/SkillIndicatorDataSo.asset.meta
--- a/BlueWater/Assets/02.Scripts/Skill/SkillController.cs
+++ b/BlueWater/Assets/02.Scripts/Skill/SkillController.cs
@ -8,35 +8,44 @@ namespace BlueWaterProject
    [Serializable]
    public class SkillController : MonoBehaviour
    {
-        [SerializeField] private List<GameObject> skillObjList = new(GlobalValue.SKILL_DATA_CAPACITY);
-        private Dictionary<string, GameObject> skillDictionary;
+        [SerializeField] private GameObject activeSkillPrefab;
+        [SerializeField] private ActiveSkillDataSo activeSkillDataSo;
+        private Dictionary<string, ActiveSkillData> activeSkillDictionary;

-        private GameObject cachingObj;
+        private ActiveSkillData cachingObj;

        private void Awake()
        {
-            Initialize();
+            Init();
        }

-        private void Initialize()
+        private void Init()
        {
-            skillDictionary = new Dictionary<string, GameObject>(skillObjList.Count);
+            activeSkillDictionary = new Dictionary<string, ActiveSkillData>(activeSkillDataSo.ActiveSkillDataList.Count);
            
-            foreach (var skill in skillObjList)
+            foreach (var activeSkillData in activeSkillDataSo.ActiveSkillDataList)
            {
-                var activeSkill = skill.GetComponent<ActiveSkill>();
-                if (activeSkill == null)
-                {
-                    print(activeSkill + "오브젝트의 ActiveSkill컴포넌트에 접근할 수 없습니다.");
-                    continue;
-                }
-                skillDictionary.Add(activeSkill.GetActiveSkillData().Name, skill);
+                activeSkillDictionary.Add(activeSkillData.Name, activeSkillData);
            }
        }

-        public GameObject GetSkillByName(string skillName)
+        public ActiveSkill InstantiateActiveSkillByName(string skillName)
        {
-            if (skillDictionary.TryGetValue(skillName, out cachingObj)) return cachingObj;
+            var instantiateActiveSkill = Instantiate(activeSkillPrefab).GetComponent<ActiveSkill>();
+            if (instantiateActiveSkill == null)
+            {
+                print("스킬을 생성할 수 없습니다.");
+                return null;
+            }
+            instantiateActiveSkill.ActiveSkillData = GetSkillByName(skillName);
+            instantiateActiveSkill.ChangeIndicatorType();
+
+            return instantiateActiveSkill;
+        }
+
+        public ActiveSkillData GetSkillByName(string skillName)
+        {
+            if (activeSkillDictionary.TryGetValue(skillName, out cachingObj)) return cachingObj;
            
            print(skillName + "은(는) 스킬 딕셔너리에 존재하지 않습니다.");
            return null;
--- a/BlueWater/Assets/03.Materials/Skill/AreaIndicator.mat
+++ b/BlueWater/Assets/03.Materials/Skill/AreaIndicator.mat
@ -0,0 +1,158 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-9156932153772516780
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: AreaIndicator
+  m_Shader: {fileID: -6465566751694194690, guid: 98b1a606a9cab8c4e8a550286f1c9972,
+    type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - Base_Map:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - Normal_Map:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _FillMap:
+        m_Texture: {fileID: 2800000, guid: be3dc57a3e6cfff46a6f38321763456e, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _IndicatorMap:
+        m_Texture: {fileID: 2800000, guid: ed7005bcdc79d774d866653ff8a0c6a0, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - Normal_Blend: 0.5
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DecalMeshBiasType: 0
+    - _DecalMeshDepthBias: 0
+    - _DecalMeshViewBias: 0
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DrawOrder: 0
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _Fill: 0
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Intensity: 1
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Opacity: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _RotationSpeed: 10
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
--- a/BlueWater/Assets/03.Materials/Skill/AreaIndicator.mat.meta
+++ b/BlueWater/Assets/03.Materials/Skill/AreaIndicator.mat.meta
@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 6464d017341de9242a8cb7cbd25701bf
-folderAsset: yes
-DefaultImporter:
+guid: 4be0607f5d48fc44e85b941b37384b22
+NativeFormatImporter:
  externalObjects: {}
+  mainObjectFileID: 2100000
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/ActiveSkill.prefab
+++ b/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/ActiveSkill.prefab
@ -44,7 +44,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 0777d029ed3dffa4692f417d4aba19ca, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
  m_DrawDistance: 1000
  m_FadeScale: 0.9
  m_StartAngleFade: 180
@ -65,6 +65,7 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 5043358165129361910}
+  - component: {fileID: 4651341690037793293}
  m_Layer: 0
  m_Name: ActiveSkill
  m_TagString: Untagged
@ -88,3 +89,22 @@ Transform:
  - {fileID: 4051035783022543630}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4651341690037793293
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8036009942072287766}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b16b26744a0b47f4e800fb8c842e8d33, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  skillIndicatorDataSo: {fileID: 11400000, guid: b04e2e154b17510488525b0cd0e30715,
+    type: 2}
+  activeSkillDataSo: {fileID: 0}
+  indicator: {fileID: 6177466515962511305}
+  indicatorType: 0
+  <IsCasting>k__BackingField: 0
+  followMouse: 0
--- a/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/Type/FireBoom.prefab
+++ b/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/Type/FireBoom.prefab
@ -1,110 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!1 &164134471025804824
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1493825192766137990}
-  - component: {fileID: 6559816094620836109}
-  m_Layer: 0
-  m_Name: FireBoom
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &1493825192766137990
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 164134471025804824}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5678497857098289672}
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6559816094620836109
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 164134471025804824}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b16b26744a0b47f4e800fb8c842e8d33, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  skillIndicatorDataSo: {fileID: 11400000, guid: b04e2e154b17510488525b0cd0e30715,
-    type: 2}
-  activeSkillDataSo: {fileID: 11400000, guid: 193ff13eb8d75d24e870f062adbecfff, type: 2}
-  indicator: {fileID: 3591530522189420336}
-  indicatorType: 1
-  isCasting: 0
-  followMouse: 0
--- !u!1 &4827779402540844998
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5678497857098289672}
-  - component: {fileID: 3591530522189420336}
-  m_Layer: 0
-  m_Name: Indicator
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &5678497857098289672
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4827779402540844998}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 5, y: 5, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1493825192766137990}
-  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!114 &3591530522189420336
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4827779402540844998}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0777d029ed3dffa4692f417d4aba19ca, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_DrawDistance: 1000
-  m_FadeScale: 0.9
-  m_StartAngleFade: 180
-  m_EndAngleFade: 180
-  m_UVScale: {x: 1, y: 1}
-  m_UVBias: {x: 0, y: 0}
-  m_DecalLayerMask: 1
-  m_ScaleMode: 1
-  m_Offset: {x: 0, y: 0, z: 0}
-  m_Size: {x: 1, y: 1, z: 20}
-  m_FadeFactor: 1
--- a/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/Type/FireBoom.prefab.meta
+++ b/BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/Type/FireBoom.prefab.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 56cddf44e719dd6478faf9c3f90a53d0
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/10.Shaders/AreaIndicator.shadergraph
+++ b/BlueWater/Assets/10.Shaders/AreaIndicator.shadergraph
--- a/BlueWater/Assets/10.Shaders/AreaIndicator.shadergraph.meta
+++ b/BlueWater/Assets/10.Shaders/AreaIndicator.shadergraph.meta
@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 98b1a606a9cab8c4e8a550286f1c9972
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
--- a/Indicator/RpgIndicatorHDRP.unitypackage.meta
+++ b/Indicator/RpgIndicatorHDRP.unitypackage.meta
@ -1,14 +0,0 @@
-fileFormatVersion: 2
-guid: 15978934df642964d83e02a48645ca70
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-AssetOrigin:
-  serializedVersion: 1
-  productId: 231163
-  packageName: RPG Indicator
-  packageVersion: 1.2
-  assetPath: Assets/RPG Indicator/RpgIndicatorHDRP.unitypackage
-  uploadId: 549204
--- a/Indicator/RpgIndicatorURP.unitypackage.meta
+++ b/Indicator/RpgIndicatorURP.unitypackage.meta
@ -1,14 +0,0 @@
-fileFormatVersion: 2
-guid: 9a3a3c3e8c9b17b49b7212296547d096
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-AssetOrigin:
-  serializedVersion: 1
-  productId: 231163
-  packageName: RPG Indicator
-  packageVersion: 1.2
-  assetPath: Assets/RPG Indicator/RpgIndicatorURP.unitypackage
-  uploadId: 549204