feat: 문 애니메이션 중 콜라이더 비활성화 및 기타 (#196)

kookmin-sw · Jul 15, 2024 · 26c0eb1 · 26c0eb1
1 parent 5d1e44c
commit 26c0eb1
Show file tree

Hide file tree

Showing 16 changed files with 230 additions and 88 deletions.
diff --git a/Client/Assets/Resources/Materials/DamageMaterial.mat b/Client/Assets/Resources/Materials/DamageMaterial.mat
@@ -40,7 +40,7 @@ Material:
     - _Blur: 0
     - _Vignette_blur: 2.5
     - _Vignette_darkening: 1
-    - _Vignette_radius: -1
+    - _Vignette_radius: 1.2
     - _Vignette_softness: 1
     m_Colors:
     - _Tint: {r: 0.8773585, g: 0.0198647, b: 0.0198647, a: 0}

diff --git a/Client/Assets/Resources/Prefabs/Creatures/Stalker.prefab b/Client/Assets/Resources/Prefabs/Creatures/Stalker.prefab
@@ -1339,7 +1339,7 @@ MonoBehaviour:
     ColliderLayer: 0
     CollisionLayerMask:
       serializedVersion: 2
-      m_Bits: 2049
+      m_Bits: 18433
     ProxyInterpolationMode: 0
     TeleportThreshold: 1
     AntiJitterDistance: {x: 0.025, y: 0.01}

diff --git a/Client/Assets/Resources/Prefabs/Map/CargoPassageGate.prefab b/Client/Assets/Resources/Prefabs/Map/CargoPassageGate.prefab
@@ -1,5 +1,67 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6801934730329823
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2324187310728194606}
+  - component: {fileID: 5073105053904257086}
+  - component: {fileID: 3439507148779054980}
+  m_Layer: 14
+  m_Name: AlienCollider
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2324187310728194606
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6801934730329823}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.339, y: 0.5, z: 2}
+  m_LocalScale: {x: 1, y: 1, z: 4}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7236642029869414185}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &5073105053904257086
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6801934730329823}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!65 &3439507148779054980
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6801934730329823}
+  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: 6.5241184, y: 1, z: 1}
+  m_Center: {x: -2.5, y: 0, z: 0}
 --- !u!1 &6866169704868581072
 GameObject:
   m_ObjectHideFlags: 0
@@ -403,7 +465,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7236642029869414185}
-  - component: {fileID: 7236642029869018556}
   - component: {fileID: 7236642029869018544}
   - component: {fileID: 7236642029869018557}
   - component: {fileID: 6901989839342170547}
@@ -434,33 +495,13 @@ Transform:
   - {fileID: 7236642029869414207}
   - {fileID: 7236642029869414201}
   - {fileID: 7236642029869414203}
+  - {fileID: 2324187310728194606}
   - {fileID: 817831902977619859}
   - {fileID: 2145783596903434262}
   - {fileID: 7158447810789029731}
   - {fileID: 1006438731095480192}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: -89.98, y: 0, z: 0}
---- !u!65 &7236642029869018556
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7236642029868985097}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 1
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Size: {x: 4, y: 6, z: 4}
-  m_Center: {x: -3, y: 0.5, z: 2}
 --- !u!205 &7236642029869018544
 LODGroup:
   m_ObjectHideFlags: 0

diff --git a/Client/Assets/Resources/Prefabs/Map/Components/Elevator.prefab b/Client/Assets/Resources/Prefabs/Map/Components/Elevator.prefab
@@ -33,8 +33,62 @@ Transform:
   - {fileID: 2187459321568614308}
   - {fileID: 7776432145164884284}
   - {fileID: 1597691120968115720}
+  - {fileID: 6227820358848434538}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1418631696588832472
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6227820358848434538}
+  - component: {fileID: 6532750862263710847}
+  m_Layer: 14
+  m_Name: AlienCollider
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6227820358848434538
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1418631696588832472}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -1.722, y: 0, z: -0.378}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4845720123607770}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &6532750862263710847
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1418631696588832472}
+  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: 3.2470481, z: 2.354786}
+  m_Center: {x: 0, y: 1.1235241, z: 0.34994888}
 --- !u!1 &4572832400089274880
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Client/Assets/Resources/Prefabs/Map/Components/NormalDoor.prefab b/Client/Assets/Resources/Prefabs/Map/Components/NormalDoor.prefab
@@ -44,7 +44,6 @@ GameObject:
   - component: {fileID: 8336051096168507037}
   - component: {fileID: 4048720328621601821}
   - component: {fileID: 1807669088186169604}
-  - component: {fileID: 1706759653307198056}
   m_Layer: 11
   m_Name: Handle
   m_TagString: Untagged
@@ -117,27 +116,6 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!65 &1706759653307198056
-BoxCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2970732603807452959}
-  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: 0.17750004, y: 0.022500008, z: 0.1675}
-  m_Center: {x: 0.021249976, y: -0.0000000041909516, z: -0.07249998}
 --- !u!1 &5571350446065383369
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Client/Assets/Resources/Prefabs/Map/PanicRoom.prefab b/Client/Assets/Resources/Prefabs/Map/PanicRoom.prefab
@@ -1,5 +1,58 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4163813082578932981
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1852186548076195952}
+  - component: {fileID: 6399199659724139455}
+  m_Layer: 14
+  m_Name: AlienCollider
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1852186548076195952
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4163813082578932981}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: 3.078, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1865599408426144721}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &6399199659724139455
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4163813082578932981}
+  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: 3.1860783, y: 2.9338808, z: 1}
+  m_Center: {x: 0.25948614, y: 0.9669404, z: 0}
 --- !u!1 &7247524351008793234
 GameObject:
   m_ObjectHideFlags: 0
@@ -66,6 +119,7 @@ Transform:
   - {fileID: 1003253371487383772}
   - {fileID: 315755944506526524}
   - {fileID: 4591115914899571184}
+  - {fileID: 1852186548076195952}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2013275784243172703