#34 #35 상세 내용 아래에 기재

+ SPUM 프리팹 회전 값 변경 (0, 90, 0) -> (0, 0, 0) + 프리팹 원본 보존(씬에 Viking 따로 사용) + ProjectSetting Physics 수정 Player <-> Props 충돌 추가 + IAnimationBridge 인터페이스 추가 + Crewmate(동료) class 추가 + Enemy MagicOrk 추가 Magic particleSystem 기능 추가 중
2023-10-12 15:32:02 +09:00 · 2023-10-12 15:32:02 +09:00 · 2bb986becb
commit 2bb986becb
parent 59c4b14d1a
37 changed files with 21871 additions and 788 deletions
--- a/BlueWater/Assets/01.Scenes/03.Stage_Test.unity
+++ b/BlueWater/Assets/01.Scenes/03.Stage_Test.unity
@ -1576,6 +1576,126 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 392014244}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &418278335
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 971043561}
+    m_Modifications:
+    - target: {fileID: -23924663176670272, guid: 5d3f02c24a243a044bbddafc1652ee67,
+        type: 3}
+      propertyPath: m_WalkableMask
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4681418249284042988, guid: 5d3f02c24a243a044bbddafc1652ee67,
+        type: 3}
+      propertyPath: m_Name
+      value: Viking
+      objectReference: {fileID: 0}
+    - target: {fileID: 4681418249284042988, guid: 5d3f02c24a243a044bbddafc1652ee67,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 5d3f02c24a243a044bbddafc1652ee67, type: 3}
+--- !u!1 &418278336 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4681418249284042988, guid: 5d3f02c24a243a044bbddafc1652ee67,
+    type: 3}
+  m_PrefabInstance: {fileID: 418278335}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &418278337 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67,
+    type: 3}
+  m_PrefabInstance: {fileID: 418278335}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &460905033
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -4196,8 +4316,7 @@ MonoBehaviour:
  boats: []
  <PlayerAction>k__BackingField: {fileID: -944628639613478452, guid: 0acb404847404484198cbf94e6929af2,
    type: 3}
-  <InIslandPlayer>k__BackingField: {fileID: 4681418249284042988, guid: 5d3f02c24a243a044bbddafc1652ee67,
-    type: 3}
+  <InIslandPlayer>k__BackingField: {fileID: 418278336}
  slowSpeed: 0.1
  <IsInShipMode>k__BackingField: 0
  <IsDredgeMode>k__BackingField: 0
@ -4215,7 +4334,8 @@ Transform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 418278337}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &982629705
@ -5422,26 +5542,6 @@ PrefabInstance:
      propertyPath: m_LocalPosition.z
      value: -68.23
      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
        type: 3}
      propertyPath: m_AnchoredPosition.x
@ -5540,26 +5640,6 @@ PrefabInstance:
      propertyPath: m_LocalPosition.z
      value: -48.36
      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
        type: 3}
      propertyPath: m_AnchoredPosition.x
@ -6379,26 +6459,6 @@ PrefabInstance:
      propertyPath: m_LocalPosition.z
      value: -64.72
      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
        type: 3}
      propertyPath: m_AnchoredPosition.x
@ -7628,26 +7688,6 @@ PrefabInstance:
      propertyPath: m_LocalPosition.z
      value: -101.1
      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
        type: 3}
      propertyPath: m_AnchoredPosition.x
@ -7746,26 +7786,6 @@ PrefabInstance:
      propertyPath: m_LocalPosition.z
      value: -66.107216
      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
        type: 3}
      propertyPath: m_AnchoredPosition.x
@ -8779,26 +8799,6 @@ PrefabInstance:
      propertyPath: m_LocalPosition.z
      value: -72.13
      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: 1423656733108109268, guid: b82511a1823faf14f97c60a0e6984872,
        type: 3}
      propertyPath: m_AnchoredPosition.x
--- a/BlueWater/Assets/02.Scripts/AnimatorBridge.cs
+++ b/BlueWater/Assets/02.Scripts/AnimatorBridge.cs
@ -5,13 +5,17 @@ namespace BlueWaterProject
 {
    public class AnimatorBridge : MonoBehaviour
    {
-        private FieldMinion fieldMinion;
+        [SerializeField] private IAnimatorBridge iAnimatorBridge;
        private void Awake()
        {
-            fieldMinion = GetComponentInParent<FieldMinion>();
+            iAnimatorBridge = GetComponentInParent<IAnimatorBridge>();
+            if (iAnimatorBridge == null)
+            {
+                print("부모 스크립트 중 IAnimatorBridge 인터페이스를 가지고 있는 스크립트가 없습니다.");
+            }
        }

-        public void AttackTiming() => fieldMinion.AttackTiming();
-        public void SetIsAttacking(int boolValue) => fieldMinion.SetIsAttacking(boolValue);
+        public void AttackTiming() => iAnimatorBridge.AttackTiming();
+        public void SetIsAttacking(int boolValue) => iAnimatorBridge.SetIsAttacking(boolValue);
    }
 }
--- a/BlueWater/Assets/02.Scripts/Character/Crewmate.meta
+++ b/BlueWater/Assets/02.Scripts/Character/Crewmate.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5ac59e67ed17d014e85473151de3088a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs
+++ b/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs
@ -0,0 +1,15 @@
+using UnityEngine;
+using UnityEngine.InputSystem;
+
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    [RequireComponent(typeof(PlayerInput))]
+    public class Crewmate : BaseCharacter, IDamageable
+    {
+        public virtual void TakeDamage(float attackerPower, float attackerShieldPenetrationRate = default, Vector3? attackPos = null)
+        {
+            throw new System.NotImplementedException();
+        }
+    }
+}
--- a/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs.meta
+++ b/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 20f0dcb72f6cf8f41af0240a25adde47
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/BlueWater/Assets/02.Scripts/Character/Crewmate/Type.meta
+++ b/BlueWater/Assets/02.Scripts/Character/Crewmate/Type.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3ef401a09913db84babdfb00a02ff966
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/BlueWater/Assets/02.Scripts/Character/Crewmate/Type/TenTen.cs
+++ b/BlueWater/Assets/02.Scripts/Character/Crewmate/Type/TenTen.cs
@ -0,0 +1,11 @@
+using System;
+
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    [Serializable]
+    public class TenTen : Crewmate
+    {
+        
+    }
+}
--- a/BlueWater/Assets/02.Scripts/Character/Crewmate/Type/TenTen.cs.meta
+++ b/BlueWater/Assets/02.Scripts/Character/Crewmate/Type/TenTen.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ecc1555c44beedd4aae1210da5fbe25a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs
+++ b/BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs
@ -242,7 +242,7 @@ namespace BlueWaterProject
                return;
            }

-            StartCoroutine(nameof(beAttacked));
+            StartCoroutine(nameof(BeAttacked));
        }

        // IAiView
@ -362,7 +362,7 @@ namespace BlueWaterProject
            Array.Clear(HelpTargets, 0, MAX_COLLIDERS);

            var myCenterPos = MyCollider.bounds.center;
-            var numResults = Physics.OverlapSphereNonAlloc(myCenterPos, HelpCallRange, Targets, HelpLayer,
+            var numResults = Physics.OverlapSphereNonAlloc(myCenterPos, HelpCallRange, HelpTargets, HelpLayer,
                targetIsTrigger ? QueryTriggerInteraction.Collide : QueryTriggerInteraction.Ignore);

            for (var i = 0; i < numResults; i++)
--- a/BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/FieldMinion.cs
+++ b/BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/FieldMinion.cs
@ -4,12 +4,12 @@ using UnityEngine;
 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
 {
-    public class FieldMinion : Enemy
+    public abstract class FieldMinion : Enemy, IAnimatorBridge
    {
        #region Properties and variables

-        private bool usedNormalAttackCoroutine;
-        private WaitForSeconds waitAtkCooldown;
+        protected bool usedNormalAttackCoroutine;
+        protected WaitForSeconds waitAtkCooldown;
        
        // Hash
        protected static readonly int AttackHash = Animator.StringToHash("Attack");
@ -18,6 +18,12 @@ namespace BlueWaterProject

        #endregion

+        #region abstract
+        
+        protected abstract IEnumerator NormalAttackCoroutine();
+
+        #endregion
+
        #region Unity built-in methods

        protected override void Awake()
@ -41,10 +47,10 @@ namespace BlueWaterProject
            }
            
            // 2D 스프라이트 뒤집기
-            if (Mathf.Abs(Agent.velocity.z) <= 0.01f) return;
+            if (Mathf.Abs(Agent.velocity.x) <= 0.01f) return;
            
            var localScale = transform.localScale;
-            localScale.x = Agent.velocity.z < 0 ? Mathf.Abs(localScale.x) : -Mathf.Abs(localScale.x);
+            localScale.x = Agent.velocity.x > 0 ? Mathf.Abs(localScale.x) : -Mathf.Abs(localScale.x);
            transform.localScale = localScale;
        }

@ -52,39 +58,8 @@ namespace BlueWaterProject
        
        #region Interface

-
-        #endregion
-        
-        #region Custom methods
-
-        public void NormalAttack()
-        {
-            StartCoroutine(nameof(NormalAttackCoroutine));
-        }
-
-        protected virtual IEnumerator NormalAttackCoroutine()
-        {
-            usedNormalAttackCoroutine = true;
-
-            myAnimator.SetFloat(AttackStateHash, 0f);
-            myAnimator.SetFloat(NormalStateHash, 0f);
-            // Attack 애니메이션에 시작에 isAttacking = true, 끝날 때 isAttacking = false 이벤트 실행 
-            myAnimator.SetTrigger(AttackHash);
-
-            var maxWaitTime = 0.5f;
-            var timer = 0f;
-            
-            while (isAttacking && timer < maxWaitTime)
-            {
-                timer += Time.deltaTime;
-                yield return null;
-            }
-                
-            yield return waitAtkCooldown;
-            usedNormalAttackCoroutine = false;
-        }
-
-        public void AttackTiming()
+        // IAnimatorBridge
+        public virtual void AttackTiming()
        {
            if (!Target) return;
            
@ -97,9 +72,19 @@ namespace BlueWaterProject
            iDamageable.TakeDamage(Atk);
        }
        
+        public void SetIsAttacking(int boolValue) => isAttacking = boolValue == 1;
+
+        #endregion
+        
+        #region Custom methods
+        
+        public void NormalAttack()
+        {
+            StartCoroutine(nameof(NormalAttackCoroutine));
+        }
+        
        public void StopNormalAttackCoroutine() => StopCoroutine(nameof(NormalAttackCoroutine));
        public bool GetUsedNormalAttackCoroutine() => usedNormalAttackCoroutine;
-        public void SetIsAttacking(int boolValue) => isAttacking = boolValue == 1;

        #endregion
    }
--- a/BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/Type/MagicOrk.cs
+++ b/BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/Type/MagicOrk.cs
@ -0,0 +1,46 @@
+using System;
+using System.Collections;
+using Sirenix.OdinInspector;
+using UnityEngine;
+
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    [Serializable]
+    public class MagicOrk : FieldMinion
+    {
+        #region Properties and variables
+
+        [Title("Weapon")]
+        [SerializeField] private ParticleSystem fireball;
+        [SerializeField] private float fireballSpd = 10f;
+
+        #endregion
+        
+        #region Custom methods
+
+        protected override IEnumerator NormalAttackCoroutine()
+        {
+            usedNormalAttackCoroutine = true;
+
+            myAnimator.SetFloat(AttackStateHash, 0f);
+            myAnimator.SetFloat(NormalStateHash, 1f);
+            // Attack 애니메이션에 시작에 isAttacking = true, 끝날 때 isAttacking = false 이벤트 실행 
+            myAnimator.SetTrigger(AttackHash);
+
+            var maxWaitTime = 0.5f;
+            var timer = 0f;
+            
+            while (isAttacking && timer < maxWaitTime)
+            {
+                timer += Time.deltaTime;
+                yield return null;
+            }
+                
+            yield return waitAtkCooldown;
+            usedNormalAttackCoroutine = false;
+        }
+
+        #endregion
+    }
+}
--- a/BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/Type/MagicOrk.cs.meta
+++ b/BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/Type/MagicOrk.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6dbbd3ef8f6ef3a469dc9c9bb3cf1f45
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/Type/Ork.cs
+++ b/BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/Type/Ork.cs
@ -1,10 +1,37 @@
+using System;
+using System.Collections;
 using UnityEngine;

 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
 {
+    [Serializable]
    public class Ork : FieldMinion
    {
-        
+        #region Custom methods
+
+        protected override IEnumerator NormalAttackCoroutine()
+        {
+            usedNormalAttackCoroutine = true;
+
+            myAnimator.SetFloat(AttackStateHash, 0f);
+            myAnimator.SetFloat(NormalStateHash, 0f);
+            // Attack 애니메이션에 시작에 isAttacking = true, 끝날 때 isAttacking = false 이벤트 실행 
+            myAnimator.SetTrigger(AttackHash);
+
+            var maxWaitTime = 0.5f;
+            var timer = 0f;
+            
+            while (isAttacking && timer < maxWaitTime)
+            {
+                timer += Time.deltaTime;
+                yield return null;
+            }
+                
+            yield return waitAtkCooldown;
+            usedNormalAttackCoroutine = false;
+        }
+
+        #endregion
    }
 }
--- a/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs
+++ b/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs
@ -12,11 +12,43 @@ namespace BlueWaterProject
    {
        #region Properties and variables

-        [Title("Stat")]
-        [SerializeField] private float maxHp = 200f;
-        [SerializeField] private float currentHp;
-        [SerializeField] private float atkRange = 1.5f;
-        [SerializeField] private float moveSpd = 5f;
+        [Title("DrawGizmos")]
+        [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;
+
+        [field: Title("Stat")]
+        [field: Tooltip("최대 체력 설정")]
+        [field: SerializeField] public float MaxHp { get; private set; } = 100f;
+        
+        [field: Tooltip("현재 체력")]
+        [field: SerializeField] public float CurrentHp { get; private set; }
+        
+        [field: Tooltip("이동 속도 설정")]
+        [field: SerializeField] public float MoveSpd { get; private set; } = 5f;
+        
+        [field: Tooltip("공격력 설정")]
+        [field: SerializeField] public float Atk { get; private set; } = 10f;
+        
+        [field: Tooltip("공격 속도(다음 공격 주기)\nAtkCooldown = 2f (2초마다 1번 공격)")]
+        [field: SerializeField] public float AtkCooldown { get; private set; } = 1f;
+        
+        [field: Tooltip("공격 사거리 설정")]
+        [field: SerializeField] public float AtkRange { get; private set; } = 1.5f;
+        
+        [field: Tooltip("이동 제한 범위 설정")]
+        [field: SerializeField] public float DefenseRange { get; private set; } = 20f;
        
        [Title("Ground")]
        [SerializeField] private float groundDistance = 0.2f;
@ -67,7 +99,7 @@ namespace BlueWaterProject
                
            agent.updateRotation = false;
            SetAgentSpeed(ESpeedType.DEFAULT);
-            SetCurrentHp(maxHp);
+            SetCurrentHp(MaxHp);
        }

        protected override void Update()
@ -77,7 +109,7 @@ namespace BlueWaterProject
                var localMovement = new Vector3(movementInput.x, 0, movementInput.y);
                var worldDirection = transform.TransformDirection(localMovement);

-                var movement = worldDirection * moveSpd;
+                var movement = worldDirection * MoveSpd;
                rb.velocity = new Vector3(movement.x, 0, movement.z);
            }
            
@ -118,7 +150,7 @@ namespace BlueWaterProject
        // IDamageable
        public override void TakeDamage(float attackerPower, float attackerShieldPenetrationRate = default, Vector3? attackPos = null)
        {
-            var changeHp = Mathf.Max(currentHp - attackerPower, 0);
+            var changeHp = Mathf.Max(CurrentHp - attackerPower, 0);
            SetCurrentHp(changeHp);
            
            // 죽었는지 체크
@ -210,13 +242,13 @@ namespace BlueWaterProject
                    print("speedType == NONE error");
                    break;
                case ESpeedType.DEFAULT:
-                    agent.speed = moveSpd;
+                    agent.speed = MoveSpd;
                    break;
                case ESpeedType.SLOW:
-                    agent.speed = moveSpd * 0.5f;
+                    agent.speed = MoveSpd * 0.5f;
                    break;
                case ESpeedType.FAST:
-                    agent.speed = moveSpd * 2f;
+                    agent.speed = MoveSpd * 2f;
                    break;
                default:
                    throw new ArgumentOutOfRangeException(nameof(speedType), speedType, null);
@ -232,7 +264,7 @@ namespace BlueWaterProject
            beAttacked = false;
        }

-        private void SetCurrentHp(float value) => currentHp = value;
+        private void SetCurrentHp(float value) => CurrentHp = value;

        #endregion
    }
--- a/BlueWater/Assets/02.Scripts/Interface/IAnimatorBridge.cs
+++ b/BlueWater/Assets/02.Scripts/Interface/IAnimatorBridge.cs
@ -0,0 +1,9 @@
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    public interface IAnimatorBridge
+    {
+        void AttackTiming();
+        void SetIsAttacking(int boolValue);
+    }
+}
--- a/BlueWater/Assets/02.Scripts/Interface/IAnimatorBridge.cs.meta
+++ b/BlueWater/Assets/02.Scripts/Interface/IAnimatorBridge.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2311061f30cebaa45a56199797ef8e60
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/BlueWater/Assets/02.Scripts/SpawnController.cs
+++ b/BlueWater/Assets/02.Scripts/SpawnController.cs
@ -41,6 +41,7 @@ namespace BlueWaterProject
        {
            var islandPlayer = Instantiate(GameManager.Inst.InIslandPlayer, spawnPos, spawnRotation);
            islandPlayer.name = IN_ISLAND_PLAYER_NAME;
+            islandPlayer.gameObject.SetActive(true);
            
            var playerInput = islandPlayer.GetComponent<PlayerInput>();
            if (playerInput == null)
--- a/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc1.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc1.prefab
@ -3057,14 +3057,14 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6294429197787252722}
-  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 2, y: 2, z: 2}
  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 6601977797241583183}
  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 0}
@ -3210,7 +3210,7 @@ MonoBehaviour:
        byteDataArray: 
      Version: 1.7.7
  gizmoViewMode: 2
-  showBehaviorDesignerGizmo: 0
+  showBehaviorDesignerGizmo: 1
 --- !u!114 &8609741102290131020
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -3228,7 +3228,6 @@ MonoBehaviour:
  isDrawDefenseRange: 1
  isDrawRandomMoveRange: 1
  isDrawTargetRange: 1
-  isDrawHelpCallRange: 1
  <BehaviorType>k__BackingField: 1
  <MaxHp>k__BackingField: 100
  <CurrentHp>k__BackingField: 0
@ -3239,45 +3238,10 @@ MonoBehaviour:
  <DefenseRange>k__BackingField: 20
  <IsRandomMove>k__BackingField: 1
  <RandomMoveRange>k__BackingField: 5
-  <UseHelpCall>k__BackingField: 0
-  <HelpLayer>k__BackingField:
-    serializedVersion: 2
-    m_Bits: 1024
-  <HelpCallRange>k__BackingField: 15
-  <HelpTargets>k__BackingField:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
  <DefensePos>k__BackingField: {x: 0, y: 0, z: 0}
  <IsCombated>k__BackingField: 0
  <BeAttackedInIdle>k__BackingField: 0
+  beAttacked: 0
  <ViewRadius>k__BackingField: 15
  <Targets>k__BackingField:
  - {fileID: 0}
@ -3314,6 +3278,43 @@ MonoBehaviour:
  <TargetLayer>k__BackingField:
    serializedVersion: 2
    m_Bits: 0
+  <UseHelpCall>k__BackingField: 0
+  <IsDrawHelpCallRange>k__BackingField: 0
+  <HelpLayer>k__BackingField:
+    serializedVersion: 2
+    m_Bits: 1024
+  <HelpCallRange>k__BackingField: 15
+  <HelpTargets>k__BackingField:
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
 --- !u!1 &6404309616375377533
 GameObject:
  m_ObjectHideFlags: 0
--- a/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc2.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc2.prefab
@ -3233,7 +3233,7 @@ GameObject:
  - component: {fileID: 3877555706499198012}
  - component: {fileID: 6930129211153151781}
  - component: {fileID: -1167329777120027977}
-  - component: {fileID: -1594379930367560300}
+  - component: {fileID: 9066994917784352948}
  m_Layer: 10
  m_Name: RedOrc2
  m_TagString: Untagged
@ -3248,14 +3248,14 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7305287201485691239}
-  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 2, y: 2, z: 2}
  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 7612554324961290458}
  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 0}
@ -3401,8 +3401,8 @@ MonoBehaviour:
        byteDataArray: 
      Version: 1.7.7
  gizmoViewMode: 2
-  showBehaviorDesignerGizmo: 0
--- !u!114 &-1594379930367560300
+  showBehaviorDesignerGizmo: 1
+--- !u!114 &9066994917784352948
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
@ -3411,7 +3411,7 @@ MonoBehaviour:
  m_GameObject: {fileID: 7305287201485691239}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 18b30939275b84144a72670e79cf80f8, type: 3}
+  m_Script: {fileID: 11500000, guid: 6dbbd3ef8f6ef3a469dc9c9bb3cf1f45, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  isDrawGizmos: 1
@ -3419,56 +3419,20 @@ MonoBehaviour:
  isDrawDefenseRange: 1
  isDrawRandomMoveRange: 1
  isDrawTargetRange: 1
-  isDrawHelpCallRange: 1
  <BehaviorType>k__BackingField: 1
  <MaxHp>k__BackingField: 100
  <CurrentHp>k__BackingField: 0
  <MoveSpd>k__BackingField: 5
  <Atk>k__BackingField: 10
-  <AtkCooldown>k__BackingField: 1
-  <AtkRange>k__BackingField: 1.5
+  <AtkCooldown>k__BackingField: 2
+  <AtkRange>k__BackingField: 10
  <DefenseRange>k__BackingField: 20
  <IsRandomMove>k__BackingField: 1
  <RandomMoveRange>k__BackingField: 5
-  <UseHelpCall>k__BackingField: 0
-  <HelpLayer>k__BackingField:
-    serializedVersion: 2
-    m_Bits: 1024
-  <HelpCallRange>k__BackingField: 15
-  <HelpTargets>k__BackingField:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
  <DefensePos>k__BackingField: {x: 0, y: 0, z: 0}
  <IsCombated>k__BackingField: 0
  <BeAttackedInIdle>k__BackingField: 0
+  beAttacked: 0
  <ViewRadius>k__BackingField: 15
  <Targets>k__BackingField:
  - {fileID: 0}
@ -3505,6 +3469,44 @@ MonoBehaviour:
  <TargetLayer>k__BackingField:
    serializedVersion: 2
    m_Bits: 0
+  <UseHelpCall>k__BackingField: 0
+  <IsDrawHelpCallRange>k__BackingField: 0
+  <HelpLayer>k__BackingField:
+    serializedVersion: 2
+    m_Bits: 1024
+  <HelpCallRange>k__BackingField: 15
+  <HelpTargets>k__BackingField:
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  fireball: {fileID: 19886636, guid: a1ff23b08e5882f4e8ff8c330ada4386, type: 3}
 --- !u!1 &7383115429890845516
 GameObject:
  m_ObjectHideFlags: 0
--- a/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc3.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc3.prefab
@ -772,14 +772,14 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2527913158230619112}
-  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 2, y: 2, z: 2}
  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 3445344209315447381}
  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 0}
@ -943,7 +943,6 @@ MonoBehaviour:
  isDrawDefenseRange: 1
  isDrawRandomMoveRange: 1
  isDrawTargetRange: 1
-  isDrawHelpCallRange: 1
  <BehaviorType>k__BackingField: 1
  <MaxHp>k__BackingField: 100
  <CurrentHp>k__BackingField: 0
@ -954,45 +953,10 @@ MonoBehaviour:
  <DefenseRange>k__BackingField: 20
  <IsRandomMove>k__BackingField: 1
  <RandomMoveRange>k__BackingField: 5
-  <UseHelpCall>k__BackingField: 0
-  <HelpLayer>k__BackingField:
-    serializedVersion: 2
-    m_Bits: 1024
-  <HelpCallRange>k__BackingField: 15
-  <HelpTargets>k__BackingField:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
  <DefensePos>k__BackingField: {x: 0, y: 0, z: 0}
  <IsCombated>k__BackingField: 0
  <BeAttackedInIdle>k__BackingField: 0
+  beAttacked: 0
  <ViewRadius>k__BackingField: 15
  <Targets>k__BackingField:
  - {fileID: 0}
@ -1029,6 +993,43 @@ MonoBehaviour:
  <TargetLayer>k__BackingField:
    serializedVersion: 2
    m_Bits: 0
+  <UseHelpCall>k__BackingField: 0
+  <IsDrawHelpCallRange>k__BackingField: 0
+  <HelpLayer>k__BackingField:
+    serializedVersion: 2
+    m_Bits: 1024
+  <HelpCallRange>k__BackingField: 15
+  <HelpTargets>k__BackingField:
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
 --- !u!1 &2763143092398436260
 GameObject:
  m_ObjectHideFlags: 0
--- a/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc4.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc4.prefab
@ -3501,14 +3501,14 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 8324368761444068393}
-  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 2, y: 2, z: 2}
  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 9170094766524079508}
  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 0}
@ -3672,7 +3672,6 @@ MonoBehaviour:
  isDrawDefenseRange: 1
  isDrawRandomMoveRange: 1
  isDrawTargetRange: 1
-  isDrawHelpCallRange: 1
  <BehaviorType>k__BackingField: 1
  <MaxHp>k__BackingField: 100
  <CurrentHp>k__BackingField: 0
@ -3683,45 +3682,10 @@ MonoBehaviour:
  <DefenseRange>k__BackingField: 20
  <IsRandomMove>k__BackingField: 1
  <RandomMoveRange>k__BackingField: 5
-  <UseHelpCall>k__BackingField: 0
-  <HelpLayer>k__BackingField:
-    serializedVersion: 2
-    m_Bits: 1024
-  <HelpCallRange>k__BackingField: 15
-  <HelpTargets>k__BackingField:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
  <DefensePos>k__BackingField: {x: 0, y: 0, z: 0}
  <IsCombated>k__BackingField: 0
  <BeAttackedInIdle>k__BackingField: 0
+  beAttacked: 0
  <ViewRadius>k__BackingField: 15
  <Targets>k__BackingField:
  - {fileID: 0}
@ -3758,6 +3722,43 @@ MonoBehaviour:
  <TargetLayer>k__BackingField:
    serializedVersion: 2
    m_Bits: 0
+  <UseHelpCall>k__BackingField: 0
+  <IsDrawHelpCallRange>k__BackingField: 0
+  <HelpLayer>k__BackingField:
+    serializedVersion: 2
+    m_Bits: 1024
+  <HelpCallRange>k__BackingField: 15
+  <HelpTargets>k__BackingField:
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
 --- !u!1 &8536698486957183980
 GameObject:
  m_ObjectHideFlags: 0
--- a/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc5.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc5.prefab
@ -424,14 +424,14 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 795613200604023475}
-  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 2, y: 2, z: 2}
  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 562444384213154574}
  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 0}
@ -595,7 +595,6 @@ MonoBehaviour:
  isDrawDefenseRange: 1
  isDrawRandomMoveRange: 1
  isDrawTargetRange: 1
-  isDrawHelpCallRange: 1
  <BehaviorType>k__BackingField: 1
  <MaxHp>k__BackingField: 100
  <CurrentHp>k__BackingField: 0
@ -606,45 +605,10 @@ MonoBehaviour:
  <DefenseRange>k__BackingField: 20
  <IsRandomMove>k__BackingField: 1
  <RandomMoveRange>k__BackingField: 5
-  <UseHelpCall>k__BackingField: 0
-  <HelpLayer>k__BackingField:
-    serializedVersion: 2
-    m_Bits: 1024
-  <HelpCallRange>k__BackingField: 15
-  <HelpTargets>k__BackingField:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
  <DefensePos>k__BackingField: {x: 0, y: 0, z: 0}
  <IsCombated>k__BackingField: 0
  <BeAttackedInIdle>k__BackingField: 0
+  beAttacked: 0
  <ViewRadius>k__BackingField: 15
  <Targets>k__BackingField:
  - {fileID: 0}
@ -681,6 +645,43 @@ MonoBehaviour:
  <TargetLayer>k__BackingField:
    serializedVersion: 2
    m_Bits: 0
+  <UseHelpCall>k__BackingField: 0
+  <IsDrawHelpCallRange>k__BackingField: 0
+  <HelpLayer>k__BackingField:
+    serializedVersion: 2
+    m_Bits: 1024
+  <HelpCallRange>k__BackingField: 15
+  <HelpTargets>k__BackingField:
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
 --- !u!1 &1028736487723226879
 GameObject:
  m_ObjectHideFlags: 0
--- a/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc6.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc6.prefab
@ -1367,14 +1367,14 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 4240854641551087113}
-  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 2, y: 2, z: 2}
  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 3899601613661497268}
  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 0}
@ -1538,7 +1538,6 @@ MonoBehaviour:
  isDrawDefenseRange: 1
  isDrawRandomMoveRange: 1
  isDrawTargetRange: 1
-  isDrawHelpCallRange: 1
  <BehaviorType>k__BackingField: 1
  <MaxHp>k__BackingField: 100
  <CurrentHp>k__BackingField: 0
@ -1549,45 +1548,10 @@ MonoBehaviour:
  <DefenseRange>k__BackingField: 20
  <IsRandomMove>k__BackingField: 1
  <RandomMoveRange>k__BackingField: 5
-  <UseHelpCall>k__BackingField: 0
-  <HelpLayer>k__BackingField:
-    serializedVersion: 2
-    m_Bits: 1024
-  <HelpCallRange>k__BackingField: 15
-  <HelpTargets>k__BackingField:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
  <DefensePos>k__BackingField: {x: 0, y: 0, z: 0}
  <IsCombated>k__BackingField: 0
  <BeAttackedInIdle>k__BackingField: 0
+  beAttacked: 0
  <ViewRadius>k__BackingField: 15
  <Targets>k__BackingField:
  - {fileID: 0}
@ -1624,6 +1588,43 @@ MonoBehaviour:
  <TargetLayer>k__BackingField:
    serializedVersion: 2
    m_Bits: 0
+  <UseHelpCall>k__BackingField: 0
+  <IsDrawHelpCallRange>k__BackingField: 0
+  <HelpLayer>k__BackingField:
+    serializedVersion: 2
+    m_Bits: 1024
+  <HelpCallRange>k__BackingField: 15
+  <HelpTargets>k__BackingField:
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
 --- !u!1 &4480335555790412860
 GameObject:
  m_ObjectHideFlags: 0
--- a/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc7.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc7.prefab
@ -923,14 +923,14 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2239584764280768861}
-  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 2, y: 2, z: 2}
  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 1427706675845429472}
  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 0}
@ -1094,7 +1094,6 @@ MonoBehaviour:
  isDrawDefenseRange: 1
  isDrawRandomMoveRange: 1
  isDrawTargetRange: 1
-  isDrawHelpCallRange: 1
  <BehaviorType>k__BackingField: 1
  <MaxHp>k__BackingField: 100
  <CurrentHp>k__BackingField: 0
@ -1105,45 +1104,10 @@ MonoBehaviour:
  <DefenseRange>k__BackingField: 20
  <IsRandomMove>k__BackingField: 1
  <RandomMoveRange>k__BackingField: 5
-  <UseHelpCall>k__BackingField: 0
-  <HelpLayer>k__BackingField:
-    serializedVersion: 2
-    m_Bits: 1024
-  <HelpCallRange>k__BackingField: 15
-  <HelpTargets>k__BackingField:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
  <DefensePos>k__BackingField: {x: 0, y: 0, z: 0}
  <IsCombated>k__BackingField: 0
  <BeAttackedInIdle>k__BackingField: 0
+  beAttacked: 0
  <ViewRadius>k__BackingField: 15
  <Targets>k__BackingField:
  - {fileID: 0}
@ -1180,6 +1144,43 @@ MonoBehaviour:
  <TargetLayer>k__BackingField:
    serializedVersion: 2
    m_Bits: 0
+  <UseHelpCall>k__BackingField: 0
+  <IsDrawHelpCallRange>k__BackingField: 0
+  <HelpLayer>k__BackingField:
+    serializedVersion: 2
+    m_Bits: 1024
+  <HelpCallRange>k__BackingField: 15
+  <HelpTargets>k__BackingField:
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
 --- !u!1 &2740055484573113036
 GameObject:
  m_ObjectHideFlags: 0
--- a/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc8.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc8.prefab
@ -1154,14 +1154,14 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3778215956730531554}
-  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 2, y: 2, z: 2}
  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 4083158164014350175}
  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 0}
@ -1325,7 +1325,6 @@ MonoBehaviour:
  isDrawDefenseRange: 1
  isDrawRandomMoveRange: 1
  isDrawTargetRange: 1
-  isDrawHelpCallRange: 1
  <BehaviorType>k__BackingField: 1
  <MaxHp>k__BackingField: 100
  <CurrentHp>k__BackingField: 0
@ -1336,45 +1335,10 @@ MonoBehaviour:
  <DefenseRange>k__BackingField: 20
  <IsRandomMove>k__BackingField: 1
  <RandomMoveRange>k__BackingField: 5
-  <UseHelpCall>k__BackingField: 0
-  <HelpLayer>k__BackingField:
-    serializedVersion: 2
-    m_Bits: 1024
-  <HelpCallRange>k__BackingField: 15
-  <HelpTargets>k__BackingField:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
  <DefensePos>k__BackingField: {x: 0, y: 0, z: 0}
  <IsCombated>k__BackingField: 0
  <BeAttackedInIdle>k__BackingField: 0
+  beAttacked: 0
  <ViewRadius>k__BackingField: 15
  <Targets>k__BackingField:
  - {fileID: 0}
@ -1411,6 +1375,43 @@ MonoBehaviour:
  <TargetLayer>k__BackingField:
    serializedVersion: 2
    m_Bits: 0
+  <UseHelpCall>k__BackingField: 0
+  <IsDrawHelpCallRange>k__BackingField: 0
+  <HelpLayer>k__BackingField:
+    serializedVersion: 2
+    m_Bits: 1024
+  <HelpCallRange>k__BackingField: 15
+  <HelpTargets>k__BackingField:
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
 --- !u!1 &3912694579823932759
 GameObject:
  m_ObjectHideFlags: 0
--- a/BlueWater/Assets/05.Prefabs/Characters/Npcs/NPC_sailors.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Npcs/NPC_sailors.prefab
@ -3385,14 +3385,14 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7891644557749838249}
-  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 2, y: 2, z: 2}
  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 5173766130632890723}
  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 0}
--- a/BlueWater/Assets/05.Prefabs/Characters/Players/Skull_King.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Players/Skull_King.prefab
@ -3138,14 +3138,14 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7671700086832248929}
-  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 2, y: 2, z: 2}
  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 1655713066471977021}
  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 0}
--- a/BlueWater/Assets/05.Prefabs/Characters/Players/TenTen.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Players/TenTen.prefab
@ -3216,14 +3216,14 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7216996033527228451}
-  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 2, y: 2, z: 2}
  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 3121891628484793615}
  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 0}
--- a/BlueWater/Assets/05.Prefabs/Characters/Players/Viking.prefab
+++ b/BlueWater/Assets/05.Prefabs/Characters/Players/Viking.prefab
@ -1702,14 +1702,14 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 4681418249284042988}
-  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 2, y: 2, z: 2}
  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 6778889828054827754}
  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 0}
--- a/BlueWater/Assets/05.Prefabs/Weapon.meta
+++ b/BlueWater/Assets/05.Prefabs/Weapon.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 008643c9eb5031b43b2ed02020940dc8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/BlueWater/Assets/05.Prefabs/Weapon/FireballMissileFire.prefab
+++ b/BlueWater/Assets/05.Prefabs/Weapon/FireballMissileFire.prefab
--- a/BlueWater/Assets/05.Prefabs/Weapon/FireballMissileFire.prefab.meta
+++ b/BlueWater/Assets/05.Prefabs/Weapon/FireballMissileFire.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a1ff23b08e5882f4e8ff8c330ada4386
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/FX/Prefabs/Combat/Explosions/FireballRoundExplosion/ExplosionFireballPink.prefab
+++ b/FX/Prefabs/Combat/Explosions/FireballRoundExplosion/ExplosionFireballPink.prefab
--- a/FX/Prefabs/Combat/Missiles/Fireball/FireballMissileBlue.prefab
+++ b/FX/Prefabs/Combat/Missiles/Fireball/FireballMissileBlue.prefab
--- a/FX/Prefabs/Combat/Missiles/Fireball/FireballMissileFire.prefab
+++ b/FX/Prefabs/Combat/Missiles/Fireball/FireballMissileFire.prefab
--- a/FX/Prefabs/Combat/Missiles/Fireball/FireballMissileGreen.prefab
+++ b/FX/Prefabs/Combat/Missiles/Fireball/FireballMissileGreen.prefab
--- a/BlueWater/ProjectSettings/DynamicsManager.asset
+++ b/BlueWater/ProjectSettings/DynamicsManager.asset
@ -17,7 +17,7 @@ PhysicsManager:
  m_EnableAdaptiveForce: 0
  m_ClothInterCollisionDistance: 0.1
  m_ClothInterCollisionStiffness: 0.2
-  m_LayerCollisionMatrix: 100000001000000010000000381f00001f080000080000000000000000010000880700000807000008070000181001000808000000000100000000000000000000280000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+  m_LayerCollisionMatrix: 100000001000000010000000381f00001f080000080000000000000000010000880701000807000008070000181001000808000000000100000000000000000000290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
  m_SimulationMode: 0
  m_AutoSyncTransforms: 0
  m_ReuseCollisionCallbacks: 0