#42 플레이어 수동 제어 변경

+ Crewmate가 target이 있으면 따라오지 않게 변경 + Player Input Attack 추가 + 플레이어 공격 잔상 테스트
2023-10-25 16:32:57 +09:00 · 2023-10-25 16:32:57 +09:00 · 642e189c1c
commit 642e189c1c
parent 397d0fe410
9 changed files with 871 additions and 38 deletions
--- a/BlueWater/Assets/01.Scenes/03.Stage_Test.unity
+++ b/BlueWater/Assets/01.Scenes/03.Stage_Test.unity
@ -122,6 +122,151 @@ NavMeshSettings:
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
+--- !u!1 &13272261
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 13272262}
+  - component: {fileID: 13272263}
+  m_Layer: 0
+  m_Name: TrailEffect
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &13272262
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 13272261}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 1.5}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1978848785}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!96 &13272263
+TrailRenderer:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 13272261}
+  m_Enabled: 0
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 0
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Time: 0.3
+  m_PreviewTimeScale: 1
+  m_Parameters:
+    serializedVersion: 3
+    widthMultiplier: 3
+    widthCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.89373296
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    colorGradient:
+      serializedVersion: 2
+      key0: {r: 0, g: 0.941309, b: 1, a: 1}
+      key1: {r: 0.61470586, g: 0.9773867, b: 1, a: 1}
+      key2: {r: 1, g: 1, b: 1, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 43754
+      ctime2: 65535
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: 0
+      m_NumColorKeys: 3
+      m_NumAlphaKeys: 2
+    numCornerVertices: 0
+    numCapVertices: 0
+    alignment: 0
+    textureMode: 0
+    textureScale: {x: 1, y: 1}
+    shadowBias: 0.5
+    generateLightingData: 0
+  m_MinVertexDistance: 0.1
+  m_MaskInteraction: 0
+  m_Autodestruct: 0
+  m_Emitting: 1
+  m_ApplyActiveColorSpace: 0
 --- !u!1001 &17330399
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -202,12 +347,103 @@ RectTransform:
    type: 3}
  m_PrefabInstance: {fileID: 1259135358}
  m_PrefabAsset: {fileID: 0}
+--- !u!4 &38469447 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208,
+    type: 3}
+  m_PrefabInstance: {fileID: 1633449551}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &56326961 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 2718910014188824470, guid: 14871bcccb7cf4e1d81bb38ec7a3a4e0,
    type: 3}
  m_PrefabInstance: {fileID: 745533737}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &57730034
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1978848785}
+    m_Modifications:
+    - target: {fileID: 185524, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_Name
+      value: SpikyFireTrail (2)
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalScale.x
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.9
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 19828646, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: looping
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 19828646, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: playOnAwake
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 19839156, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: looping
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 19839156, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: playOnAwake
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 19885640, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: looping
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 19885640, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: playOnAwake
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
 --- !u!1001 &64008972
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -2562,8 +2798,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 334724472}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.56062883, y: -0.000000011532333, z: 0.0000000078077695, w: 0.82806724}
-  m_LocalPosition: {x: 30.91, y: 27.217937, z: -37.73}
+  m_LocalRotation: {x: 0.33100694, y: -2.0027246e-16, z: -2.8779474e-16, w: 0.9436284}
+  m_LocalPosition: {x: 30.91, y: 22.217937, z: -52.73}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@ -3187,7 +3423,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1978848785}
    m_AddedComponents:
    - targetCorrespondingSourceObject: {fileID: 4681418249284042988, guid: 5d3f02c24a243a044bbddafc1652ee67,
        type: 3}
@ -3283,7 +3523,7 @@ MonoBehaviour:
  isDrawViewRange: 1
  isDrawDefenseRange: 1
  isDrawTargetRange: 1
-  <MaxHp>k__BackingField: 50
+  <MaxHp>k__BackingField: 300
  <CurrentHp>k__BackingField: 0
  <MoveSpd>k__BackingField: 5
  <Atk>k__BackingField: 10
@ -3302,6 +3542,8 @@ MonoBehaviour:
  <UseRigidbody>k__BackingField: 0
  beAttacked: 0
  isAttacking: 0
+  attackAngle: 180
+  angleSpeed: 0.2
 --- !u!114 &418278343
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -3340,7 +3582,7 @@ MonoBehaviour:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 418278336}
-  m_Enabled: 1
+  m_Enabled: 0
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 8d7b55c7ecdb49a4a89fa5e6f9022861, type: 3}
  m_Name: 
@ -3389,7 +3631,7 @@ NavMeshAgent:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 418278336}
-  m_Enabled: 1
+  m_Enabled: 0
  m_AgentTypeID: 0
  m_Radius: 0.3
  m_Speed: 3.5
@ -3435,7 +3677,7 @@ Rigidbody:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 418278336}
  serializedVersion: 4
-  m_Mass: 1
+  m_Mass: 10
  m_Drag: 0
  m_AngularDrag: 0.05
  m_CenterOfMass: {x: 0, y: 0, z: 0}
@ -3860,6 +4102,12 @@ NavMeshObstacle:
  m_CarveOnlyStationary: 1
  m_Center: {x: -0.09900001, y: 2.229, z: 0.049000002}
  m_TimeToStationary: 0.5
+--- !u!4 &474440006 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208,
+    type: 3}
+  m_PrefabInstance: {fileID: 57730034}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &475708529
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -6061,8 +6309,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 879331193}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.56062883, y: -0.000000011532333, z: 0.0000000078077695, w: 0.82806724}
-  m_LocalPosition: {x: 30.91, y: 27.217937, z: -37.73}
+  m_LocalRotation: {x: 0.33100694, y: -2.0027246e-16, z: -2.8779474e-16, w: 0.9436284}
+  m_LocalPosition: {x: 30.91, y: 22.217937, z: -52.73}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
@ -6939,7 +7187,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  _persistent: 0
-  <IslandPlayerMode>k__BackingField: 1
+  <IslandPlayerMode>k__BackingField: 0
  <InIslandPlayerPrefab>k__BackingField: {fileID: 418278336}
  <CrewmatePrefabList>k__BackingField:
  - {fileID: 1362034959}
@ -6954,6 +7202,7 @@ MonoBehaviour:
  <IsAssaultMode>k__BackingField: 0
  <IsShipDeckMode>k__BackingField: 0
  <IsConversation>k__BackingField: 0
+  <IsInteraction>k__BackingField: 0
  <CurrentPlayerMode>k__BackingField: 0
 --- !u!4 &971043561
 Transform:
@ -10804,7 +11053,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_BindingMode: 1
-  m_FollowOffset: {x: 0, y: 25, z: -10}
+  m_FollowOffset: {x: 0, y: 20, z: -25}
  m_XDamping: 0
  m_YDamping: 0
  m_ZDamping: 0
@ -10926,6 +11175,12 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 1471287581}
  m_PrefabAsset: {fileID: 0}
+--- !u!4 &1476215451 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208,
+    type: 3}
+  m_PrefabInstance: {fileID: 2024072799}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1483497528
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -11578,6 +11833,91 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 1629416266}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1633449551
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1978848785}
+    m_Modifications:
+    - target: {fileID: 185524, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_Name
+      value: SpikyFireTrail
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalScale.x
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 1.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 19828646, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: looping
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 19828646, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: playOnAwake
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 19839156, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: looping
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 19839156, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: playOnAwake
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 19885640, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: looping
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 19885640, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: playOnAwake
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
 --- !u!1001 &1636445598
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -12649,7 +12989,7 @@ MonoBehaviour:
  checkLayer:
    serializedVersion: 2
    m_Bits: 2098688
-  crewmateIndex: 0
+  crewmatePrefabIndex: 0
 --- !u!4 &1805195289
 Transform:
  m_ObjectHideFlags: 0
@ -13426,6 +13766,41 @@ NavMeshObstacle:
  m_CarveOnlyStationary: 1
  m_Center: {x: -0.09900001, y: 2.229, z: 0.049000002}
  m_TimeToStationary: 0.5
+--- !u!1 &1978848784
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1978848785}
+  m_Layer: 0
+  m_Name: TrailRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1978848785
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1978848784}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 13272262}
+  - {fileID: 38469447}
+  - {fileID: 1476215451}
+  - {fileID: 474440006}
+  m_Father: {fileID: 418278337}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!198 &1988695658
 ParticleSystem:
  m_ObjectHideFlags: 0
@ -23320,6 +23695,91 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 4294967295
  m_IsActive: 1
+--- !u!1001 &2024072799
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1978848785}
+    m_Modifications:
+    - target: {fileID: 185524, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_Name
+      value: SpikyFireTrail (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalScale.x
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 1.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 494686, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 19828646, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: looping
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 19828646, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: playOnAwake
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 19839156, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: looping
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 19839156, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: playOnAwake
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 19885640, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: looping
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 19885640, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
+      propertyPath: playOnAwake
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7ef15b3b75916c044aa8aa197b362208, type: 3}
 --- !u!1001 &2026997466
 PrefabInstance:
  m_ObjectHideFlags: 0
--- a/BlueWater/Assets/02.Scripts/BlueWater.cs
+++ b/BlueWater/Assets/02.Scripts/BlueWater.cs
@ -125,6 +125,15 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
                    ""processors"": """",
                    ""interactions"": ""Hold(duration=1)"",
                    ""initialStateCheck"": false
+                },
+                {
+                    ""name"": ""Attack"",
+                    ""type"": ""Button"",
+                    ""id"": ""5042e547-e870-4479-8263-b143f4d03597"",
+                    ""expectedControlType"": ""Button"",
+                    ""processors"": """",
+                    ""interactions"": """",
+                    ""initialStateCheck"": false
                }
            ],
            ""bindings"": [
@ -292,6 +301,17 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
                    ""action"": ""CancelHold"",
                    ""isComposite"": false,
                    ""isPartOfComposite"": false
+                },
+                {
+                    ""name"": """",
+                    ""id"": ""bb845af5-adc5-4848-b4a8-ceb3508cd585"",
+                    ""path"": ""<Mouse>/leftButton"",
+                    ""interactions"": """",
+                    ""processors"": """",
+                    ""groups"": ""Keyboard&Mouse"",
+                    ""action"": ""Attack"",
+                    ""isComposite"": false,
+                    ""isPartOfComposite"": false
                }
            ]
        },
@ -466,6 +486,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
        m_Player_TargetingHold = m_Player.FindAction("TargetingHold", throwIfNotFound: true);
        m_Player_SpawnInIsladnPlayer = m_Player.FindAction("SpawnInIsladnPlayer", throwIfNotFound: true);
        m_Player_CancelHold = m_Player.FindAction("CancelHold", throwIfNotFound: true);
+        m_Player_Attack = m_Player.FindAction("Attack", throwIfNotFound: true);
        // Camera
        m_Camera = asset.FindActionMap("Camera", throwIfNotFound: true);
        m_Camera_Zoom = m_Camera.FindAction("Zoom", throwIfNotFound: true);
@ -547,6 +568,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
    private readonly InputAction m_Player_TargetingHold;
    private readonly InputAction m_Player_SpawnInIsladnPlayer;
    private readonly InputAction m_Player_CancelHold;
+    private readonly InputAction m_Player_Attack;
    public struct PlayerActions
    {
        private @BlueWater m_Wrapper;
@ -562,6 +584,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
        public InputAction @TargetingHold => m_Wrapper.m_Player_TargetingHold;
        public InputAction @SpawnInIsladnPlayer => m_Wrapper.m_Player_SpawnInIsladnPlayer;
        public InputAction @CancelHold => m_Wrapper.m_Player_CancelHold;
+        public InputAction @Attack => m_Wrapper.m_Player_Attack;
        public InputActionMap Get() { return m_Wrapper.m_Player; }
        public void Enable() { Get().Enable(); }
        public void Disable() { Get().Disable(); }
@ -604,6 +627,9 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
            @CancelHold.started += instance.OnCancelHold;
            @CancelHold.performed += instance.OnCancelHold;
            @CancelHold.canceled += instance.OnCancelHold;
+            @Attack.started += instance.OnAttack;
+            @Attack.performed += instance.OnAttack;
+            @Attack.canceled += instance.OnAttack;
        }

        private void UnregisterCallbacks(IPlayerActions instance)
@ -641,6 +667,9 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
            @CancelHold.started -= instance.OnCancelHold;
            @CancelHold.performed -= instance.OnCancelHold;
            @CancelHold.canceled -= instance.OnCancelHold;
+            @Attack.started -= instance.OnAttack;
+            @Attack.performed -= instance.OnAttack;
+            @Attack.canceled -= instance.OnAttack;
        }

        public void RemoveCallbacks(IPlayerActions instance)
@ -805,6 +834,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
        void OnTargetingHold(InputAction.CallbackContext context);
        void OnSpawnInIsladnPlayer(InputAction.CallbackContext context);
        void OnCancelHold(InputAction.CallbackContext context);
+        void OnAttack(InputAction.CallbackContext context);
    }
    public interface ICameraActions
    {
--- a/BlueWater/Assets/02.Scripts/BlueWater.inputactions
+++ b/BlueWater/Assets/02.Scripts/BlueWater.inputactions
@ -103,6 +103,15 @@
                    "processors": "",
                    "interactions": "Hold(duration=1)",
                    "initialStateCheck": false
+                },
+                {
+                    "name": "Attack",
+                    "type": "Button",
+                    "id": "5042e547-e870-4479-8263-b143f4d03597",
+                    "expectedControlType": "Button",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": false
                }
            ],
            "bindings": [
@ -270,6 +279,17 @@
                    "action": "CancelHold",
                    "isComposite": false,
                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "bb845af5-adc5-4848-b4a8-ceb3508cd585",
+                    "path": "<Mouse>/leftButton",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "Keyboard&Mouse",
+                    "action": "Attack",
+                    "isComposite": false,
+                    "isPartOfComposite": false
                }
            ]
        },
--- a/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs
+++ b/BlueWater/Assets/02.Scripts/Character/Crewmate/Crewmate.cs
@ -248,7 +248,7 @@ namespace BlueWaterProject
            }
            else
            {
-                if (GameManager.Inst.CurrentInIslandPlayer.GameObject && GameManager.Inst.CurrentInIslandPlayer.UseRigidbody)
+                if (GameManager.Inst.CurrentInIslandPlayer.GameObject && GameManager.Inst.CurrentInIslandPlayer.UseRigidbody && !Target)
                {
                    if (!UseRigidbody)
                    {
--- a/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs
+++ b/BlueWater/Assets/02.Scripts/Character/Player/Type/InIslandPlayer.cs
@ -88,6 +88,11 @@ namespace BlueWaterProject
        [DisableIf("@true")]
        [SerializeField] private bool isAttacking;
        
+        // Attack 테스트
+        [Title("공격 테스트")]
+        public float attackAngle = 180f;
+        public float angleSpeed = 0.3f;
+        
        // 일반 변수
        private bool usedNormalAttackCoroutine;
        private WaitForSeconds waitAtkCooldown;
@ -101,6 +106,8 @@ namespace BlueWaterProject
        private BehaviorTree bt;
        private Transform unitRoot;
        private Animator myAnimator;
+        private Transform trailRoot;
+        private ParticleSystem[] trailParticles;
        private Canvas worldSpaceCanvas;
        
        // Hash
@ -136,6 +143,9 @@ namespace BlueWaterProject
                defensePos = transform.position;
            }
            
+            Gizmos.color = Color.red;
+            Gizmos.DrawWireSphere(myCenterPos, AtkRange);
+            
            if (isDrawDefenseRange)
            {
                Gizmos.color = Color.blue;
@ -154,6 +164,13 @@ namespace BlueWaterProject
            Gizmos.color = targetToDistance <= AtkRange ? Color.blue : Color.red;
            Gizmos.DrawLine(myCenterPos, Target.bounds.center);
        }
+        
+        Vector3 RotateVectorByAngle(Vector3 originalDirection, float angle)
+        {
+            Quaternion rotationQuaternion = Quaternion.Euler(0f, angle, 0f);  // y축을 중심으로 회전
+            Vector3 rotatedDirection = rotationQuaternion * originalDirection;
+            return rotatedDirection;
+        }

        protected override void Awake()
        {
@ -177,6 +194,16 @@ namespace BlueWaterProject
                    print("myAnimator를 찾을 수 없습니다.");
                }
            }
+
+            trailRoot = transform.Find("TrailRoot");
+            if (trailRoot == null)
+            {
+                print("TrailRoot오브젝트를 찾을 수 없습니다.");
+            }
+            else
+            {
+                trailParticles = trailRoot.GetComponentsInChildren<ParticleSystem>();
+            }
            
            worldSpaceCanvas = GameObject.Find("WorldSpaceCanvas")?.GetComponent<Canvas>();
            if (worldSpaceCanvas == null)
@ -201,9 +228,13 @@ namespace BlueWaterProject
            TargetLayer = LayerMask.GetMask("Enemy");
                
            waitAtkCooldown = new WaitForSeconds(AtkCooldown);
-            Agent.updateRotation = false;
+
+            if (Agent.enabled)
+            {
+                Agent.updateRotation = false;
+                SetAgentSpeed(MoveSpd);
+            }
            
-            SetAgentSpeed(MoveSpd);
            if (useHpSlider)
            {
                hpSlider.maxValue = MaxHp;
@ -256,20 +287,27 @@ namespace BlueWaterProject
            // 멈춰있는 경우
            else
            {
-                // NavMeshAgent 사용
                if (UseRigidbody)
                {
-                    UseAgentMovement();
-                }
-
-                if (Agent.velocity.x != 0 || Agent.velocity.z != 0)
-                {
-                    myAnimator.SetFloat(RunStateHash, 0.5f);
-                }
-                else if (!beAttacked)
-                {
-                    myAnimator.SetFloat(RunStateHash, 0f);
+                    UseRigidbody = false;
+                    Rb.velocity = Vector3.zero;
                }
+                
+                myAnimator.SetFloat(RunStateHash, 0f);
+                // // NavMeshAgent 사용
+                // if (UseRigidbody)
+                // {
+                //     UseAgentMovement();
+                // }
+                //
+                // if (Agent.velocity.x != 0 || Agent.velocity.z != 0)
+                // {
+                //     myAnimator.SetFloat(RunStateHash, 0.5f);
+                // }
+                // else if (!beAttacked)
+                // {
+                //     myAnimator.SetFloat(RunStateHash, 0f);
+                // }
            }
            
            var localScale = transform.localScale;
@ -308,6 +346,14 @@ namespace BlueWaterProject
                }
            }
            transform.localScale = localScale;
+            var trailRootLocalScale = trailRoot.localScale;
+            trailRootLocalScale.x = localScale.x switch
+            {
+                > 0 => Mathf.Abs(trailRootLocalScale.x),
+                < 0 => -Mathf.Abs(trailRootLocalScale.x),
+                _ => localScale.x
+            };
+            trailRoot.localScale = trailRootLocalScale;
        }

        protected override void FixedUpdate()
@ -321,6 +367,12 @@ namespace BlueWaterProject

                var movement = worldDirection * MoveSpd;
                Rb.velocity = new Vector3(movement.x, 0, movement.z);
+                
+                DefensePos = transform.position;
+                foreach (var crewmate in GameManager.Inst.CurrentCrewmateList)
+                {
+                    crewmate.DefensePos = DefensePos;
+                }
            }
        }

@ -399,15 +451,80 @@ namespace BlueWaterProject
        // IAnimatorBridge
        public virtual void AttackTiming()
        {
-            if (!Target) return;
+            // if (!Target) return;
+            //
+            // var myCenterPos = MyCollider.bounds.center;
+            // var targetDir = (Target.bounds.center - myCenterPos).normalized;
+            //
+            // if (!Physics.Raycast(MyCollider.bounds.center, targetDir, out var hit, AtkRange, TargetLayer)) return;
+            //
+            // var iDamageable = hit.transform.GetComponent<IDamageable>();
+            // iDamageable.TakeDamage(Atk);
            
-            var myCenterPos = MyCollider.bounds.center;
-            var targetDir = (Target.bounds.center - myCenterPos).normalized;
+            var mousePos = Mouse.current.position.ReadValue();
+            var ray = Camera.main.ScreenPointToRay(mousePos);
+            
+            if (!Physics.Raycast(ray, out var hit)) return;
+            
+            var mouseWorldPos = hit.point;
+            mouseWorldPos.y = MyCollider.bounds.center.y;
+            var attackDirection = (mouseWorldPos - transform.position).normalized;
+            var hitColliders = new Collider[20];

-            if (!Physics.Raycast(MyCollider.bounds.center, targetDir, out var hit, AtkRange, TargetLayer)) return;
+            var size = Physics.OverlapSphereNonAlloc(transform.position, AtkRange, hitColliders, TargetLayer);
+
+            for (var i = 0; i < size; i++)
+            {
+                var targetDirection = (hitColliders[i].transform.position - transform.position).normalized;
+                var angleBetween = Vector3.Angle(attackDirection, targetDirection);
+
+                if (angleBetween < attackAngle / 2f) // Checking if the target is within the desired angle range
+                {
+                    var iDamageable = hitColliders[i].transform.GetComponent<IDamageable>();
+                    iDamageable.TakeDamage(Atk);
+                }
+            }
+        }
+        
+        private IEnumerator DrawAttackTrail()
+        {
+            var mousePos = Mouse.current.position.ReadValue();
+            var ray = Camera.main.ScreenPointToRay(mousePos);
+
+            if (!Physics.Raycast(ray, out var hit)) yield break;
            
-            var iDamageable = hit.transform.GetComponent<IDamageable>();
-            iDamageable.TakeDamage(Atk);
+            var mouseWorldPos = hit.point;
+            mouseWorldPos.y = transform.position.y;
+            var directionToMouse = (mouseWorldPos - transform.position).normalized;
+            
+            var leftRotation = Quaternion.Euler(0, -attackAngle * 0.5f, 0);
+            var rightRotation = Quaternion.Euler(0, attackAngle * 0.5f, 0);
+            
+            trailRoot.rotation = Quaternion.LookRotation(directionToMouse) * leftRotation;
+
+            foreach (var trail in trailParticles)
+            {
+                trail.Play();
+            }
+
+            var time = 0f;
+            while (time < angleSpeed)
+            {
+                var t = time / angleSpeed;
+                trailRoot.rotation = Quaternion.Slerp(
+                    Quaternion.LookRotation(directionToMouse) * leftRotation,
+                    Quaternion.LookRotation(directionToMouse) * rightRotation,
+                    t
+                );
+                
+                time += Time.deltaTime;
+                yield return null;
+            }
+            
+            foreach (var trail in trailParticles)
+            {
+                trail.Stop();
+            }
        }
        
        public void SetIsAttacking(int boolValue) => isAttacking = boolValue == 1;
@ -443,7 +560,10 @@ namespace BlueWaterProject
        // INormalAttack
        public void NormalAttack()
        {
+            if (CurrentHp <= 0f || usedNormalAttackCoroutine) return;
+            
            StartCoroutine(nameof(NormalAttackCoroutine));
+            StartCoroutine(nameof(DrawAttackTrail));
        }
        
        public void StopNormalAttackCoroutine() => StopCoroutine(nameof(NormalAttackCoroutine));
@ -460,6 +580,11 @@ namespace BlueWaterProject
            base.OnMove(value);
        }

+        public void OnAttack()
+        {
+            NormalAttack();
+        }
+
        #endregion

        #region Custom methods
--- a/BlueWater/Assets/03.Materials/MeleeAttackTrail.mat
+++ b/BlueWater/Assets/03.Materials/MeleeAttackTrail.mat
@ -0,0 +1,134 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: MeleeAttackTrail
+  m_Shader: {fileID: 10755, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 1
+  m_CustomRenderQueue: 3500
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _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}
+    - _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:
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BlendOp: 0
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 0
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _SampleGI: 0
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _WorkflowMode: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, 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: []
+--- !u!114 &9000183305132074839
+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
--- a/BlueWater/Assets/03.Materials/MeleeAttackTrail.mat.meta
+++ b/BlueWater/Assets/03.Materials/MeleeAttackTrail.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 235e2dce014165c48a99f07e0a1bc957
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/BlueWater/Assets/FlatKit/PresetsShared/Materials/MatteBronze__StylSurf_Single_Spec_Rim_HGrad.mat
+++ b/BlueWater/Assets/FlatKit/PresetsShared/Materials/MatteBronze__StylSurf_Single_Spec_Rim_HGrad.mat
@ -2,15 +2,27 @@
 %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: MatteBronze__StylSurf_Single_Spec_Rim_HGrad
  m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3}
-  m_ShaderKeywords: DR_GRADIENT_ON DR_RIM_ON DR_SPECULAR_ON _CELPRIMARYMODE_SINGLE
-    _FLAT_RIM_ENABLED _FLAT_SHADOWS_ENABLED _FLAT_SPECULAR_ENABLED
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - DR_GRADIENT_ON
+  - DR_RIM_ON
+  - DR_SPECULAR_ON
+  - _CELPRIMARYMODE_SINGLE
+  - _DETAILMAPBLENDINGMODE_MULTIPLY
+  - _TEXTUREBLENDINGMODE_MULTIPLY
+  - _UNITYSHADOWMODE_MULTIPLY
+  m_InvalidKeywords:
+  - _FLAT_RIM_ENABLED
+  - _FLAT_SHADOWS_ENABLED
+  - _FLAT_SPECULAR_ENABLED
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
@ -18,6 +30,7 @@ Material:
  stringTagMap: {}
  disabledShaderPasses:
  - SRPDEFAULTUNLIT
+  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
@ -41,6 +54,10 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 0, y: 0}
        m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        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}
@ -69,15 +86,20 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
+    - _BaseMapPremultiply: 0
    - _Blend: 0
    - _BumpScale: 1
+    - _CameraDistanceImpact: 0
    - _CelExtraEnabled: 0
    - _CelNumSteps: 3
    - _CelPrimaryMode: 1
    - _Cull: 2
    - _Cutoff: 0.5
+    - _DetailMapBlendingMode: 0
+    - _DetailMapImpact: 0
    - _DetailNormalMapScale: 1
    - _DstBlend: 0
    - _FlatRimAmount: 0.5
@ -113,6 +135,10 @@ Material:
    - _Metallic: 0
    - _Mode: 0
    - _OcclusionStrength: 1
+    - _OutlineDepthOffset: 0
+    - _OutlineEnabled: 0
+    - _OutlineScale: 1
+    - _OutlineWidth: 1
    - _OverrideLightmapDir: 0
    - _OverrideShadows: 1
    - _OverrideShadowsEnabled: 1
@ -136,6 +162,7 @@ Material:
    - _TextureImpact: 1
    - _UVSec: 0
    - _UnityShadowMode: 1
+    - _UnityShadowOcclusion: 0
    - _UnityShadowPower: 0.2
    - _UnityShadowSharpness: 1
    - _VertexColorsEnabled: 0
@ -152,9 +179,11 @@ Material:
    - _ColorSecondary: {r: 1, g: 0.55879205, b: 0, a: 1}
    - _ColorShadow: {r: 0.5, g: 0.5, b: 0.5, a: 1}
    - _ColorShadows: {r: 0.37835297, g: 0.4602353, b: 0.72, a: 1}
+    - _DetailMapColor: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 4.9245777, g: 0, b: 0, a: 1}
    - _FlatRimColor: {r: 1, g: 0.8387512, b: 0.5254902, a: 1}
    - _FlatSpecularColor: {r: 0.8213369, g: 0.8301887, b: 0.70879316, a: 1}
    - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0}
+    - _OutlineColor: {r: 1, g: 1, b: 1, a: 1}
    - _UnityShadowColor: {r: 0.65, g: 0.65, b: 0.65, a: 1}
  m_BuildTextureStacks: []
--- a/BlueWater/Assets/FlatKit/PresetsShared/Materials/MatteGradient_StylSurf_None_HGrad.mat
+++ b/BlueWater/Assets/FlatKit/PresetsShared/Materials/MatteGradient_StylSurf_None_HGrad.mat
@ -2,15 +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: MatteGradient_StylSurf_None_HGrad
  m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3}
-  m_ShaderKeywords: DR_GRADIENT_ON _CELPRIMARYMODE_NONE _FLAT_RIM_ENABLED _FLAT_SHADOWS_ENABLED
-    _FLAT_SPECULAR_ENABLED
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - DR_GRADIENT_ON
+  - _DETAILMAPBLENDINGMODE_MULTIPLY
+  - _TEXTUREBLENDINGMODE_MULTIPLY
+  - _UNITYSHADOWMODE_MULTIPLY
+  m_InvalidKeywords:
+  - _CELPRIMARYMODE_NONE
+  - _FLAT_RIM_ENABLED
+  - _FLAT_SHADOWS_ENABLED
+  - _FLAT_SPECULAR_ENABLED
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
@ -18,6 +28,7 @@ Material:
  stringTagMap: {}
  disabledShaderPasses:
  - SRPDEFAULTUNLIT
+  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
@ -41,6 +52,10 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 0, y: 0}
        m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        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}
@ -69,15 +84,20 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _AlphaClip: 0
+    - _BaseMapPremultiply: 0
    - _Blend: 0
    - _BumpScale: 1
+    - _CameraDistanceImpact: 0
    - _CelExtraEnabled: 0
    - _CelNumSteps: 3
    - _CelPrimaryMode: 0
    - _Cull: 2
    - _Cutoff: 0.5
+    - _DetailMapBlendingMode: 0
+    - _DetailMapImpact: 0
    - _DetailNormalMapScale: 1
    - _DstBlend: 0
    - _FlatRimAmount: 0.5
@ -113,6 +133,10 @@ Material:
    - _Metallic: 0
    - _Mode: 0
    - _OcclusionStrength: 1
+    - _OutlineDepthOffset: 0
+    - _OutlineEnabled: 0
+    - _OutlineScale: 1
+    - _OutlineWidth: 1
    - _OverrideLightmapDir: 0
    - _OverrideShadows: 1
    - _OverrideShadowsEnabled: 1
@ -136,6 +160,7 @@ Material:
    - _TextureImpact: 1
    - _UVSec: 0
    - _UnityShadowMode: 1
+    - _UnityShadowOcclusion: 0
    - _UnityShadowPower: 0.2
    - _UnityShadowSharpness: 1
    - _VertexColorsEnabled: 0
@ -152,9 +177,11 @@ Material:
    - _ColorSecondary: {r: 1, g: 0.55879205, b: 0, a: 1}
    - _ColorShadow: {r: 0.5, g: 0.5, b: 0.5, a: 1}
    - _ColorShadows: {r: 0.37835297, g: 0.4602353, b: 0.72, a: 1}
+    - _DetailMapColor: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 4.9245777, g: 0, b: 0, a: 1}
    - _FlatRimColor: {r: 1, g: 0.8387512, b: 0.5254902, a: 1}
    - _FlatSpecularColor: {r: 0.76448715, g: 0.7924528, b: 0.41491634, a: 1}
    - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0}
+    - _OutlineColor: {r: 1, g: 1, b: 1, a: 1}
    - _UnityShadowColor: {r: 0.65, g: 0.65, b: 0.65, a: 1}
  m_BuildTextureStacks: []