#43 FieldBoss01 Test.ver006

+ InIslandPlayer Ai(nav, bt)관련 삭제
  ㄴ Crewmate쪽 자동공격 문제 발생 가능
+ InIslandPlayer 콜라이더 크기 줄임(3 -> 1.5)
+ IceAge 스킬 표시기 색상(빨간색 -> 하늘색) 변경
+ 보스 사이즈(6 -> 8), 콜라이더 사이즈, 위치 조정
+ 구르기 속도(2 -> 4), 구르기 지속시간(0.5 -> 0.25)
+ 투사체 스킬(LavaBubbleBullet) 추가 중

BlueWater/Assets/01.Scenes/03.Stage_Test.unity

@@ -1992,14 +1992,6 @@ PrefabInstance:
         type: 3}
       insertIndex: -1
       addedObject: {fileID: 418278350}
-    - targetCorrespondingSourceObject: {fileID: 4681418249284042988, guid: 5d3f02c24a243a044bbddafc1652ee67,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 418278349}
-    - targetCorrespondingSourceObject: {fileID: 4681418249284042988, guid: 5d3f02c24a243a044bbddafc1652ee67,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 418278344}
     - targetCorrespondingSourceObject: {fileID: 4681418249284042988, guid: 5d3f02c24a243a044bbddafc1652ee67,
         type: 3}
       insertIndex: -1
@@ -2075,26 +2067,17 @@ MonoBehaviour:
     serializedVersion: 2
     m_Bits: 0
   isDrawGizmos: 1
-  isDrawViewRange: 1
-  isDrawDefenseRange: 1
-  isDrawTargetRange: 1
   <MaxHp>k__BackingField: 300
   <CurrentHp>k__BackingField: 0
   <MoveSpd>k__BackingField: 5
   <Atk>k__BackingField: 10
   <AtkCooldown>k__BackingField: 0.5
-  <DefenseRange>k__BackingField: 10
-  <IsRandomMove>k__BackingField: 0
-  <RandomMoveRange>k__BackingField: 0
   useHpSlider: 1
   hpSliderPrefab: {fileID: 6935276925009161207, guid: 6ca833d1d80448e4b8d030887386814e,
     type: 3}
   hpSliderOffset: {x: 0, y: 1, z: 0}
   hpSlider: {fileID: 0}
-  <DefensePos>k__BackingField: {x: 0, y: 0, z: 0}
   <IsCombated>k__BackingField: 0
-  <BeAttackedInIdle>k__BackingField: 0
-  <UseRigidbody>k__BackingField: 0
   useMouseAttack: 0
   isRolling: 0
   enableRoll: 1
@@ -2103,8 +2086,8 @@ MonoBehaviour:
   isAttacking: 0
   attackAngle: 180
   angleSpeed: 0.2
-  rollDuration: 0.5
+  rollDuration: 0.25
-  rollForce: 2
+  rollForce: 4
   rollCooldown: 0.5
   myActiveSkill: {fileID: 0}
 --- !u!114 &418278343
@@ -2210,77 +2193,6 @@ MonoBehaviour:
   m_DefaultActionMap: Player
   m_SplitScreenIndex: -1
   m_Camera: {fileID: 0}
---- !u!114 &418278344
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 418278336}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8d7b55c7ecdb49a4a89fa5e6f9022861, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  startWhenEnabled: 1
-  asynchronousLoad: 0
-  pauseWhenDisabled: 0
-  restartWhenComplete: 0
-  logTaskChanges: 0
-  group: 0
-  resetValuesOnRestart: 0
-  externalBehavior: {fileID: 11400000, guid: ff8e9852fea02684cb8de98d54a6890f, type: 2}
-  mBehaviorSource:
-    behaviorName: InIslandPlayer
-    behaviorDescription: 
-    mTaskData:
-      types: []
-      parentIndex: 
-      startIndex: 
-      variableStartIndex: 
-      JSONSerialization: '{"Variables":[{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"MyObj","IsShared":true,"PropertyMapping":"UnityEngine.RectTransform/gameObject","PropertyMappingOwner":0},{"Type":"BehaviorDesigner.Runtime.SharedGameObject","Name":"AnimatorObj","IsShared":true,"GameObjectmValue":1},{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"MyCollider","IsShared":true,"PropertyMapping":"BlueWaterProject.InIslandPlayer/MyCollider","PropertyMappingOwner":2},{"Type":"BehaviorDesigner.Runtime.SharedFloat","Name":"CurrentHp","IsShared":true,"PropertyMapping":"BlueWaterProject.InIslandPlayer/CurrentHp","PropertyMappingOwner":3,"SinglemValue":0},{"Type":"BehaviorDesigner.Runtime.SharedCollider","Name":"Target","IsShared":true,"PropertyMapping":"BlueWaterProject.InIslandPlayer/Target","PropertyMappingOwner":4},{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"AttackPos","IsShared":true,"Vector3mValue":"(0,0,0)"},{"Type":"BehaviorDesigner.Runtime.SharedVector3","Name":"DefensePos","IsShared":true,"PropertyMapping":"BlueWaterProject.InIslandPlayer/DefensePos","PropertyMappingOwner":5,"Vector3mValue":"(0,0,0)"},{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":"IsCombated","IsShared":true,"PropertyMapping":"BlueWaterProject.InIslandPlayer/IsCombated","PropertyMappingOwner":6,"BooleanmValue":false},{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":"BeAttackedInIdle","IsShared":true,"PropertyMapping":"BlueWaterProject.InIslandPlayer/BeAttackedInIdle","PropertyMappingOwner":7,"BooleanmValue":false},{"Type":"BehaviorDesigner.Runtime.SharedBool","Name":"UseRigidbody","IsShared":true,"PropertyMapping":"BlueWaterProject.InIslandPlayer/UseRigidbody","PropertyMappingOwner":8,"BooleanmValue":false}]}'
-      fieldSerializationData:
-        typeName: []
-        fieldNameHash: 
-        startIndex: 
-        dataPosition: 
-        unityObjects:
-        - {fileID: 418278336}
-        - {fileID: 507889968}
-        - {fileID: 418278336}
-        - {fileID: 418278336}
-        - {fileID: 418278336}
-        - {fileID: 418278336}
-        - {fileID: 418278336}
-        - {fileID: 418278336}
-        - {fileID: 418278336}
-        byteData: 
-        byteDataArray: 
-      Version: 1.7.7
-  gizmoViewMode: 2
-  showBehaviorDesignerGizmo: 1
---- !u!195 &418278349
-NavMeshAgent:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 418278336}
-  m_Enabled: 0
-  m_AgentTypeID: 0
-  m_Radius: 0.3
-  m_Speed: 3.5
-  m_Acceleration: 20
-  avoidancePriority: 10
-  m_AngularSpeed: 120
-  m_StoppingDistance: 0
-  m_AutoTraverseOffMeshLink: 1
-  m_AutoBraking: 1
-  m_AutoRepath: 1
-  m_Height: 0.75
-  m_BaseOffset: 0.07
-  m_WalkableMask: 1
-  m_ObstacleAvoidanceType: 4
 --- !u!136 &418278350
 CapsuleCollider:
   m_ObjectHideFlags: 0
@@ -2300,10 +2212,10 @@ CapsuleCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Radius: 0.3
+  m_Radius: 0.15
   m_Height: 0.75
   m_Direction: 1
-  m_Center: {x: 0, y: 0.3, z: 0}
+  m_Center: {x: 0, y: 0.3, z: -0.15}
 --- !u!54 &418278351
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -6204,16 +6116,21 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 348702644}
     m_Modifications:
-    - target: {fileID: 2542090886032468201, guid: 211c62e69325b584bb719f236f0e2d5c,
+    - target: {fileID: 4631607431441243179, guid: 211c62e69325b584bb719f236f0e2d5c,
         type: 3}
-      propertyPath: m_IsActive
+      propertyPath: m_Mass
-      value: 1
+      value: 1000
       objectReference: {fileID: 0}
     - target: {fileID: 4631607431441243179, guid: 211c62e69325b584bb719f236f0e2d5c,
         type: 3}
       propertyPath: m_Constraints
       value: 112
       objectReference: {fileID: 0}
+    - target: {fileID: 4631607431441243179, guid: 211c62e69325b584bb719f236f0e2d5c,
+        type: 3}
+      propertyPath: m_IsKinematic
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 4857443988311686059, guid: 211c62e69325b584bb719f236f0e2d5c,
         type: 3}
       propertyPath: m_Name
@@ -6224,16 +6141,6 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 5421044509281364360, guid: 211c62e69325b584bb719f236f0e2d5c,
-        type: 3}
-      propertyPath: m_Center.z
-      value: 0.05
-      objectReference: {fileID: 0}
-    - target: {fileID: 7556135373767129943, guid: 211c62e69325b584bb719f236f0e2d5c,
-        type: 3}
-      propertyPath: <MaxHp>k__BackingField
-      value: 300
-      objectReference: {fileID: 0}
     - target: {fileID: 9062185183980613901, guid: 211c62e69325b584bb719f236f0e2d5c,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -6242,7 +6149,7 @@ PrefabInstance:
     - target: {fileID: 9062185183980613901, guid: 211c62e69325b584bb719f236f0e2d5c,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 2.6
+      value: 3.71
       objectReference: {fileID: 0}
     - target: {fileID: 9062185183980613901, guid: 211c62e69325b584bb719f236f0e2d5c,
         type: 3}

BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldBoss/Type/FieldBoss01.cs

@@ -35,6 +35,7 @@ namespace BlueWaterProject
             activeSkillList.Add(skillController.GetSkillByName("LineRush"));
             activeSkillList.Add(skillController.GetSkillByName("BigLavaEruption"));
             activeSkillList.Add(skillController.GetSkillByName("VolcanicEruption"));
+            activeSkillList.Add(skillController.GetSkillByName("LavaBubbleBullet"));
 
             collisionDamage = activeSkillList[1].ActiveSkillData.Damage;
         }
@@ -92,6 +93,12 @@ namespace BlueWaterProject
                     endSkillTime = lava.GetEndSkillTime();
                 }
             }
+            else if (activeSkill.ActiveSkillData.Name.Equals("LavaBubbleBullet"))
+            {
+                var bullet = Instantiate(activeSkill, MyCollider.bounds.center, Quaternion.identity);
+                bullet.SetUser(transform);
+                bullet.Execute(Target);
+            }
             StartCoroutine(CoolDown(endSkillTime, () => usedSkillCoroutine = false));
         }
 

BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs

@@ -1,16 +1,14 @@
 using System;
 using System.Collections;
-using BehaviorDesigner.Runtime;
 using Sirenix.OdinInspector;
 using UnityEngine;
-using UnityEngine.AI;
 using UnityEngine.InputSystem;
 using UnityEngine.UI;
 
 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
 {
-    public class InIslandPlayer : Player, IAnimatorBridge, IAiView, INormalAttack, IInIslandPlayer
+    public class InIslandPlayer : Player, IAnimatorBridge, INormalAttack, IInIslandPlayer
     {
         #region Properties and variables
 
@@ -19,18 +17,6 @@ namespace BlueWaterProject
         [Tooltip("전체 Gizmos 그리기 여부")]
         [SerializeField] private bool isDrawGizmos = true;
         
-        [ShowIf("@isDrawGizmos")]
-        [Tooltip("타겟 인식 범위 그리기 여부")]
-        [SerializeField] private bool isDrawViewRange = true;
-        
-        [ShowIf("@isDrawGizmos")]
-        [Tooltip("이동제한 범위 그리기 여부")]
-        [SerializeField] private bool isDrawDefenseRange = true;
-        
-        [ShowIf("@isDrawGizmos")]
-        [Tooltip("타겟과의 상태 그리기 여부\n빨간색 = 공격 범위 밖\n파란색 = 공격 범위 안")]
-        [SerializeField] private bool isDrawTargetRange = true;
-
         // Stat
         [field: Title("Stat")]
         [field: Tooltip("최대 체력 설정")]
@@ -49,16 +35,6 @@ namespace BlueWaterProject
         [field: OnValueChanged("SetAtkWaitCooldown")]
         [field: SerializeField] public float AtkCooldown { get; private set; } = 1f;
 
-        [field: Tooltip("이동 제한 범위 설정")]
-        [field: SerializeField] public float DefenseRange { get; private set; } = 20f;
-        
-        [field: Tooltip("Idle 상태에서 랜덤으로 이동 여부")]
-        [field: SerializeField] public bool IsRandomMove { get; set; }
-        
-        [field: ShowIf("@IsRandomMove")]
-        [field: Tooltip("Idle 상태에서 이동하는 범위 설정")]
-        [field: SerializeField] public float RandomMoveRange { get; set; }
-
         // HpSlider
         [Title("HpSlider")]
         [SerializeField] private bool useHpSlider = true;
@@ -77,13 +53,7 @@ namespace BlueWaterProject
         // Data
         [field: Title("Data")]
         [field: DisableIf("@true")]
-        [field: SerializeField] public Vector3 DefensePos { get; set; }
-        [field: DisableIf("@true")]
         [field: SerializeField] public bool IsCombated { get; set; }
-        [field: DisableIf("@true")]
-        [field: SerializeField] public bool BeAttackedInIdle { get; set; }
-        [field: DisableIf("@true")]
-        [field: SerializeField] public bool UseRigidbody { get; set; }
         [DisableIf("@true")]
         [SerializeField] private bool useMouseAttack;
         [DisableIf("@true")]
@@ -113,14 +83,13 @@ namespace BlueWaterProject
         private Collider[] hitColliders;
         private Coroutine slowMotionCoroutine;
         private Coroutine showIndicatorCoroutine;
+        public bool UseRigidbody { get; set; } = true;
         
         // 컴포넌트
         public GameObject GameObject => gameObject;
         public Transform Transform => transform;
         public Rigidbody Rb { get; set; }
         public Collider MyCollider { get; set; }
-        public NavMeshAgent Agent { get; set; }
-        private BehaviorTree bt;
         private Transform unitRoot;
         private Animator myAnimator;
         private Transform trailRoot;
@@ -128,7 +97,7 @@ namespace BlueWaterProject
         private ParticleSystem afterImageTrail;
         private Canvas worldSpaceCanvas;
         private SkillController skillController;
-        [SerializeField]private ActiveSkill myActiveSkill;
+        [SerializeField] private ActiveSkill myActiveSkill;
         
         // Hash
         private static readonly int RunStateHash = Animator.StringToHash("RunState");
@@ -151,38 +120,17 @@ namespace BlueWaterProject
             if (!isDrawGizmos) return;
 
             Vector3 myCenterPos;
-            Vector3 defensePos;
             if (Application.isPlaying)
             {
                 myCenterPos = MyCollider.bounds.center;
-                defensePos = DefensePos;
             }
             else
             {
                 myCenterPos = GetComponent<Collider>().bounds.center;
-                defensePos = transform.position;
             }
             
             Gizmos.color = Color.red;
             Gizmos.DrawWireSphere(myCenterPos, AtkRange);
-            
-            if (isDrawDefenseRange)
-            {
-                Gizmos.color = Color.blue;
-                Gizmos.DrawWireSphere(defensePos, DefenseRange);
-            }
-
-            if (isDrawViewRange)
-            {
-                Gizmos.color = Color.red;
-                Gizmos.DrawWireSphere(myCenterPos, ViewRadius);
-            }
-            
-            if (!isDrawTargetRange || !Target) return;
-
-            var targetToDistance = Vector3.Distance(myCenterPos, Target.bounds.center);
-            Gizmos.color = targetToDistance <= AtkRange ? Color.blue : Color.red;
-            Gizmos.DrawLine(myCenterPos, Target.bounds.center);
         }
 
         protected override void Awake()
@@ -191,8 +139,6 @@ namespace BlueWaterProject
             
             Rb = GetComponent<Rigidbody>();
             MyCollider = GetComponent<Collider>();
-            Agent = GetComponent<NavMeshAgent>();
-            bt = GetComponent<BehaviorTree>();
 
             unitRoot = transform.Find("UnitRoot");
             if (unitRoot == null)
@@ -258,18 +204,13 @@ namespace BlueWaterProject
         {
             base.Start();
 
+            Rb.isKinematic = false;
             hitColliders = new Collider[MAX_COLLIDERS];
             TargetLayer = LayerMask.GetMask("Enemy");
             waitAtkCooldown = new WaitForSeconds(AtkCooldown);
             myActiveSkill = skillController.InstantiateActiveSkillByName("IceAge");
             myActiveSkill.SetUser(transform);
             
-            if (Agent.enabled)
-            {
-                Agent.updateRotation = false;
-                SetAgentSpeed(MoveSpd);
-            }
-            
             if (useHpSlider)
             {
                 hpSlider.maxValue = MaxHp;
@@ -322,12 +263,6 @@ namespace BlueWaterProject
             
             IsCombated = true;
             
-            if (!Target)
-            {
-                BeAttackedInIdle = true;
-                bt.SendEvent("BeAttackedInIdle", attackPos);
-            }
-            
             var changeHp = Mathf.Max(CurrentHp - attackerPower, 0);
             SetCurrentHp(changeHp);
 
@@ -349,17 +284,8 @@ namespace BlueWaterProject
         public override void Die()
         {
             myAnimator.SetTrigger(DieHash);
+            Rb.isKinematic = true;
             MyCollider.enabled = false;
-            if (Agent.enabled)
-            {
-                Agent.isStopped = true;
-            }
-            else
-            {
-                Rb.isKinematic = true;
-            }
-            Agent.enabled = false;
-            
             
             switch (GameManager.Inst.IslandPlayerMode)
             {
@@ -506,34 +432,6 @@ namespace BlueWaterProject
         
         public void SetIsAttacking(int boolValue) => isAttacking = boolValue == 1;
         
-        // IAiView
-        public override void SetTarget(Collider value)
-        {
-            Target = value;
-
-            if (value != null)
-            {
-                IsCombated = true;
-                BeAttackedInIdle = false;
-            }
-        }
-        
-        public bool GoOutOfBounds()
-        {
-            var defensePosInRange = Vector3.Distance(transform.position, DefensePos) <= DefenseRange;
-            return !defensePosInRange;
-        }
-            
-        public override void MoveTarget(Vector3 targetPos, float speed, float stopDistance = float.MaxValue)
-        {
-            if (Vector3.Distance(Agent.destination, targetPos) < 0.1f) return;
-            
-            SetAgentSpeed(speed);
-            Agent.stoppingDistance = stopDistance;
-            Agent.isStopped = false;
-            Agent.SetDestination(targetPos);
-        }
-        
         // INormalAttack
         public void NormalAttack()
         {
@@ -682,10 +580,9 @@ namespace BlueWaterProject
                 myAnimator.SetFloat(RunStateHash, 0f);
             }
             
-            DefensePos = transform.position;
             foreach (var crewmate in GameManager.Inst.CurrentCrewmateList)
             {
-                crewmate.DefensePos = DefensePos;
+                crewmate.DefensePos = transform.position;
             }
         }
 
@@ -694,27 +591,7 @@ namespace BlueWaterProject
             if (useMouseAttack) return;
             
             var localScale = transform.localScale;
-            var xVelocity = 0f;
+            localScale.x = Rb.velocity.x switch
-            
-            if (UseRigidbody)
-            {
-                xVelocity = Rb.velocity.x;
-            }
-            else
-            {
-                if (Agent.velocity.x != 0)
-                {
-                    xVelocity = Agent.velocity.x;
-                }
-                else
-                {
-                    if (Target)
-                    {
-                        xVelocity = Target.bounds.center.x - MyCollider.bounds.center.x;
-                    }
-                }
-            }
-            localScale.x = xVelocity switch
             {
                 > 0.01f => Mathf.Abs(localScale.x),
                 < -0.01f => -Mathf.Abs(localScale.x),
@@ -780,25 +657,6 @@ namespace BlueWaterProject
             overlayCanvas.transform.Find("RestartPopUp").gameObject.SetActive(true);
         }
 
-        public void UseRigidbodyMovement()
-        {
-            UseRigidbody = true;
-            Rb.isKinematic = false;
-            Agent.enabled = false;
-        }
-        
-        public void UseAgentMovement()
-        {
-            DefensePos = transform.position;
-            foreach (var crewmate in GameManager.Inst.CurrentCrewmateList)
-            {
-                crewmate.DefensePos = DefensePos;
-            }
-            UseRigidbody = false;
-            Rb.isKinematic = true;
-            Agent.enabled = true;
-        }
-
         private IEnumerator BeAttacked()
         {
             beAttacked = true;
@@ -818,7 +676,6 @@ namespace BlueWaterProject
             }
         }
         
-        private void SetAgentSpeed(float value) => Agent.speed = value;
         private void SetAtkWaitCooldown() => waitAtkCooldown = new WaitForSeconds(AtkCooldown);
 
         #endregion

BlueWater/Assets/02.Scripts/Skill/ActiveSkill/ActiveSkill.cs

@@ -3,7 +3,6 @@ using System.Collections;
 using Sirenix.OdinInspector;
 using UnityEngine;
 using UnityEngine.Rendering.Universal;
-using UnityEngine.Serialization;
 
 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
@@ -60,41 +59,49 @@ namespace BlueWaterProject
         private void InitComponent()
         {
             indicator = GetComponentInChildren<DecalProjector>();
-            if (indicator == null)
-            {
-                print("하위 오브젝트로 DecalProjector 컴포넌트를 찾을 수 없습니다.");
-            }
-
             mainCam = Camera.main;
         }
         
         protected void BasicSetting()
         {
             transform.localPosition = Vector3.zero;
-            indicator.scaleMode = DecalScaleMode.InheritFromHierarchy;
+            if (indicator)
-            indicator.material = new Material(indicator.material);
+            {
-            indicator.material.SetFloat(FillHash, 0f);
+                indicator.scaleMode = DecalScaleMode.InheritFromHierarchy;
+                indicator.material = new Material(indicator.material);
+                indicator.material.SetFloat(FillHash, 0f);
+            }
             hitColliders = new Collider[ActiveSkillData.MaxAttackTargets];
         }
 
         protected void HideIndicator()
         {
-            indicator.enabled = false;
+            if (indicator)
-            indicator.material.SetFloat(FillHash, 0);
+            {
+                indicator.enabled = false;
+                indicator.material.SetFloat(FillHash, 0);
+            }
             IsCasting = false;
             followMouse = false;
         }
 
         public IEnumerator ShowIndicator()
         {
-            indicator.transform.position = user.position;
+            if (indicator)
-            indicator.material.SetFloat(FillHash, 0);
-            indicator.enabled = true;
-
-            while (true)
             {
                 indicator.transform.position = user.position;
-                yield return null;
+                indicator.material.SetFloat(FillHash, 0);
+                indicator.enabled = true;
+                
+                while (true)
+                {
+                    indicator!.transform.position = user.position;
+                    yield return null;
+                }
+            }
+            else
+            {
+                yield break;
             }
         }
         
@@ -110,6 +117,11 @@ namespace BlueWaterProject
             
         }
         
+        public virtual void Execute(Collider target)
+        {
+            
+        }
+
         protected void CastingMove()
         {
             switch (ActiveSkillData.CastingType)
@@ -133,7 +145,10 @@ namespace BlueWaterProject
                 var targetPos = (userPos + raycastHit.point) / 2;
                 var distance = targetPos - userPos;
                 distance = Vector3.ClampMagnitude((distance * 2), ActiveSkillData.Range);
-                indicator.transform.position = userPos + distance;
+                if (indicator)
+                {
+                    indicator.transform.position = userPos + distance;
+                }
             }
         }
         

BlueWater/Assets/02.Scripts/Skill/ActiveSkill/Type/IceAge.cs

@@ -21,10 +21,11 @@ namespace BlueWaterProject
             {
                 IsCasting = true;
                 
+                var fill = 1 / ActiveSkillData.CastingTime;
                 while (IsCasting && indicator.material.GetFloat(FillHash) < 1f)
                 {
                     CastingMove();
-                    var fillValue = indicator.material.GetFloat(FillHash) + Time.deltaTime * (1 / ActiveSkillData.CastingTime);
+                    var fillValue = indicator.material.GetFloat(FillHash) + Time.deltaTime * fill;
                     indicator.material.SetFloat(FillHash, fillValue);
                     yield return null;
                 }

BlueWater/Assets/02.Scripts/Skill/ActiveSkill/Type/LavaBubbleBullet.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Collections;
+using Sirenix.OdinInspector;
+using UnityEngine;
+using Random = UnityEngine.Random;
+
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    public class LavaBubbleBullet : ActiveSkill, IDamageable
+    {
+        [Title("Extensions Data")]
+        [SerializeField] private float randomRadius = 3f;
+        [SerializeField] private float projectileDelay = 2f;
+        [SerializeField] private Vector3 projectileOffset = new(0f, 2f, 0f);
+        [SerializeField] private float projectileSpeed = 0.3f;
+
+        private ParticleWeapon bulletEffect;
+
+        private static bool isHitting;
+        
+        public override void Execute(LayerMask targetLayer, Vector3 targetPos, Action action1 = null, Action action2 = null, Action action3 = null)
+        {
+            
+        }
+        
+        public override void Execute(Collider target)
+        {
+            StartCoroutine(SkillCoroutine(target));
+        }
+
+        protected override void Awake()
+        {
+            base.Awake();
+
+            bulletEffect = GetComponent<ParticleWeapon>();
+            //endSkillTime = projectileDelay + ActiveSkillData.CastingTime;
+        }
+
+        private IEnumerator SkillCoroutine(Collider target)
+        {
+            bulletEffect.transform.LookAt(target.bounds.center);
+            bulletEffect.GetComponent<Rigidbody>().AddForce(bulletEffect.transform.forward * projectileSpeed);
+            
+            // var time = 0f;
+            // while (time < projectileDelay)
+            // {
+            //     time += Time.deltaTime;
+            //     yield return null;
+            // }
+            
+            yield return null;
+        }
+
+        public void TakeDamage(float attackerPower, Vector3? attackPos = null)
+        {
+            Die();
+        }
+
+        public void Die()
+        {
+            bulletEffect.DestroyParticle();
+        }
+    }
+}

BlueWater/Assets/02.Scripts/Skill/ActiveSkill/Type/LavaBubbleBullet.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 89cdace98cb11fc4fb07d6569629f43f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/02.Scripts/Skill/ActiveSkill/Type/LavaEruption.cs

@@ -83,9 +83,10 @@ namespace BlueWaterProject
             
             // 투사체 발사
             
+            var fill = 1 / ActiveSkillData.CastingTime;
             while (IsCasting && indicator.material.GetFloat(FillHash) < 1f)
             {
-                var fillValue = indicator.material.GetFloat(FillHash) + Time.deltaTime * (1 / ActiveSkillData.CastingTime);
+                var fillValue = indicator.material.GetFloat(FillHash) + Time.deltaTime * fill;
                 indicator.material.SetFloat(FillHash, fillValue);
                 yield return null;
             }

BlueWater/Assets/02.Scripts/Skill/ActiveSkill/Type/LineRush.cs

@@ -45,14 +45,16 @@ namespace BlueWaterProject
             IsCasting = true;
             Debug.DrawLine(userPos, targetRushPos, Color.red, 5f);
             
+            var fill = 1 / ActiveSkillData.CastingTime;
             while (IsCasting && indicator.material.GetFloat(FillHash) < 1f)
             {
-                var fillValue = indicator.material.GetFloat(FillHash) + Time.deltaTime * (1 / ActiveSkillData.CastingTime);
+                var fillValue = indicator.material.GetFloat(FillHash) + Time.deltaTime * fill;
                 indicator.material.SetFloat(FillHash, fillValue);
                 yield return null;
             }
             
             HideIndicator();
+            userRb.isKinematic = false;
             ghostPlay.Invoke();
             userRb.velocity = rushVelocity;
             
@@ -62,6 +64,7 @@ namespace BlueWaterProject
                 time += Time.deltaTime;
                 yield return null;
             }
+            userRb.isKinematic = true;
             userRb.velocity = Vector3.zero;
             ghostStop.Invoke();
             

BlueWater/Assets/02.Scripts/Skill/ActiveSkill/Type/VolcanicEruption.cs

@@ -81,9 +81,10 @@ namespace BlueWaterProject
             
             // 투사체 발사
             
+            var fill = 1 / ActiveSkillData.CastingTime;
             while (IsCasting && indicator.material.GetFloat(FillHash) < 1f)
             {
-                var fillValue = indicator.material.GetFloat(FillHash) + Time.deltaTime * (1 / ActiveSkillData.CastingTime);
+                var fillValue = indicator.material.GetFloat(FillHash) + Time.deltaTime * fill;
                 indicator.material.SetFloat(FillHash, fillValue);
                 yield return null;
             }

BlueWater/Assets/02.Scripts/Skill/Data/So/ActiveSkillSo.asset

@@ -18,3 +18,4 @@ MonoBehaviour:
   - {fileID: -7451257323989943520, guid: 8401fbca52c83624fad879954e93bbe1, type: 3}
   - {fileID: 1362742867961675026, guid: 46d6bd3b77d144e48a6cd1714026bd10, type: 3}
   - {fileID: -8657138461080468130, guid: 25a55b178ebb50443bbde671b28a5559, type: 3}
+  - {fileID: 6697452366640982870, guid: 6c98e195dc37dda409252260340658bd, type: 3}

BlueWater/Assets/02.Scripts/SpawnController.cs

@@ -104,8 +104,6 @@ namespace BlueWaterProject
                 inIslandPlayer = islandPlayer.AddComponent<InIslandPlayer>();
             }
 
-            inIslandPlayer.UseRigidbodyMovement();
-
             InIslandCamera.Inst.SetTarget(islandPlayer.transform);
 
             GameManager.Inst.SetCurrentInIslandPlayer(inIslandPlayer);

BlueWater/Assets/02.Scripts/Weapon/ParticleWeapon.cs

@@ -23,6 +23,7 @@ namespace BlueWaterProject
         private Rigidbody rb;
         private SphereCollider sphereCollider;
         private WaitForSeconds waitForSeconds;
+        private RaycastHit hit;
         
         private void OnDrawGizmosSelected()
         {
@@ -79,33 +80,37 @@ namespace BlueWaterProject
 
             detectionDistance = rb.velocity.magnitude * Time.deltaTime; // Distance of collision detection for this frame
             
-            if (Physics.SphereCast(transform.position, radius, direction, out var hit, detectionDistance, targetLayer)) // Checks if collision will happen
+            if (Physics.SphereCast(transform.position, radius, direction, out hit, detectionDistance, targetLayer)) // Checks if collision will happen
             {
-                transform.position = hit.point + (hit.normal * collideOffset); // Move projectile to point of collision
+                DestroyParticle();
-
-                var impactP = Instantiate(impactParticle, transform.position, Quaternion.FromToRotation(Vector3.up, hit.normal), transform) as GameObject; // Spawns impact effect
-
-                var trails = GetComponentsInChildren<ParticleSystem>(); // Gets a list of particle systems, as we need to detach the trails
-                //Component at [0] is that of the parent i.e. this object (if there is any)
-                for (var i = 1; i < trails.Length; i++) // Loop to cycle through found particle systems
-                {
-                    var trail = trails[i];
-
-                    if (trail.gameObject.name.Contains("Trail"))
-                    {
-                        trail.transform.SetParent(null); // Detaches the trail from the projectile
-                        Destroy(trail.gameObject, 2f); // Removes the trail after seconds
-                    }
-                }
-
-                Destroy(projectileParticle, 3f); // Removes particle effect after delay
-                Destroy(impactP, 3.5f); // Removes impact effect after delay
-                Destroy(gameObject); // Removes the projectile
 
                 hit.transform.GetComponent<IDamageable>()?.TakeDamage(power);
             }
         }
 
+        public void DestroyParticle()
+        {
+            transform.position = hit.point + (hit.normal * collideOffset); // Move projectile to point of collision
+            var impactP = Instantiate(impactParticle, transform.position, Quaternion.FromToRotation(Vector3.up, hit.normal), transform) as GameObject; // Spawns impact effect
+
+            var trails = GetComponentsInChildren<ParticleSystem>(); // Gets a list of particle systems, as we need to detach the trails
+            //Component at [0] is that of the parent i.e. this object (if there is any)
+            for (var i = 1; i < trails.Length; i++) // Loop to cycle through found particle systems
+            {
+                var trail = trails[i];
+
+                if (trail.gameObject.name.Contains("Trail"))
+                {
+                    trail.transform.SetParent(null); // Detaches the trail from the projectile
+                    Destroy(trail.gameObject, 2f); // Removes the trail after seconds
+                }
+            }
+
+            Destroy(projectileParticle, 3f); // Removes particle effect after delay
+            Destroy(impactP, 3.5f); // Removes impact effect after delay
+            Destroy(gameObject); // Removes the projectile
+        }
+
         private IEnumerator AutoDestroy()
         {
             yield return waitForSeconds;

BlueWater/Assets/03.Images/AttackSlash2.png.meta

@@ -0,0 +1,136 @@
+fileFormatVersion: 2
+guid: c9ae3954595e490448d5b2ab8698c289
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/03.Materials/Skill/IceAge.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: IceAge
+  m_Shader: {fileID: -6465566751694194690, guid: d2d3ec58c9a3c0748a74f5bc2d90e90c,
+    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: 3bcf2706c6f516f47825b702f8a60d61, 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: 0, g: 2.9960787, b: 2.9960787, 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: []

BlueWater/Assets/03.Materials/Skill/IceAge.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: aa609d6e85e581b468cc97b891d2350f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/05.Prefabs/Characters/Enemies/FieldBosses/FieldBoss01.prefab

@@ -72,7 +72,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 1
+  m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: ba19392b87d0ac049b9a8c52c82688bb, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -4942,7 +4942,7 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 6, y: 6, z: 6}
+  m_LocalScale: {x: 8, y: 8, z: 8}
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 8435390228243998414}
@@ -4995,8 +4995,8 @@ CapsuleCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Radius: 0.2
+  m_Radius: 0.25
-  m_Height: 0.8
+  m_Height: 0.85
   m_Direction: 1
   m_Center: {x: 0, y: 0, z: 0.05}
 --- !u!114 &8578613947122429216

BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/BigLavaEruption.prefab

@@ -65,8 +65,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5043358165129361910}
-  - component: {fileID: 1362742867961675026}
   - component: {fileID: 6019070022799669944}
+  - component: {fileID: 1362742867961675026}
   m_Layer: 25
   m_Name: BigLavaEruption
   m_TagString: Untagged
@@ -91,6 +91,27 @@ Transform:
   - {fileID: 8069353124735292294}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!135 &6019070022799669944
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8036009942072287766}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 0
+  serializedVersion: 3
+  m_Radius: 0.5
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &1362742867961675026
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -125,27 +146,6 @@ MonoBehaviour:
   lavaMaterial: {fileID: 2100000, guid: ff3fe548557b04446b9c9e1b45340926, type: 2}
   lavaEffect: {fileID: 8069353124720114776}
   myCollider: {fileID: 6019070022799669944}
---- !u!135 &6019070022799669944
-SphereCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8036009942072287766}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 1
-  m_ProvidesContacts: 0
-  m_Enabled: 0
-  serializedVersion: 3
-  m_Radius: 0.5
-  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1001 &8069353124735629034
 PrefabInstance:
   m_ObjectHideFlags: 0

BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/IceAge.prefab

@@ -44,7 +44,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0777d029ed3dffa4692f417d4aba19ca, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 2100000, guid: 8f2de9bf6c88b604da4f18203849c0dd, type: 2}
+  m_Material: {fileID: 2100000, guid: aa609d6e85e581b468cc97b891d2350f, type: 2}
   m_DrawDistance: 1000
   m_FadeScale: 0.9
   m_StartAngleFade: 180

BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/LavaBubbleBullet.prefab

@@ -0,0 +1,141 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8036009942072287766
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5043358165129361910}
+  - component: {fileID: 7638329233694647706}
+  - component: {fileID: 6973899763280148200}
+  - component: {fileID: 6697452366640982870}
+  - component: {fileID: 8311486806150395859}
+  m_Layer: 25
+  m_Name: LavaBubbleBullet
+  m_TagString: DestructiveSkill
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5043358165129361910
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8036009942072287766}
+  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: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!135 &7638329233694647706
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8036009942072287766}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 0
+  serializedVersion: 3
+  m_Radius: 0.5
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!54 &6973899763280148200
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8036009942072287766}
+  serializedVersion: 4
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 0
+  m_IsKinematic: 0
+  m_Interpolate: 1
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!114 &6697452366640982870
+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: 89cdace98cb11fc4fb07d6569629f43f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  <ActiveSkillData>k__BackingField:
+    <Name>k__BackingField: LavaBubbleBullet
+    <DisplayName>k__BackingField: 
+    <Description>k__BackingField: 
+    <Cooldown>k__BackingField: 5
+    <CastingTime>k__BackingField: 0
+    <CastingType>k__BackingField: 0
+    <Duration>k__BackingField: 0
+    <Damage>k__BackingField: 10
+    <Range>k__BackingField: 0.5
+    <MaxAttackTargets>k__BackingField: 10
+    <ExplodeEffect>k__BackingField: {fileID: 0}
+  indicator: {fileID: 0}
+  <IsCasting>k__BackingField: 0
+  followMouse: 0
+  randomRadius: 3
+  projectileDelay: 0.3
+  projectileOffset: {x: 0, y: 2, z: 0}
+  projectileSpeed: 3
+--- !u!114 &8311486806150395859
+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: 289299db27a030e4eaf9e2e8486f4afc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  impactParticle: {fileID: 1817797803601600, guid: a770cb84159dd9948ad22e48d4d4b62a,
+    type: 3}
+  projectileParticle: {fileID: 1905436362935654, guid: 1a1aed3c631e0d7489c1702e4d6a53df,
+    type: 3}
+  muzzleParticle: {fileID: 1892333751805388, guid: fa317e978349f86468473aea57d07abb,
+    type: 3}
+  colliderRadius: 0.5
+  collideOffset: 0.15
+  targetLayer:
+    serializedVersion: 2
+    m_Bits: 512
+  power: 10
+  autoDestroyTime: 15

BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/LavaBubbleBullet.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6c98e195dc37dda409252260340658bd
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/LavaEruption.prefab

@@ -65,8 +65,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5043358165129361910}
-  - component: {fileID: 1362742867961675026}
   - component: {fileID: 7638329233694647706}
+  - component: {fileID: 1362742867961675026}
   m_Layer: 25
   m_Name: LavaEruption
   m_TagString: Untagged
@@ -91,6 +91,27 @@ Transform:
   - {fileID: 2337368552274346600}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!135 &7638329233694647706
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8036009942072287766}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 0
+  serializedVersion: 3
+  m_Radius: 0.5
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &1362742867961675026
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -125,27 +146,6 @@ MonoBehaviour:
   lavaMaterial: {fileID: 2100000, guid: ff3fe548557b04446b9c9e1b45340926, type: 2}
   lavaEffect: {fileID: 2337368552254942646}
   myCollider: {fileID: 7638329233694647706}
---- !u!135 &7638329233694647706
-SphereCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8036009942072287766}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 1
-  m_ProvidesContacts: 0
-  m_Enabled: 0
-  serializedVersion: 3
-  m_Radius: 0.5
-  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1001 &2337368552274421508
 PrefabInstance:
   m_ObjectHideFlags: 0

BlueWater/Assets/05.Prefabs/Skills/ActiveSkills/VolcanicEruption.prefab

@@ -65,8 +65,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5043358165129361910}
-  - component: {fileID: -8657138461080468130}
   - component: {fileID: 9177590095021392368}
+  - component: {fileID: -8657138461080468130}
   m_Layer: 25
   m_Name: VolcanicEruption
   m_TagString: Untagged
@@ -91,6 +91,27 @@ Transform:
   - {fileID: 5178252110420506127}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!135 &9177590095021392368
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8036009942072287766}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 0
+  serializedVersion: 3
+  m_Radius: 0.5
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &-8657138461080468130
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -125,27 +146,6 @@ MonoBehaviour:
   lavaMaterial: {fileID: 2100000, guid: ff3fe548557b04446b9c9e1b45340926, type: 2}
   lavaEffect: {fileID: 5178252110406326737}
   myCollider: {fileID: 9177590095021392368}
---- !u!135 &9177590095021392368
-SphereCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8036009942072287766}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 1
-  m_ProvidesContacts: 0
-  m_Enabled: 0
-  serializedVersion: 3
-  m_Radius: 0.5
-  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1001 &5178252110420038499
 PrefabInstance:
   m_ObjectHideFlags: 0

BlueWater/Assets/05.Prefabs/Skills/Particles/LavaBubbleBuleet.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7b70a2481b0ee8d4f8f8f07e0ba66822
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/05.Prefabs/Skills/Particles/LavaBubbleBuleet/BubbleExplosion.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a770cb84159dd9948ad22e48d4d4b62a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/05.Prefabs/Skills/Particles/LavaBubbleBuleet/BubbleMissile.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1a1aed3c631e0d7489c1702e4d6a53df
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/05.Prefabs/Skills/Particles/LavaBubbleBuleet/BubbleMissileOBJ.prefab

@@ -0,0 +1,109 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &128572
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 450904}
+  - component: {fileID: 13576440}
+  - component: {fileID: 5479992}
+  - component: {fileID: 8713905815847466484}
+  m_Layer: 0
+  m_Name: BubbleMissileOBJ
+  m_TagString: Missile
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &450904
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 128572}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 8.313633, y: 5.892903, z: -13.319157}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &13576440
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 128572}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Radius: 0.15
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!54 &5479992
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 128572}
+  serializedVersion: 4
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 0
+  m_IsKinematic: 0
+  m_Interpolate: 1
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!114 &8713905815847466484
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 128572}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 289299db27a030e4eaf9e2e8486f4afc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  impactParticle: {fileID: 1817797803601600, guid: a770cb84159dd9948ad22e48d4d4b62a,
+    type: 3}
+  projectileParticle: {fileID: 1905436362935654, guid: 1a1aed3c631e0d7489c1702e4d6a53df,
+    type: 3}
+  muzzleParticle: {fileID: 1892333751805388, guid: fa317e978349f86468473aea57d07abb,
+    type: 3}
+  colliderRadius: 1
+  collideOffset: 0.15
+  targetLayer:
+    serializedVersion: 2
+    m_Bits: 0
+  power: 0
+  autoDestroyTime: 5

BlueWater/Assets/05.Prefabs/Skills/Particles/LavaBubbleBuleet/BubbleMissileOBJ.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a725b620d2f11c348929ebb47cc18148
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/05.Prefabs/Skills/Particles/LavaBubbleBuleet/BubbleMuzzle.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fa317e978349f86468473aea57d07abb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/Epic Toon FX/Demo/Missile Prefabs/Bubble/BubbleMissileOBJ.prefab

@@ -3,9 +3,10 @@
 --- !u!1 &128572
 GameObject:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_PrefabInstance: {fileID: 0}
-  serializedVersion: 5
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
   m_Component:
   - component: {fileID: 450904}
   - component: {fileID: 13576440}
@@ -20,27 +21,62 @@ GameObject:
   m_IsActive: 1
 --- !u!4 &450904
 Transform:
-  m_ObjectHideFlags: 1
+  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 128572}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 8.313633, y: 5.892903, z: -13.319157}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &13576440
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 128572}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Radius: 0.15
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!54 &5479992
 Rigidbody:
-  m_ObjectHideFlags: 1
+  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 128572}
-  serializedVersion: 2
+  serializedVersion: 4
   m_Mass: 1
   m_Drag: 0
   m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
   m_UseGravity: 0
   m_IsKinematic: 0
   m_Interpolate: 1
@@ -48,9 +84,10 @@ Rigidbody:
   m_CollisionDetection: 0
 --- !u!114 &11464288
 MonoBehaviour:
-  m_ObjectHideFlags: 1
+  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 128572}
   m_Enabled: 1
   m_EditorHideFlags: 0
@@ -58,33 +95,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   impactParticle: {fileID: 1817797803601600, guid: 46e56f62e4ff899488d1b27766d1eb6d,
-    type: 2}
+    type: 3}
   projectileParticle: {fileID: 1905436362935654, guid: 4d37afda50e570a4c86976105bea57a7,
-    type: 2}
+    type: 3}
   muzzleParticle: {fileID: 1892333751805388, guid: 452f8c6f5b6d23b4e966a40a9e4720c1,
-    type: 2}
+    type: 3}
   colliderRadius: 0.1
   collideOffset: 0.1
---- !u!135 &13576440
-SphereCollider:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 128572}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Radius: 0.15
-  m_Center: {x: 0, y: 0, z: 0}
---- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 128572}
-  m_IsPrefabParent: 1

BlueWater/Assets/Epic Toon FX/Models/Materials/Sword.mat

@@ -2,21 +2,25 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Sword
   m_Shader: {fileID: 210, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 0
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses:
-  - ALWAYS
+  - GRABPASS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -56,6 +60,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _BlendOp: 0
     - _BumpScale: 1
@@ -95,3 +100,4 @@ Material:
     - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []

BlueWater/ProjectSettings/TagManager.asset

@@ -16,6 +16,7 @@ TagManager:
   - House
   - Grid
   - HitBox
+  - DestructiveSkill
   layers:
   - Default
   - TransparentFX