diff --git a/Project_Blind/Assets/Resources/Prefabs/ChatBox.prefab b/Project_Blind/Assets/Resources/Prefabs/ChatBox.prefab
deleted file mode 100644
index ee8579e5..00000000
--- a/Project_Blind/Assets/Resources/Prefabs/ChatBox.prefab
+++ /dev/null
@@ -1,286 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &2002515348805288685
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2002515348805288681}
-  - component: {fileID: 2002515348805288680}
-  - component: {fileID: 2002515348805288683}
-  - component: {fileID: 2002515348805288682}
-  m_Layer: 0
-  m_Name: Quad
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2002515348805288681
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2002515348805288685}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.05000019, z: -0.014492093}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2002515350153212937}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &2002515348805288680
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2002515348805288685}
-  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &2002515348805288683
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2002515348805288685}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 308be2b81ceaa264bb113961fbd5c4bc, type: 2}
-  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_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &2002515348805288682
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2002515348805288685}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
---- !u!1 &2002515350153212938
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2002515350153212937}
-  - component: {fileID: 2002515350153212936}
-  - component: {fileID: 2002515350153212939}
-  - component: {fileID: 1769109278407787989}
-  m_Layer: 0
-  m_Name: ChatBox
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2002515350153212937
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2002515350153212938}
-  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: 2002515348805288681}
-  m_Father: {fileID: 0}
-  m_RootOrder: 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}
-  m_SizeDelta: {x: 4, y: 5}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!23 &2002515350153212936
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2002515350153212938}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  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_AdditionalVertexStreams: {fileID: 0}
---- !u!114 &2002515350153212939
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2002515350153212938}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: Sample text
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 5
-  m_fontSizeBase: 5
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 0
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  _SortingLayer: 0
-  _SortingLayerID: 0
-  _SortingOrder: 0
-  m_hasFontAssetChanged: 0
-  m_renderer: {fileID: 2002515350153212936}
-  m_maskType: 0
---- !u!114 &1769109278407787989
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2002515350153212938}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 719d922c86e4475e9c3ffbc681b4ba00, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
diff --git a/Project_Blind/Assets/Resources/Prefabs/ChatBox.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/ChatBox.prefab.meta
deleted file mode 100644
index 88247b8e..00000000
--- a/Project_Blind/Assets/Resources/Prefabs/ChatBox.prefab.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 3abb6f92851fc434390efe956464b2f1
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Project_Blind/Assets/Resources/Prefabs/Enemy/Enemy.prefab b/Project_Blind/Assets/Resources/Prefabs/Enemy/Enemy.prefab
index ab74a48a..3c9280ee 100644
--- a/Project_Blind/Assets/Resources/Prefabs/Enemy/Enemy.prefab
+++ b/Project_Blind/Assets/Resources/Prefabs/Enemy/Enemy.prefab
@@ -200,7 +200,7 @@ MonoBehaviour:
   m_LightCookieSprite: {fileID: 0}
   m_DeprecatedPointLightCookieSprite: {fileID: 0}
   m_LightOrder: 0
-  m_OverlapOperation: 0
+  m_OverlapOperation: 1
   m_NormalMapDistance: 3
   m_NormalMapQuality: 2
   m_UseNormalMap: 0
diff --git a/Project_Blind/Assets/Resources/Prefabs/MapObjects.meta b/Project_Blind/Assets/Resources/Prefabs/MapObjects.meta
index 6f850a03..4a4be229 100644
--- a/Project_Blind/Assets/Resources/Prefabs/MapObjects.meta
+++ b/Project_Blind/Assets/Resources/Prefabs/MapObjects.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: dbd21addb1cc84ca9b96415cb1bfd4a3
+guid: b513c0d6c398346ff91196e3f60f727d
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Project_Blind/Assets/Resources/Prefabs/MapObjects/GlowStone.prefab b/Project_Blind/Assets/Resources/Prefabs/MapObjects/GlowStone.prefab
index f5d7c3d2..e8ffe3da 100644
--- a/Project_Blind/Assets/Resources/Prefabs/MapObjects/GlowStone.prefab
+++ b/Project_Blind/Assets/Resources/Prefabs/MapObjects/GlowStone.prefab
@@ -10,6 +10,8 @@ GameObject:
   m_Component:
   - component: {fileID: 1448363533951301525}
   - component: {fileID: 9036080960493351390}
+  - component: {fileID: 224706432803308441}
+  - component: {fileID: 1897438289237159185}
   m_Layer: 0
   m_Name: GlowStone
   m_TagString: Untagged
@@ -84,3 +86,118 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!114 &224706432803308441
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 911246595514713373}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ComponentVersion: 1
+  m_LightType: 3
+  m_BlendStyleIndex: 0
+  m_FalloffIntensity: 0.5
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 0.5
+  m_LightVolumeIntensity: 1
+  m_LightVolumeIntensityEnabled: 0
+  m_ApplyToSortingLayers: 000000008d33c247
+  m_LightCookieSprite: {fileID: 0}
+  m_DeprecatedPointLightCookieSprite: {fileID: 0}
+  m_LightOrder: 0
+  m_OverlapOperation: 0
+  m_NormalMapDistance: 3
+  m_NormalMapQuality: 2
+  m_UseNormalMap: 0
+  m_ShadowIntensityEnabled: 0
+  m_ShadowIntensity: 0.75
+  m_ShadowVolumeIntensityEnabled: 0
+  m_ShadowVolumeIntensity: 0.75
+  m_Vertices:
+  - position: {x: 0.9985302, y: 0.9985302, z: 0}
+    color: {r: 0.70710677, g: 0.70710677, b: 0, a: 0}
+    uv: {x: 0, y: 0}
+  - position: {x: 0.9985302, y: 0.9985302, z: 0}
+    color: {r: 0, g: 0, b: 0, a: 1}
+    uv: {x: 0, y: 0}
+  - position: {x: -0.9985302, y: 0.9985302, z: 0}
+    color: {r: -0.70710677, g: 0.70710677, b: 0, a: 0}
+    uv: {x: 0, y: 0}
+  - position: {x: -0.9985302, y: 0.9985302, z: 0}
+    color: {r: 0, g: 0, b: 0, a: 1}
+    uv: {x: 0, y: 0}
+  - position: {x: -0.99853003, y: -0.9985304, z: 0}
+    color: {r: -0.70710665, g: -0.7071069, b: 0, a: 0}
+    uv: {x: 0, y: 0}
+  - position: {x: -0.99853003, y: -0.9985304, z: 0}
+    color: {r: 0, g: 0, b: 0, a: 1}
+    uv: {x: 0, y: 0}
+  - position: {x: 0.99853003, y: -0.9985304, z: 0}
+    color: {r: 0.70710665, g: -0.7071069, b: 0, a: 0}
+    uv: {x: 0, y: 0}
+  - position: {x: 0.99853003, y: -0.9985304, z: 0}
+    color: {r: 0, g: 0, b: 0, a: 1}
+    uv: {x: 0, y: 0}
+  - position: {x: 0, y: 0, z: 0}
+    color: {r: 0, g: 0, b: 0, a: 1}
+    uv: {x: 0, y: 0}
+  m_Triangles: 030001000800020000000100030002000100050003000800040002000300050004000300070005000800060004000500070006000500010007000800000006000700010000000700
+  m_LocalBounds:
+    m_Center: {x: 0, y: -0.00000011920929, z: 0}
+    m_Extent: {x: 0.9985302, y: 0.99853027, z: 0}
+  m_PointLightInnerAngle: 360
+  m_PointLightOuterAngle: 360
+  m_PointLightInnerRadius: 0
+  m_PointLightOuterRadius: 30
+  m_ShapeLightParametricSides: 5
+  m_ShapeLightParametricAngleOffset: 0
+  m_ShapeLightParametricRadius: 1
+  m_ShapeLightFalloffSize: 0.5
+  m_ShapeLightFalloffOffset: {x: 0, y: 0}
+  m_ShapePath:
+  - {x: -0.5, y: -0.5, z: 0}
+  - {x: 0.5, y: -0.5, z: 0}
+  - {x: 0.5, y: 0.5, z: 0}
+  - {x: -0.5, y: 0.5, z: 0}
+--- !u!114 &1897438289237159185
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 911246595514713373}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 99d5497b6a014098837f0ec2edfe797c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  spreadAnimation:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 2
+      outSlope: 2
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  maxSize: 30
diff --git a/Project_Blind/Assets/Resources/Prefabs/Creature.meta b/Project_Blind/Assets/Resources/Prefabs/MapObjects/Wave.meta
similarity index 77%
rename from Project_Blind/Assets/Resources/Prefabs/Creature.meta
rename to Project_Blind/Assets/Resources/Prefabs/MapObjects/Wave.meta
index a5148391..2a7990e4 100644
--- a/Project_Blind/Assets/Resources/Prefabs/Creature.meta
+++ b/Project_Blind/Assets/Resources/Prefabs/MapObjects/Wave.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 59c71d4feb8f5b343bd86efd9933941b
+guid: 61037011469d34ed1a253c2607960550
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Project_Blind/Assets/Resources/Prefabs/WaveSense.prefab b/Project_Blind/Assets/Resources/Prefabs/MapObjects/Wave/WaveSense.prefab
similarity index 91%
rename from Project_Blind/Assets/Resources/Prefabs/WaveSense.prefab
rename to Project_Blind/Assets/Resources/Prefabs/MapObjects/Wave/WaveSense.prefab
index 36b8db7d..712c19e6 100644
--- a/Project_Blind/Assets/Resources/Prefabs/WaveSense.prefab
+++ b/Project_Blind/Assets/Resources/Prefabs/MapObjects/Wave/WaveSense.prefab
@@ -31,8 +31,7 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 2055673048288375742}
+  m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -810,86 +809,3 @@ MonoBehaviour:
   - {x: 0.5, y: -0.5, z: 0}
   - {x: 0.5, y: 0.5, z: 0}
   - {x: -0.5, y: 0.5, z: 0}
---- !u!1 &9130447380892499307
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2055673048288375742}
-  - component: {fileID: 1296353411995899664}
-  m_Layer: 0
-  m_Name: Circle
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2055673048288375742
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9130447380892499307}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0.0013014321}
-  m_LocalScale: {x: 12.25, y: 12.25, z: 12.25}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 4902102705366628978}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!331 &1296353411995899664
-SpriteMask:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9130447380892499307}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
-  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_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
-  m_MaskAlphaCutoff: 0.267
-  m_FrontSortingLayerID: 0
-  m_BackSortingLayerID: 0
-  m_FrontSortingLayer: 0
-  m_BackSortingLayer: 0
-  m_FrontSortingOrder: 10
-  m_BackSortingOrder: -5
-  m_IsCustomRangeActive: 1
-  m_SpriteSortPoint: 0
diff --git a/Project_Blind/Assets/Resources/Prefabs/WaveSense.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/MapObjects/Wave/WaveSense.prefab.meta
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/WaveSense.prefab.meta
rename to Project_Blind/Assets/Resources/Prefabs/MapObjects/Wave/WaveSense.prefab.meta
diff --git a/Project_Blind/Assets/Resources/Prefabs/Env.meta b/Project_Blind/Assets/Resources/Prefabs/Obstacles.meta
similarity index 77%
rename from Project_Blind/Assets/Resources/Prefabs/Env.meta
rename to Project_Blind/Assets/Resources/Prefabs/Obstacles.meta
index 004dd205..5f339eb1 100644
--- a/Project_Blind/Assets/Resources/Prefabs/Env.meta
+++ b/Project_Blind/Assets/Resources/Prefabs/Obstacles.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7dccf0a5b6cafb54c8223319b2808ad6
+guid: 0c850edbde3044d73af3e964010ff949
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Project_Blind/Assets/Resources/Prefabs/Floor.prefab b/Project_Blind/Assets/Resources/Prefabs/Obstacles/Floor.prefab
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/Floor.prefab
rename to Project_Blind/Assets/Resources/Prefabs/Obstacles/Floor.prefab
diff --git a/Project_Blind/Assets/Resources/Prefabs/Floor.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Obstacles/Floor.prefab.meta
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/Floor.prefab.meta
rename to Project_Blind/Assets/Resources/Prefabs/Obstacles/Floor.prefab.meta
diff --git a/Project_Blind/Assets/Resources/Prefabs/InvisibleFloor.prefab b/Project_Blind/Assets/Resources/Prefabs/Obstacles/InvisibleFloor.prefab
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/InvisibleFloor.prefab
rename to Project_Blind/Assets/Resources/Prefabs/Obstacles/InvisibleFloor.prefab
diff --git a/Project_Blind/Assets/Resources/Prefabs/InvisibleFloor.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Obstacles/InvisibleFloor.prefab.meta
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/InvisibleFloor.prefab.meta
rename to Project_Blind/Assets/Resources/Prefabs/Obstacles/InvisibleFloor.prefab.meta
diff --git a/Project_Blind/Assets/Resources/Prefabs/InvisibleWall.prefab b/Project_Blind/Assets/Resources/Prefabs/Obstacles/InvisibleWall.prefab
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/InvisibleWall.prefab
rename to Project_Blind/Assets/Resources/Prefabs/Obstacles/InvisibleWall.prefab
diff --git a/Project_Blind/Assets/Resources/Prefabs/InvisibleWall.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Obstacles/InvisibleWall.prefab.meta
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/InvisibleWall.prefab.meta
rename to Project_Blind/Assets/Resources/Prefabs/Obstacles/InvisibleWall.prefab.meta
diff --git a/Project_Blind/Assets/Resources/Prefabs/Lava.prefab b/Project_Blind/Assets/Resources/Prefabs/Obstacles/Lava.prefab
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/Lava.prefab
rename to Project_Blind/Assets/Resources/Prefabs/Obstacles/Lava.prefab
diff --git a/Project_Blind/Assets/Resources/Prefabs/Lava.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Obstacles/Lava.prefab.meta
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/Lava.prefab.meta
rename to Project_Blind/Assets/Resources/Prefabs/Obstacles/Lava.prefab.meta
diff --git a/Project_Blind/Assets/Resources/Prefabs/PressFloor1.prefab b/Project_Blind/Assets/Resources/Prefabs/Obstacles/PressFloor1.prefab
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/PressFloor1.prefab
rename to Project_Blind/Assets/Resources/Prefabs/Obstacles/PressFloor1.prefab
diff --git a/Project_Blind/Assets/Resources/Prefabs/PressFloor1.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Obstacles/PressFloor1.prefab.meta
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/PressFloor1.prefab.meta
rename to Project_Blind/Assets/Resources/Prefabs/Obstacles/PressFloor1.prefab.meta
diff --git a/Project_Blind/Assets/Resources/Prefabs/Player 1.prefab b/Project_Blind/Assets/Resources/Prefabs/Player 1.prefab
deleted file mode 100644
index 3a7d1ac2..00000000
--- a/Project_Blind/Assets/Resources/Prefabs/Player 1.prefab	
+++ /dev/null
@@ -1,339 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &8550561745348708040
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8550561746097087466}
-  - component: {fileID: 8550561745348708037}
-  - component: {fileID: 8550561745348708036}
-  - component: {fileID: 8550561745348708039}
-  - component: {fileID: 8550561746097087470}
-  - component: {fileID: 8550561745348708041}
-  - component: {fileID: 8550561745348708034}
-  - component: {fileID: 8550561745348708035}
-  - component: {fileID: 8550561745348708032}
-  m_Layer: 3
-  m_Name: Player 1
-  m_TagString: Player
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8550561746097087466
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8550561745348708040}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -28.459642, y: -10.74, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8550561745554492956}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &8550561745348708037
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8550561745348708040}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 0dac2ab13d2eefe4e8d7bdf0bbf2c22c, type: 2}
-  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: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: a0406d281e9797149a7e3b65f868e9b7, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 1, y: 2}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
---- !u!50 &8550561745348708036
-Rigidbody2D:
-  serializedVersion: 4
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8550561745348708040}
-  m_BodyType: 0
-  m_Simulated: 1
-  m_UseFullKinematicContacts: 0
-  m_UseAutoMass: 0
-  m_Mass: 1
-  m_LinearDrag: 0
-  m_AngularDrag: 0.05
-  m_GravityScale: 1
-  m_Material: {fileID: 6200000, guid: 33e71d9d71a4b09498708826b6610611, type: 2}
-  m_Interpolate: 2
-  m_SleepingMode: 0
-  m_CollisionDetection: 1
-  m_Constraints: 4
---- !u!70 &8550561745348708039
-CapsuleCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8550561745348708040}
-  m_Enabled: 1
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
-  m_Size: {x: 1.48, y: 3.38}
-  m_Direction: 0
---- !u!114 &8550561746097087470
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8550561745348708040}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: eca3a64169bd4dd4bb08e07908ae7a53, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _hp: 10
-  maxhp: 10
-  _jumpSpeed: 0.5
-  _jumpAbortSpeedReduction: 1
-  _gravity: 1
-  _maxSpeed: 2
-  groundAcceleration: 15
-  groundDeceleration: 15
-  _dashSpeed: 0
-  _defaultTime: 0
-  _attackMove: 0.2
-  _maxComboDelay: 0.9
-  _hurtMove: 0.2
-  _lastClickTime: 0
-  _clickcount: 0
-  attack_x: 1
-  attack_y: 3
-  paring_x: 2
-  paring_y: 2
-  _spawnPoint: {fileID: 0}
---- !u!95 &8550561745348708041
-Animator:
-  serializedVersion: 4
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8550561745348708040}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 269cb10eaf7e55c438dc685ff581a34b, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
---- !u!114 &8550561745348708034
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8550561745348708040}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0f23621e48da409db8fdfcff3674cc4f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  groundedLayerMask:
-    serializedVersion: 2
-    m_Bits: 64
-  groundedRaycastDistance: 0.1
---- !u!114 &8550561745348708035
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8550561745348708040}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 06df7acbb0a84e6580986521c086d75c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  hitLayer:
-    serializedVersion: 2
-    m_Bits: 8
---- !u!114 &8550561745348708032
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8550561745348708040}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 737126f82bed49b8be3f8d02d81cd330, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _hitLayer:
-    serializedVersion: 2
-    m_Bits: 8
---- !u!1 &8550561745554492959
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8550561745554492956}
-  - component: {fileID: 8550561745554492957}
-  m_Layer: 0
-  m_Name: PlayerSight
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8550561745554492956
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8550561745554492959}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0.014151897}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8550561746097087466}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &8550561745554492957
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8550561745554492959}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 073797afb82c5a1438f328866b10b3f0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_ComponentVersion: 1
-  m_LightType: 3
-  m_BlendStyleIndex: 0
-  m_FalloffIntensity: 1
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_Intensity: 1
-  m_LightVolumeIntensity: 1
-  m_LightVolumeIntensityEnabled: 0
-  m_ApplyToSortingLayers: 8d33c247ab75ae9600000000
-  m_LightCookieSprite: {fileID: 0}
-  m_DeprecatedPointLightCookieSprite: {fileID: 0}
-  m_LightOrder: 0
-  m_OverlapOperation: 0
-  m_NormalMapDistance: 3
-  m_NormalMapQuality: 2
-  m_UseNormalMap: 0
-  m_ShadowIntensityEnabled: 1
-  m_ShadowIntensity: 1
-  m_ShadowVolumeIntensityEnabled: 1
-  m_ShadowVolumeIntensity: 1
-  m_Vertices:
-  - position: {x: 0.9985302, y: 0.9985302, z: 0}
-    color: {r: 0.70710677, g: 0.70710677, b: 0, a: 0}
-    uv: {x: 0, y: 0}
-  - position: {x: 0.9985302, y: 0.9985302, z: 0}
-    color: {r: 0, g: 0, b: 0, a: 1}
-    uv: {x: 0, y: 0}
-  - position: {x: -0.9985302, y: 0.9985302, z: 0}
-    color: {r: -0.70710677, g: 0.70710677, b: 0, a: 0}
-    uv: {x: 0, y: 0}
-  - position: {x: -0.9985302, y: 0.9985302, z: 0}
-    color: {r: 0, g: 0, b: 0, a: 1}
-    uv: {x: 0, y: 0}
-  - position: {x: -0.99853003, y: -0.9985304, z: 0}
-    color: {r: -0.70710665, g: -0.7071069, b: 0, a: 0}
-    uv: {x: 0, y: 0}
-  - position: {x: -0.99853003, y: -0.9985304, z: 0}
-    color: {r: 0, g: 0, b: 0, a: 1}
-    uv: {x: 0, y: 0}
-  - position: {x: 0.99853003, y: -0.9985304, z: 0}
-    color: {r: 0.70710665, g: -0.7071069, b: 0, a: 0}
-    uv: {x: 0, y: 0}
-  - position: {x: 0.99853003, y: -0.9985304, z: 0}
-    color: {r: 0, g: 0, b: 0, a: 1}
-    uv: {x: 0, y: 0}
-  - position: {x: 0, y: 0, z: 0}
-    color: {r: 0, g: 0, b: 0, a: 1}
-    uv: {x: 0, y: 0}
-  m_Triangles: 030001000800020000000100030002000100050003000800040002000300050004000300070005000800060004000500070006000500010007000800000006000700010000000700
-  m_LocalBounds:
-    m_Center: {x: 0, y: -0.00000011920929, z: 0}
-    m_Extent: {x: 0.9985302, y: 0.99853027, z: 0}
-  m_PointLightInnerAngle: 360
-  m_PointLightOuterAngle: 360
-  m_PointLightInnerRadius: 3
-  m_PointLightOuterRadius: 15
-  m_ShapeLightParametricSides: 5
-  m_ShapeLightParametricAngleOffset: 0
-  m_ShapeLightParametricRadius: 1
-  m_ShapeLightFalloffSize: 0.5
-  m_ShapeLightFalloffOffset: {x: 0, y: 0}
-  m_ShapePath:
-  - {x: -0.5, y: -0.5, z: 0}
-  - {x: 0.5, y: -0.5, z: 0}
-  - {x: 0.5, y: 0.5, z: 0}
-  - {x: -0.5, y: 0.5, z: 0}
diff --git a/Project_Blind/Assets/Resources/Prefabs/Player.prefab b/Project_Blind/Assets/Resources/Prefabs/Player.prefab
index 5512a12f..98e4cf89 100644
--- a/Project_Blind/Assets/Resources/Prefabs/Player.prefab
+++ b/Project_Blind/Assets/Resources/Prefabs/Player.prefab
@@ -48,7 +48,7 @@ MonoBehaviour:
   m_LightType: 3
   m_BlendStyleIndex: 0
   m_FalloffIntensity: 0.671
-  m_Color: {r: 0.7311321, g: 0.87347394, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_Intensity: 0.8
   m_LightVolumeIntensity: 1
   m_LightVolumeIntensityEnabled: 0
@@ -251,6 +251,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: eca3a64169bd4dd4bb08e07908ae7a53, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _moveVector: {x: 0, y: 0}
   _hp: 10
   maxhp: 10
   _jumpSpeed: 0.7
@@ -259,43 +260,25 @@ MonoBehaviour:
   _maxSpeed: 4
   groundAcceleration: 15
   groundDeceleration: 15
+  airborneAccelProportion: 0
+  airborneDecelProportion: 0
   _dashSpeed: 10
   _defaultTime: 0.2
   _attackMove: 0.2
   _maxComboDelay: 0.9
   _hurtMove: 1
+  _isHurtCheck: 0
   _lastClickTime: 0
   _clickcount: 0
+  _isPowerAttackCheck: 0
   attack_x: 0
   attack_y: 0
   paring_x: 0
   paring_y: 0
-  waveSenseSpeed:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0
-      inSlope: 3.1389365
-      outSlope: 3.1389365
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0
-      outWeight: 0.045833334
-    - serializedVersion: 3
-      time: 1.0083313
-      value: 1
-      inSlope: -0.0065817204
-      outSlope: -0.0065817204
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.3553706
-      outWeight: 0
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
   _spawnPoint: {fileID: 0}
+  isJump: 0
   _enemyObject: {fileID: 0}
+  isOnLava: 0
 --- !u!95 &7138595048606892266
 Animator:
   serializedVersion: 4
diff --git a/Project_Blind/Assets/Resources/Prefabs/SceneFader.prefab b/Project_Blind/Assets/Resources/Prefabs/SceneControl/SceneFader.prefab
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/SceneFader.prefab
rename to Project_Blind/Assets/Resources/Prefabs/SceneControl/SceneFader.prefab
diff --git a/Project_Blind/Assets/Resources/Prefabs/SceneFader.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/SceneControl/SceneFader.prefab.meta
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/SceneFader.prefab.meta
rename to Project_Blind/Assets/Resources/Prefabs/SceneControl/SceneFader.prefab.meta
diff --git a/Project_Blind/Assets/Resources/Prefabs/Player 1.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Test.meta
similarity index 57%
rename from Project_Blind/Assets/Resources/Prefabs/Player 1.prefab.meta
rename to Project_Blind/Assets/Resources/Prefabs/Test.meta
index c72ac3dd..f007a2fb 100644
--- a/Project_Blind/Assets/Resources/Prefabs/Player 1.prefab.meta	
+++ b/Project_Blind/Assets/Resources/Prefabs/Test.meta
@@ -1,6 +1,7 @@
 fileFormatVersion: 2
-guid: 2f0bf8c8717dcce40a637da63acb4162
-PrefabImporter:
+guid: 9e99eb142b688472facba88be294bbc9
+folderAsset: yes
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 
diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh.meta b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh.meta
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/TestKjh.meta
rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh.meta
diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/Camera.prefab b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Camera.prefab
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/Camera.prefab
rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Camera.prefab
diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/Camera.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Camera.prefab.meta
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/Camera.prefab.meta
rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Camera.prefab.meta
diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/Ground.prefab b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Ground.prefab
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/Ground.prefab
rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Ground.prefab
diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/Ground.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Ground.prefab.meta
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/Ground.prefab.meta
rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Ground.prefab.meta
diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/Player.prefab b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player.prefab
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/Player.prefab
rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player.prefab
diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/Player.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player.prefab.meta
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/Player.prefab.meta
rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player.prefab.meta
diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/Player1.prefab b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player1.prefab
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/Player1.prefab
rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player1.prefab
diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/Player1.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player1.prefab.meta
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/Player1.prefab.meta
rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player1.prefab.meta
diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/Player11.prefab b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player11.prefab
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/Player11.prefab
rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player11.prefab
diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/Player11.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player11.prefab.meta
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/Player11.prefab.meta
rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/Player11.prefab.meta
diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/TestNPC.prefab b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/TestNPC.prefab
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/TestNPC.prefab
rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/TestNPC.prefab
diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/TestNPC.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/TestNPC.prefab.meta
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/TestNPC.prefab.meta
rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/TestNPC.prefab.meta
diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/TestObject.prefab b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/TestObject.prefab
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/TestObject.prefab
rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/TestObject.prefab
diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/TestObject.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/TestObject.prefab.meta
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/TestObject.prefab.meta
rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/TestObject.prefab.meta
diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/abc.prefab b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/abc.prefab
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/abc.prefab
rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/abc.prefab
diff --git a/Project_Blind/Assets/Resources/Prefabs/TestKjh/abc.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/abc.prefab.meta
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/TestKjh/abc.prefab.meta
rename to Project_Blind/Assets/Resources/Prefabs/Test/TestKjh/abc.prefab.meta
diff --git a/Project_Blind/Assets/Resources/Prefabs/TestPooling.prefab b/Project_Blind/Assets/Resources/Prefabs/Test/TestPooling.prefab
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/TestPooling.prefab
rename to Project_Blind/Assets/Resources/Prefabs/Test/TestPooling.prefab
diff --git a/Project_Blind/Assets/Resources/Prefabs/TestPooling.prefab.meta b/Project_Blind/Assets/Resources/Prefabs/Test/TestPooling.prefab.meta
similarity index 100%
rename from Project_Blind/Assets/Resources/Prefabs/TestPooling.prefab.meta
rename to Project_Blind/Assets/Resources/Prefabs/Test/TestPooling.prefab.meta
diff --git "a/Project_Blind/Assets/Resources/Prefabs/\353\202\250\353\252\250.png" "b/Project_Blind/Assets/Resources/Prefabs/\353\202\250\353\252\250.png"
deleted file mode 100644
index 09b9bb66..00000000
Binary files "a/Project_Blind/Assets/Resources/Prefabs/\353\202\250\353\252\250.png" and /dev/null differ
diff --git "a/Project_Blind/Assets/Resources/Prefabs/\353\202\250\353\252\250.png.meta" "b/Project_Blind/Assets/Resources/Prefabs/\353\202\250\353\252\250.png.meta"
deleted file mode 100644
index 4f64fdb6..00000000
--- "a/Project_Blind/Assets/Resources/Prefabs/\353\202\250\353\252\250.png.meta"
+++ /dev/null
@@ -1,98 +0,0 @@
-fileFormatVersion: 2
-guid: 5cddd1a09318b1f40aff8a77fba50710
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMasterTextureLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Project_Blind/Assets/Scenes/TestFogOfWar.unity b/Project_Blind/Assets/Scenes/TestFogOfWar.unity
index 8db59def..e49912c6 100644
--- a/Project_Blind/Assets/Scenes/TestFogOfWar.unity
+++ b/Project_Blind/Assets/Scenes/TestFogOfWar.unity
@@ -325,6 +325,170 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 4130092069143574499, guid: e54e058b2ec3b445ab3333a4f138091f, type: 3}
   m_PrefabInstance: {fileID: 500005463}
   m_PrefabAsset: {fileID: 0}
+--- !u!43 &317412724
+Mesh:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  serializedVersion: 10
+  m_SubMeshes:
+  - serializedVersion: 2
+    firstByte: 0
+    indexCount: 42
+    topology: 0
+    baseVertex: 0
+    firstVertex: 0
+    vertexCount: 16
+    localAABB:
+      m_Center: {x: 0, y: 0, z: 0}
+      m_Extent: {x: 0.5, y: 0.5, z: 0}
+  m_Shapes:
+    vertices: []
+    shapes: []
+    channels: []
+    fullWeights: []
+  m_BindPose: []
+  m_BoneNameHashes: 
+  m_RootBoneNameHash: 0
+  m_BonesAABB: []
+  m_VariableBoneCountWeights:
+    m_Data: 
+  m_MeshCompression: 0
+  m_IsReadable: 1
+  m_KeepVertices: 1
+  m_KeepIndices: 1
+  m_IndexFormat: 0
+  m_IndexBuffer: 00000100020003000100000003000400010005000400030006000400050004000600070002000800000000000900030001000a00020004000b00010003000c00050007000d00040005000e00060006000f000700
+  m_VertexData:
+    serializedVersion: 3
+    m_VertexCount: 16
+    m_Channels:
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 3
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 12
+      format: 0
+      dimension: 4
+    - stream: 0
+      offset: 28
+      format: 0
+      dimension: 4
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    m_DataSize: 704
+    _typelessdata: 0000003f000000bf000000000000803f0000008000000080000000800000003f000000bf0000003f000000bf0000003f0000003f00000000000000800000803f00000080000000800000003f0000003f0000003f0000003f0000003f00000000000000000000803f0000008000000080000000800000003f0000003f0000003f000000bf00000000000000bf0000000000000080000080bf00000000000000800000003f000000bf000000bf000000bf000000000000003f00000000000000800000803f0000008000000080000000bf0000003f0000003f0000003f000000bf000000bf0000000000000080000080bf0000000000000080000000bf000000bf000000bf000000bf000000bf0000000000000000000080bf000000800000008000000080000000bf000000bf000000bf0000003f000000bf0000003f00000000000080bf000000800000008000000080000000bf0000003f000000bf0000003f0000003f00000000000000000000803f0000008000000080000000800000003f0000003f0000003f000000bf0000003f000000bf0000000000000080000080bf00000000000000800000003f000000bf0000003f000000bf0000003f0000003f000000000000803f0000008000000080000000800000003f0000003f0000003f0000003f000000000000003f00000000000000800000803f0000008000000080000000bf0000003f0000003f0000003f00000000000000bf0000000000000080000080bf00000000000000800000003f000000bf000000bf000000bf000000bf0000003f00000000000000800000803f0000008000000080000000bf0000003f000000bf0000003f000000bf000000bf00000000000080bf000000800000008000000080000000bf000000bf000000bf000000bf000000bf0000000000000000000080bf000000800000008000000080000000bf000000bf000000bf0000003f
+  m_CompressedMesh:
+    m_Vertices:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_UV:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Normals:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Tangents:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Weights:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_NormalSigns:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_TangentSigns:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_FloatColors:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_BoneIndices:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Triangles:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_UVInfo: 0
+  m_LocalAABB:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0.5, y: 0.5, z: 0}
+  m_MeshUsageFlags: 0
+  m_BakedConvexCollisionMesh: 
+  m_BakedTriangleCollisionMesh: 
+  m_MeshMetrics[0]: 1
+  m_MeshMetrics[1]: 1
+  m_MeshOptimizationFlags: 1
+  m_StreamData:
+    serializedVersion: 2
+    offset: 0
+    size: 0
+    path: 
 --- !u!1 &346694932
 GameObject:
   m_ObjectHideFlags: 0
@@ -739,6 +903,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: af8dd1155cb0b45f0af7c1df1ff6fd14, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  isLoading: 0
 --- !u!4 &1188891547
 Transform:
   m_ObjectHideFlags: 0
@@ -811,170 +976,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6608f749168414cb9bc98f4ea5e24d51, type: 3}
---- !u!43 &1366204163
-Mesh:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  serializedVersion: 10
-  m_SubMeshes:
-  - serializedVersion: 2
-    firstByte: 0
-    indexCount: 42
-    topology: 0
-    baseVertex: 0
-    firstVertex: 0
-    vertexCount: 16
-    localAABB:
-      m_Center: {x: 0, y: 0, z: 0}
-      m_Extent: {x: 0.5, y: 0.5, z: 0}
-  m_Shapes:
-    vertices: []
-    shapes: []
-    channels: []
-    fullWeights: []
-  m_BindPose: []
-  m_BoneNameHashes: 
-  m_RootBoneNameHash: 0
-  m_BonesAABB: []
-  m_VariableBoneCountWeights:
-    m_Data: 
-  m_MeshCompression: 0
-  m_IsReadable: 1
-  m_KeepVertices: 1
-  m_KeepIndices: 1
-  m_IndexFormat: 0
-  m_IndexBuffer: 00000100020003000100000003000400010005000400030006000400050004000600070002000800000000000900030001000a00020004000b00010003000c00050007000d00040005000e00060006000f000700
-  m_VertexData:
-    serializedVersion: 3
-    m_VertexCount: 16
-    m_Channels:
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 3
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 12
-      format: 0
-      dimension: 4
-    - stream: 0
-      offset: 28
-      format: 0
-      dimension: 4
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    m_DataSize: 704
-    _typelessdata: 0000003f000000bf000000000000803f0000008000000080000000800000003f000000bf0000003f000000bf0000003f0000003f00000000000000800000803f00000080000000800000003f0000003f0000003f0000003f0000003f00000000000000000000803f0000008000000080000000800000003f0000003f0000003f000000bf00000000000000bf0000000000000080000080bf00000000000000800000003f000000bf000000bf000000bf000000000000003f00000000000000800000803f0000008000000080000000bf0000003f0000003f0000003f000000bf000000bf0000000000000080000080bf0000000000000080000000bf000000bf000000bf000000bf000000bf0000000000000000000080bf000000800000008000000080000000bf000000bf000000bf0000003f000000bf0000003f00000000000080bf000000800000008000000080000000bf0000003f000000bf0000003f0000003f00000000000000000000803f0000008000000080000000800000003f0000003f0000003f000000bf0000003f000000bf0000000000000080000080bf00000000000000800000003f000000bf0000003f000000bf0000003f0000003f000000000000803f0000008000000080000000800000003f0000003f0000003f0000003f000000000000003f00000000000000800000803f0000008000000080000000bf0000003f0000003f0000003f00000000000000bf0000000000000080000080bf00000000000000800000003f000000bf000000bf000000bf000000bf0000003f00000000000000800000803f0000008000000080000000bf0000003f000000bf0000003f000000bf000000bf00000000000080bf000000800000008000000080000000bf000000bf000000bf000000bf000000bf0000000000000000000080bf000000800000008000000080000000bf000000bf000000bf0000003f
-  m_CompressedMesh:
-    m_Vertices:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_UV:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Normals:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Tangents:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Weights:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_NormalSigns:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_TangentSigns:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_FloatColors:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_BoneIndices:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Triangles:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_UVInfo: 0
-  m_LocalAABB:
-    m_Center: {x: 0, y: 0, z: 0}
-    m_Extent: {x: 0.5, y: 0.5, z: 0}
-  m_MeshUsageFlags: 0
-  m_BakedConvexCollisionMesh: 
-  m_BakedTriangleCollisionMesh: 
-  m_MeshMetrics[0]: 1
-  m_MeshMetrics[1]: 1
-  m_MeshOptimizationFlags: 1
-  m_StreamData:
-    serializedVersion: 2
-    offset: 0
-    size: 0
-    path: 
 --- !u!1001 &1488833415
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1326,6 +1327,95 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 180f18d4673dfac489e26a16a65b4b79, type: 3}
+--- !u!1001 &1995924023
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 224706432803308441, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3}
+      propertyPath: m_Intensity
+      value: 0.8
+      objectReference: {fileID: 0}
+    - target: {fileID: 224706432803308441, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3}
+      propertyPath: m_OverlapOperation
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224706432803308441, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3}
+      propertyPath: m_PointLightOuterRadius
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224706432803308441, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3}
+      propertyPath: m_ApplyToSortingLayers.Array.size
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 224706432803308441, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3}
+      propertyPath: m_ApplyToSortingLayers.Array.data[2]
+      value: -1766951509
+      objectReference: {fileID: 0}
+    - target: {fileID: 224706432803308441, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3}
+      propertyPath: m_ApplyToSortingLayers.Array.data[3]
+      value: -1173912585
+      objectReference: {fileID: 0}
+    - target: {fileID: 911246595514713373, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3}
+      propertyPath: m_Name
+      value: GlowStone
+      objectReference: {fileID: 0}
+    - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3}
+      propertyPath: m_RootOrder
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -25.02
+      objectReference: {fileID: 0}
+    - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -1.78
+      objectReference: {fileID: 0}
+    - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 5.9763207
+      objectReference: {fileID: 0}
+    - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1448363533951301525, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9036080960493351390, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3}
+      propertyPath: m_SortingLayer
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 9036080960493351390, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3}
+      propertyPath: m_SortingLayerID
+      value: -1173912585
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 505155781520d4c3e898ea2ba20ab3a9, type: 3}
 --- !u!1001 &1534490255329974231
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1383,7 +1473,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1534490254952189329, guid: 02d0cdfc85b154cd983de4e60037d3ad, type: 3}
       propertyPath: m_Intensity
-      value: 0
+      value: 0.2
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 02d0cdfc85b154cd983de4e60037d3ad, type: 3}
diff --git a/Project_Blind/Assets/Scripts/Core/MonoBehaviour/PlayerCharacter.cs b/Project_Blind/Assets/Scripts/Core/MonoBehaviour/PlayerCharacter.cs
index 737f14c7..73f2ee7b 100644
--- a/Project_Blind/Assets/Scripts/Core/MonoBehaviour/PlayerCharacter.cs
+++ b/Project_Blind/Assets/Scripts/Core/MonoBehaviour/PlayerCharacter.cs
@@ -75,7 +75,7 @@ private void Awake()
             //_defaultTime = 0.2f;
             _dashCount = 1;
 
-            ResourceManager.Instance.Destroy(ResourceManager.Instance.Instantiate("WaveSense").gameObject);
+            ResourceManager.Instance.Destroy(ResourceManager.Instance.Instantiate("MapObjects/Wave/WaveSense").gameObject);
             _attack.Init(attack_x, attack_y);
             _paring.Init(paring_x, paring_y);
 
diff --git a/Project_Blind/Assets/Scripts/MapObjects/GlowStone.cs b/Project_Blind/Assets/Scripts/MapObjects/GlowStone.cs
new file mode 100644
index 00000000..a4b88eda
--- /dev/null
+++ b/Project_Blind/Assets/Scripts/MapObjects/GlowStone.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections;
+using UnityEngine;
+using UnityEngine.Rendering.Universal;
+
+namespace Blind
+{
+    [RequireComponent(typeof(Light2D))]
+    public class GlowStone : MonoBehaviour
+    {
+        [SerializeField] private AnimationCurve spreadAnimation;
+        [SerializeField] private float maxSize = 30f;
+
+        private Light2D _light2D;
+        private bool _isBright = false;
+
+        private void Awake()
+        {
+            _light2D = GetComponent<Light2D>();
+        }
+
+        /// <summary>
+        /// 테스트
+        /// </summary>
+        private void Start()
+        {
+            Bright();
+        }
+
+        /// <summary>
+        /// 이 함수 호출하면 켜집니다.
+        /// </summary>
+        public void Bright()
+        {
+            if (_isBright) return;
+            StartCoroutine(_Bright());
+            _isBright = true;
+        }
+
+        public IEnumerator _Bright()
+        {
+            var curTime = 0f;
+            var radius = 0f;
+            while (radius < maxSize)
+            {
+                curTime += Time.deltaTime;
+                radius += spreadAnimation.Evaluate(curTime) * maxSize;
+                _light2D.pointLightOuterRadius = radius;
+                yield return null;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Project_Blind/Assets/Scripts/MapObjects/GlowStone.cs.meta b/Project_Blind/Assets/Scripts/MapObjects/GlowStone.cs.meta
new file mode 100644
index 00000000..dded6fdc
--- /dev/null
+++ b/Project_Blind/Assets/Scripts/MapObjects/GlowStone.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 99d5497b6a014098837f0ec2edfe797c
+timeCreated: 1659862528
\ No newline at end of file
diff --git a/Project_Blind/Assets/Settings/Global Volume Profile.asset b/Project_Blind/Assets/Settings/Global Volume Profile.asset
index ffdd7e92..9e8e7c81 100644
--- a/Project_Blind/Assets/Settings/Global Volume Profile.asset	
+++ b/Project_Blind/Assets/Settings/Global Volume Profile.asset	
@@ -64,7 +64,7 @@ MonoBehaviour:
     m_Value: 3
   scatter:
     m_OverrideState: 0
-    m_Value: 0.853
+    m_Value: 0.878
   clamp:
     m_OverrideState: 0
     m_Value: 65472
diff --git a/Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset b/Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset
index 9899491f..257d6284 100644
--- a/Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset
+++ b/Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset
@@ -12,4 +12,4 @@ MonoBehaviour:
   m_Script: {fileID: 0}
   m_Name: 
   m_EditorClassIdentifier: Unity.Rider.Editor:Packages.Rider.Editor:RiderScriptEditorPersistedState
-  lastWriteTicks: -8585419771103438852
+  lastWriteTicks: -8585417436895168888
diff --git a/Project_Blind/ProjectSettings/TagManager.asset b/Project_Blind/ProjectSettings/TagManager.asset
index 9670489d..cee1cc2c 100644
--- a/Project_Blind/ProjectSettings/TagManager.asset
+++ b/Project_Blind/ProjectSettings/TagManager.asset
@@ -54,3 +54,6 @@ TagManager:
   - name: Secondary
     uniqueID: 3105953885
     locked: 0
+  - name: MapObjects
+    uniqueID: 3121054711
+    locked: 0