From b0151e3bc6fbbd647b05e42814cc0119ef4977bb Mon Sep 17 00:00:00 2001
From: Nam Tae Gun <iwnc2020@capers.co.kr>
Date: Fri, 14 Jun 2024 04:00:31 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A0=84=ED=88=AC=ED=94=8C=EB=A0=88=EC=9D=B4?=
 =?UTF-8?q?=EC=96=B4=20=EC=BD=A4=EB=B3=B4=20=EA=B3=B5=EA=B2=A9=20=EC=95=88?=
 =?UTF-8?q?=EB=90=98=EB=8A=94=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

+ ClickGround Layer 추가
+ CombatAttacker GroundLayer -> MouseClickLayer로 변경
+ MapController마다 ClickGround 추가
---
 .../Character/Player/Combat/CombatAttacker.cs |  5 +-
 .../Characters/Players/CombatPlayer.prefab    |  7 +--
 Assets/05.Prefabs/Maps/MapController.prefab   | 54 +++++++++++++++++++
 ProjectSettings/TagManager.asset              |  2 +-
 4 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/Assets/02.Scripts/Character/Player/Combat/CombatAttacker.cs b/Assets/02.Scripts/Character/Player/Combat/CombatAttacker.cs
index d9d07ac71..0dcd3dac6 100644
--- a/Assets/02.Scripts/Character/Player/Combat/CombatAttacker.cs
+++ b/Assets/02.Scripts/Character/Player/Combat/CombatAttacker.cs
@@ -5,6 +5,7 @@ using BlueWater.Interfaces;
 using BlueWater.Utility;
 using UnityEngine;
 using UnityEngine.InputSystem;
+using UnityEngine.Serialization;
 
 namespace BlueWater.Players.Combat
 {
@@ -48,7 +49,7 @@ namespace BlueWater.Players.Combat
         public LayerMask TargetLayer { get; private set; }
         
         [SerializeField]
-        private LayerMask _groundLayer;
+        private LayerMask _mouseClickLayer;
         
         // Particles
         [SerializeField]
@@ -133,7 +134,7 @@ namespace BlueWater.Players.Combat
             var mousePos = Mouse.current.position.ReadValue();
             var ray = CombatCameraManager.Instance.MainCamera.ScreenPointToRay(mousePos);
             
-            if (!Physics.Raycast(ray, out var hit, float.MaxValue, _groundLayer))
+            if (!Physics.Raycast(ray, out var hit, float.MaxValue, _mouseClickLayer))
             {
                 EndComboAttack();
                 return;
diff --git a/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab b/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab
index 4def408db..14ec43cb6 100644
--- a/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab
+++ b/Assets/05.Prefabs/Characters/Players/CombatPlayer.prefab
@@ -440,9 +440,9 @@ MonoBehaviour:
   <TargetLayer>k__BackingField:
     serializedVersion: 2
     m_Bits: 4096
-  _groundLayer:
+  _mouseClickLayer:
     serializedVersion: 2
-    m_Bits: 64
+    m_Bits: 32832
   _swordAttackParticle: {fileID: 8523211495174882546, guid: 04437dbea0cb46d46be53d3485123127, type: 3}
   _comboAttackHitStopDuration: 0.07
 --- !u!114 &326920787583948413
@@ -499,12 +499,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5534bdef0c121a34eb71394c0c70fe0c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _transparentMaterial: {fileID: 2100000, guid: cc9b0fce917bc9548bd1bf66aa23a269, type: 2}
   _obstacleLayer:
     serializedVersion: 2
     m_Bits: 256
-  _transparency: 0.5
-  _fadeDuration: 0.5
   _maxHitCount: 8
 --- !u!1 &7185106063436424164
 GameObject:
diff --git a/Assets/05.Prefabs/Maps/MapController.prefab b/Assets/05.Prefabs/Maps/MapController.prefab
index 2e3cc508c..c5a3e0738 100644
--- a/Assets/05.Prefabs/Maps/MapController.prefab
+++ b/Assets/05.Prefabs/Maps/MapController.prefab
@@ -171,6 +171,59 @@ Transform:
   m_Children: []
   m_Father: {fileID: 4700527603807157220}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2237997153284357287
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 744015304459136220}
+  - component: {fileID: 4270838775041130948}
+  m_Layer: 15
+  m_Name: ClickGround
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &744015304459136220
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2237997153284357287}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 100, y: 100, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2986811746704976679}
+  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!65 &4270838775041130948
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2237997153284357287}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 0.20000005}
+  m_Center: {x: 0, y: 0, z: 0.1}
 --- !u!1 &2252011116647396897
 GameObject:
   m_ObjectHideFlags: 0
@@ -560,6 +613,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5711256728325704458}
+  - {fileID: 744015304459136220}
   m_Father: {fileID: 7580754897896246193}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5194988466372041496
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index 0d63c0303..ed120c814 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -22,7 +22,7 @@ TagManager:
   - EnemyHitBox
   - Item
   - Npc
-  - 
+  - ClickGround
   - 
   - 
   -