Merge branch 'item' into LifeStone

54f42ad9 · 18류지석 · 6ab5f482 · 7c257c6e · 54f42ad9 · 6ab5f482
Commit 54f42ad9 authored Jan 30, 2019 by 18류지석
68 changed files
--- a/Assets/Prefabs/Characters/Player.prefab
+++ b/Assets/Prefabs/Characters/Player.prefab
@@ -42,6 +42,8 @@ GameObject:
  m_Component:
  - component: {fileID: 4710911479571038}
  - component: {fileID: 61129044981816742}
+  - component: {fileID: 114843094057276856}
+  - component: {fileID: 60342798607647292}
  m_Layer: 0
  m_Name: AttackColider
  m_TagString: Untagged
@@ -56,7 +58,7 @@ Transform:
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1623439448163086}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 2, y: 1.8, z: 0}
+  m_LocalPosition: {x: 7.36, y: 1.08, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 4710911479571038}
@@ -96,6 +98,34 @@ Rigidbody2D:
  m_SleepingMode: 1
  m_CollisionDetection: 1
  m_Constraints: 4
+--- !u!60 &60342798607647292
+PolygonCollider2D:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1862495014651308}
+  m_Enabled: 0
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: -0.69, y: 0.7}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  m_Points:
+    m_Paths:
+    - - {x: -1.7706409, y: 1.7276601}
+      - {x: -2.1208076, y: 1.4114912}
+      - {x: 0.18838578, y: -1.1243366}
+      - {x: 0.58778536, y: -0.80901694}
 --- !u!61 &61019994424895448
 BoxCollider2D:
  m_ObjectHideFlags: 1
@@ -176,11 +206,11 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  rbGravityScale: 3
-  rbAttackGravityScale: 3
+  rbAttackGravityScale: 0.5
  maxSpeed: 3
  maxDashSpeed: 6
  accerlation: 1200
-  jumpSpeed: 11
+  jumpSpeed: 12
  ropeSpeed: 3
  doubleJumpSpeed: 10
  dashAccerlation: 2000
@@ -207,6 +237,22 @@ MonoBehaviour:
  ropeDown: 0.8
  playerState: 0
  previousState: 0
+--- !u!114 &114843094057276856
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1862495014651308}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  damage: 0
+  knockBackMultiplier: 1
+  debuffNum: 0
+  debuffType: 
+  debuffTime: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
 --- !u!114 &114880704145925944
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -218,13 +264,13 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 4ab58a64164eb984d8683df370ddce96, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  state: 0
  attackRaw:
  - 0
  - 0
  - 0
  attackKeyState: 000000000000000000000000
-  cancel: 0
+  cancelRaw: 0
+  cancelKeyState: 0
  playingSkill: 0
  comboTime: 1
  time: {fileID: 0}

--- a/Assets/Prefabs/Pickups/Addon.prefab
+++ b/Assets/Prefabs/Pickups/Addon.prefab
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 1007759869299288}
-  m_IsPrefabAsset: 1
--- !u!1 &1007759869299288
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4671478330306208}
-  - component: {fileID: 114131886443682132}
-  m_Layer: 0
-  m_Name: Addon
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &4671478330306208
-Transform:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1007759869299288}
-  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_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &114131886443682132
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1007759869299288}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 138c726404f3fd444abdec4d37ba3b85, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
--- a/Assets/Prefabs/Pickups/DroppedItem.prefab
+++ b/Assets/Prefabs/Pickups/DroppedItem.prefab
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 1930691243125776}
-  m_IsPrefabAsset: 1
--- !u!1 &1930691243125776
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4879553040286588}
-  - component: {fileID: 114583635118442760}
-  m_Layer: 0
-  m_Name: DroppedItem
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &4879553040286588
-Transform:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1930691243125776}
-  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_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &114583635118442760
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1930691243125776}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5ac27f5d1dcc7e241b8cffe2a360a604, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
--- a/Assets/Prefabs/Pickups/Frame.prefab
+++ b/Assets/Prefabs/Pickups/Frame.prefab
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 1536692734079516}
-  m_IsPrefabAsset: 1
--- !u!1 &1536692734079516
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4590347336141776}
-  - component: {fileID: 114780538278930512}
-  m_Layer: 0
-  m_Name: Frame
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &4590347336141776
-Transform:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1536692734079516}
-  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_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &114780538278930512
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1536692734079516}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8af377227dc260b4aa0846ed539ffd3c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
--- a/Assets/Prefabs/Pickups/Item.prefab
+++ b/Assets/Prefabs/Pickups/Item.prefab
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 1892097559098470}
-  m_IsPrefabAsset: 1
--- !u!1 &1892097559098470
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4694445303096730}
-  - component: {fileID: 114583774776711718}
-  m_Layer: 0
-  m_Name: Item
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &4694445303096730
-Transform:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1892097559098470}
-  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_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &114583774776711718
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1892097559098470}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9574d82cade29e6419b802dfbd1c8c64, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
--- a/Assets/Prefabs/Pickups/Item.prefab.meta
+++ b/Assets/Prefabs/Pickups/Item.prefab.meta
-fileFormatVersion: 2
-guid: 1ca84ddb657019041a7cfe19bb2885b7
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 100100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Prefabs/Pickups/LifeCrystal.prefab
+++ b/Assets/Prefabs/Pickups/LifeCrystal.prefab
--- a/Assets/Prefabs/Pickups/LifeCrystal.prefab.meta
+++ b/Assets/Prefabs/Pickups/LifeCrystal.prefab.meta
-fileFormatVersion: 2
-guid: 86dcaa3d062378746bffa7e9c773fa12
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 100100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Prefabs/Pickups/Potion.prefab
+++ b/Assets/Prefabs/Pickups/Potion.prefab
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 1919051286898630}
-  m_IsPrefabAsset: 1
--- !u!1 &1919051286898630
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4437898873928542}
-  - component: {fileID: 114034260101831288}
-  m_Layer: 0
-  m_Name: Potion
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &4437898873928542
-Transform:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1919051286898630}
-  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_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &114034260101831288
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1919051286898630}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d9fdb539a8c32be4bb032f0a7434f6a6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
--- a/Assets/Prefabs/Pickups/Potion.prefab.meta
+++ b/Assets/Prefabs/Pickups/Potion.prefab.meta
-fileFormatVersion: 2
-guid: d8bc3f2dd1b5a704e86716847680ea95
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 100100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Prefabs/UI/In-Game UI/InventoryUI/DroppedItem.prefab
+++ b/Assets/Prefabs/UI/In-Game UI/InventoryUI/DroppedItem.prefab
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1610049888013262}
+  m_IsPrefabAsset: 1
+--- !u!1 &1610049888013262
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4490692399716652}
+  - component: {fileID: 114311885383538228}
+  - component: {fileID: 50921709401281676}
+  - component: {fileID: 61781846804253628}
+  - component: {fileID: 212078234558260036}
+  m_Layer: 13
+  m_Name: DroppedItem
+  m_TagString: DroppedItem
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4490692399716652
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1610049888013262}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 203.65184, y: 44.907085, z: -0.060713544}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!50 &50921709401281676
+Rigidbody2D:
+  serializedVersion: 4
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1610049888013262}
+  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: 0}
+  m_Interpolate: 0
+  m_SleepingMode: 1
+  m_CollisionDetection: 0
+  m_Constraints: 4
+--- !u!61 &61781846804253628
+BoxCollider2D:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1610049888013262}
+  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_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1}
+  m_EdgeRadius: 0
+--- !u!114 &114311885383538228
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1610049888013262}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f734cf02cf882904b9735e036ad7fbda, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  itemAddon: 0
+--- !u!212 &212078234558260036
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1610049888013262}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 4294967295
+  m_Materials:
+  - {fileID: 10754, 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_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 2145601713
+  m_SortingLayer: 9
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 0
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
--- a/Assets/Prefabs/Pickups/DroppedItem.prefab.meta
+++ b/Assets/Prefabs/Pickups/DroppedItem.prefab.meta
 fileFormatVersion: 2
-guid: 4a28c3bf4e32d654facd1cc72d68c10b
+guid: ee63f05b79e18ce4bad2c226aa70a28e
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 100100000

--- a/Assets/Prefabs/UI/In-Game UI/InventoryUI/InventoryCanvas.prefab
+++ b/Assets/Prefabs/UI/In-Game UI/InventoryUI/InventoryCanvas.prefab
@@ -96,6 +96,23 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
+--- !u!1 &1116763136920546
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 224783930886652934}
+  - component: {fileID: 222587352594232280}
+  - component: {fileID: 114109717102223206}
+  m_Layer: 5
+  m_Name: DiscardBin
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1125633288512872
 GameObject:
  m_ObjectHideFlags: 1
@@ -767,6 +784,33 @@ MonoBehaviour:
  m_FillAmount: 1
  m_FillClockwise: 1
  m_FillOrigin: 0
+--- !u!114 &114109717102223206
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1116763136920546}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114133791479992866
 MonoBehaviour:
  m_ObjectHideFlags: 1
@@ -1859,6 +1903,13 @@ CanvasRenderer:
  m_PrefabInternal: {fileID: 100100000}
  m_GameObject: {fileID: 1022188909521056}
  m_CullTransparentMesh: 0
+--- !u!222 &222587352594232280
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1116763136920546}
+  m_CullTransparentMesh: 0
 --- !u!222 &222589230925798118
 CanvasRenderer:
  m_ObjectHideFlags: 1
@@ -2052,14 +2103,14 @@ Canvas:
  m_RenderMode: 0
  m_Camera: {fileID: 0}
  m_PlaneDistance: 100
-  m_PixelPerfect: 0
+  m_PixelPerfect: 1
  m_ReceivesEvents: 1
  m_OverrideSorting: 0
  m_OverridePixelPerfect: 0
  m_SortingBucketNormalizedSize: 0
  m_AdditionalShaderChannelsFlag: 0
  m_SortingLayerID: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
  m_TargetDisplay: 0
 --- !u!224 &224015295540900420
 RectTransform:
@@ -2136,7 +2187,7 @@ RectTransform:
  - {fileID: 224665192724407964}
  - {fileID: 224953692463680048}
  m_Father: {fileID: 224158395360498114}
-  m_RootOrder: 2
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2190,6 +2241,7 @@ RectTransform:
  m_LocalScale: {x: 0, y: 0, z: 0}
  m_Children:
  - {fileID: 224757229482181608}
+  - {fileID: 224783930886652934}
  - {fileID: 224951897679109524}
  - {fileID: 224137214707512560}
  - {fileID: 224829341147747562}
@@ -2664,6 +2716,24 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 1920, y: 1080}
  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224783930886652934
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1116763136920546}
+  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_Children: []
+  m_Father: {fileID: 224158395360498114}
+  m_RootOrder: 1
+  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: -300, y: -200}
+  m_SizeDelta: {x: 249.09, y: 130}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224829341147747562
 RectTransform:
  m_ObjectHideFlags: 1
@@ -2676,7 +2746,7 @@ RectTransform:
  m_Children:
  - {fileID: 224358157952434602}
  m_Father: {fileID: 224158395360498114}
-  m_RootOrder: 3
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2757,7 +2827,7 @@ RectTransform:
  - {fileID: 224299749906297540}
  - {fileID: 224542162195928868}
  m_Father: {fileID: 224158395360498114}
-  m_RootOrder: 1
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}

--- a/Assets/Prefabs/UI/In-Game UI/LifeStoneUI/DroppedLifeUnitPrefab.prefab
+++ b/Assets/Prefabs/UI/In-Game UI/LifeStoneUI/DroppedLifeUnitPrefab.prefab
@@ -24,7 +24,7 @@ GameObject:
  - component: {fileID: 114071444104977984}
  m_Layer: 13
  m_Name: DroppedLifeUnitPrefab
-  m_TagString: Untagged
+  m_TagString: DroppedLifeStone
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0

--- a/Assets/Resources/Animations/baculusAttack1.anim
+++ b/Assets/Resources/Animations/baculusAttack1.anim
--- a/Assets/Prefabs/Pickups/Addon.prefab.meta
+++ b/Assets/Prefabs/Pickups/Addon.prefab.meta
 fileFormatVersion: 2
-guid: 1ccb31a1ed695bb4ba0f4cb27dc7ecea
+guid: e27c281d8654edd4cafc9f13a3ba66e1
 NativeFormatImporter:
  externalObjects: {}
-  mainObjectFileID: 100100000
+  mainObjectFileID: 7400000
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Resources/Animations/baculusAttack2.anim
+++ b/Assets/Resources/Animations/baculusAttack2.anim
--- a/Assets/Prefabs/Pickups/Frame.prefab.meta
+++ b/Assets/Prefabs/Pickups/Frame.prefab.meta
 fileFormatVersion: 2
-guid: 0222e2d8b56397143aea40e4c1d2f7df
+guid: 29871aae4dbd84748b9055e34dad3edb
 NativeFormatImporter:
  externalObjects: {}
-  mainObjectFileID: 100100000
+  mainObjectFileID: 7400000
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Resources/Animations/bambooSpearAttack1.anim
+++ b/Assets/Resources/Animations/bambooSpearAttack1.anim
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: bambooSpearAttack1
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings: []
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_Events: []
--- a/Assets/Resources/Animations/bambooSpearAttack1.anim.meta
+++ b/Assets/Resources/Animations/bambooSpearAttack1.anim.meta
+fileFormatVersion: 2
+guid: 7967933e24c73084d81d45276e72ccbd
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Animations/bambooSpearAttack2.anim
+++ b/Assets/Resources/Animations/bambooSpearAttack2.anim
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: bambooSpearAttack2
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings: []
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_Events: []
--- a/Assets/Resources/Animations/bambooSpearAttack2.anim.meta
+++ b/Assets/Resources/Animations/bambooSpearAttack2.anim.meta
+fileFormatVersion: 2
+guid: c8ea54bd9175e1d4b940aea56b66b35d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Animations/normalAttackA.anim
+++ b/Assets/Resources/Animations/normalAttackA.anim
@@ -5,7 +5,7 @@ AnimationClip:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
-  m_Name: normalAttackA
+  m_Name: bowAttack1
  serializedVersion: 6
  m_Legacy: 0
  m_Compressed: 0
@@ -30,7 +30,7 @@ AnimationClip:
        outWeight: 0
      - serializedVersion: 3
        time: 0.3
-        value: 1
+        value: 0
        inSlope: Infinity
        outSlope: Infinity
        tangentMode: 103
@@ -65,24 +65,6 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.3
-        value: -0.51
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 34
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.31666666
-        value: -0.51
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 34
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@@ -102,24 +84,6 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.3
-        value: -0.08
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.31666666
-        value: -0.08
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@@ -139,24 +103,6 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.3
-        value: 0.53
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.31666666
-        value: 0.53
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@@ -176,24 +122,6 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.3
-        value: 0.94
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.31666666
-        value: 0.94
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@@ -215,7 +143,7 @@ AnimationClip:
        outWeight: 0.33333334
      - serializedVersion: 3
        time: 0.3
-        value: 1
+        value: 0
        inSlope: 0
        outSlope: 0
        tangentMode: 136
@@ -253,6 +181,8 @@ AnimationClip:
      value: {fileID: 21300000, guid: b9bcefb5c62dfd24c874250ffb5738d8, type: 3}
    - time: 0.5
      value: {fileID: 21300000, guid: 62778b549ef5f9a4fb107af8ee317345, type: 3}
+    - time: 0.75
+      value: {fileID: 21300000, guid: 62778b549ef5f9a4fb107af8ee317345, type: 3}
    attribute: m_Sprite
    path: 
    classID: 212
@@ -271,13 +201,6 @@ AnimationClip:
      typeID: 61
      customType: 0
      isPPtrCurve: 0
-    - serializedVersion: 2
-      path: 2942363444
-      attribute: 298341484
-      script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
-      typeID: 114
-      customType: 0
-      isPPtrCurve: 0
    - serializedVersion: 2
      path: 0
      attribute: 0
@@ -313,6 +236,13 @@ AnimationClip:
      typeID: 61
      customType: 0
      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2942363444
+      attribute: 298341484
+      script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
+      typeID: 114
+      customType: 0
+      isPPtrCurve: 0
    pptrCurveMapping:
    - {fileID: 21300000, guid: e1dd1516b9bacd34bb6806f547147d47, type: 3}
    - {fileID: 21300000, guid: e1dd1516b9bacd34bb6806f547147d47, type: 3}
@@ -325,12 +255,13 @@ AnimationClip:
    - {fileID: 21300000, guid: 0527e9dd1805ac943be4ba0b09f47ea4, type: 3}
    - {fileID: 21300000, guid: b9bcefb5c62dfd24c874250ffb5738d8, type: 3}
    - {fileID: 21300000, guid: 62778b549ef5f9a4fb107af8ee317345, type: 3}
+    - {fileID: 21300000, guid: 62778b549ef5f9a4fb107af8ee317345, type: 3}
  m_AnimationClipSettings:
    serializedVersion: 2
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 0.51666665
+    m_StopTime: 0.76666665
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
@@ -360,7 +291,7 @@ AnimationClip:
        outWeight: 0
      - serializedVersion: 3
        time: 0.3
-        value: 1
+        value: 0
        inSlope: Infinity
        outSlope: Infinity
        tangentMode: 103
@@ -395,24 +326,6 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.3
-        value: -0.51
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 34
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.31666666
-        value: -0.51
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 34
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@@ -432,24 +345,6 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.3
-        value: -0.08
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.31666666
-        value: -0.08
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@@ -469,24 +364,6 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.3
-        value: 0.53
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.31666666
-        value: 0.53
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@@ -506,24 +383,6 @@ AnimationClip:
        weightedMode: 0
        inWeight: 0.33333334
        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.3
-        value: 0.94
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.31666666
-        value: 0.94
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 136
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@@ -545,7 +404,7 @@ AnimationClip:
        outWeight: 0.33333334
      - serializedVersion: 3
        time: 0.3
-        value: 1
+        value: 0
        inSlope: 0
        outSlope: 0
        tangentMode: 136

--- a/Assets/Resources/Animations/normalAttackA.anim.meta
+++ b/Assets/Resources/Animations/normalAttackA.anim.meta
--- a/Assets/Resources/Animations/bowAttack2.anim
+++ b/Assets/Resources/Animations/bowAttack2.anim
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: bowAttack2
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.3
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.31666666
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Enabled
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.3
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: damage
+    path: AttackColider
+    classID: 114
+    script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.42
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Offset.x
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Offset.y
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.53
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Size.x
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Size.y
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 21300000, guid: 62778b549ef5f9a4fb107af8ee317345, type: 3}
+    - time: 0.3
+      value: {fileID: 21300000, guid: 0527e9dd1805ac943be4ba0b09f47ea4, type: 3}
+    - time: 0.31666666
+      value: {fileID: 21300000, guid: 0615a491335c9854680ea778373c616d, type: 3}
+    - time: 0.75
+      value: {fileID: 21300000, guid: 8847489d583bbfd4aabb8a96eead68b1, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 2942363444
+      attribute: 3305885265
+      script: {fileID: 0}
+      typeID: 61
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    - serializedVersion: 2
+      path: 2942363444
+      attribute: 298341484
+      script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
+      typeID: 114
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2942363444
+      attribute: 413499720
+      script: {fileID: 0}
+      typeID: 61
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2942363444
+      attribute: 1872933342
+      script: {fileID: 0}
+      typeID: 61
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2942363444
+      attribute: 4197328169
+      script: {fileID: 0}
+      typeID: 61
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2942363444
+      attribute: 2368279999
+      script: {fileID: 0}
+      typeID: 61
+      customType: 0
+      isPPtrCurve: 0
+    pptrCurveMapping:
+    - {fileID: 21300000, guid: 62778b549ef5f9a4fb107af8ee317345, type: 3}
+    - {fileID: 21300000, guid: 0527e9dd1805ac943be4ba0b09f47ea4, type: 3}
+    - {fileID: 21300000, guid: 0615a491335c9854680ea778373c616d, type: 3}
+    - {fileID: 21300000, guid: 8847489d583bbfd4aabb8a96eead68b1, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.76666665
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.3
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.31666666
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Enabled
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.3
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: damage
+    path: AttackColider
+    classID: 114
+    script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.42
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Offset.x
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Offset.y
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.53
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Size.x
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Size.y
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_Events: []
--- a/Assets/Resources/Animations/bowAttack2.anim.meta
+++ b/Assets/Resources/Animations/bowAttack2.anim.meta
+fileFormatVersion: 2
+guid: 69bfec01519352f4bb1098bb45650355
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Animations/chainSickleAttack1.anim
+++ b/Assets/Resources/Animations/chainSickleAttack1.anim
--- a/Assets/Resources/Animations/chainSickleAttack1.anim.meta
+++ b/Assets/Resources/Animations/chainSickleAttack1.anim.meta
+fileFormatVersion: 2
+guid: 6e1d28c37f5db4345815e9fa2c2857b5
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Animations/chainSickleAttack2.anim
+++ b/Assets/Resources/Animations/chainSickleAttack2.anim
--- a/Assets/Resources/Animations/chainSickleAttack2.anim.meta
+++ b/Assets/Resources/Animations/chainSickleAttack2.anim.meta
+fileFormatVersion: 2
+guid: 0cb0e3afd3a86964a859efa7ec20f67c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Animations/explosionGlovesAttack1.anim
+++ b/Assets/Resources/Animations/explosionGlovesAttack1.anim
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: explosionGlovesAttack1
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings: []
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_Events: []
--- a/Assets/Resources/Animations/explosionGlovesAttack1.anim.meta
+++ b/Assets/Resources/Animations/explosionGlovesAttack1.anim.meta
+fileFormatVersion: 2
+guid: f0e3b19ee969d4f429ee9d8430bb4a58
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Animations/explosionGlovesAttack2.anim
+++ b/Assets/Resources/Animations/explosionGlovesAttack2.anim
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: explosionGlovesAttack2
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings: []
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_Events: []
--- a/Assets/Resources/Animations/explosionGlovesAttack2.anim.meta
+++ b/Assets/Resources/Animations/explosionGlovesAttack2.anim.meta
+fileFormatVersion: 2
+guid: 8577ae016a412764684fcba81af639cb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Animations/frostShieldAttack1.anim
+++ b/Assets/Resources/Animations/frostShieldAttack1.anim
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: frostShieldAttack1
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 30
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings: []
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_Events: []
--- a/Assets/Resources/Animations/frostShieldAttack1.anim.meta
+++ b/Assets/Resources/Animations/frostShieldAttack1.anim.meta
+fileFormatVersion: 2
+guid: be0ea45f3f5c1d647bfc1f3bfa2e7b3e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Animations/ksanifeAttack1.anim
+++ b/Assets/Resources/Animations/ksanifeAttack1.anim
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: ksanifeAttack1
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings: []
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_Events: []
--- a/Assets/Resources/Animations/ksanifeAttack1.anim.meta
+++ b/Assets/Resources/Animations/ksanifeAttack1.anim.meta
+fileFormatVersion: 2
+guid: 0a9aec1eb8d4de04ebc2b72d13977229
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Animations/ksanifeAttack2.anim
+++ b/Assets/Resources/Animations/ksanifeAttack2.anim
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: ksanifeAttack2
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings: []
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_Events: []
--- a/Assets/Resources/Animations/ksanifeAttack2.anim.meta
+++ b/Assets/Resources/Animations/ksanifeAttack2.anim.meta
+fileFormatVersion: 2
+guid: 6d456ce162612d84d97563b0d6c36db5
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Animations/meteorSwordAttack1.anim
+++ b/Assets/Resources/Animations/meteorSwordAttack1.anim
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: meteorSwordAttack1
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings: []
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_Events: []
--- a/Assets/Resources/Animations/meteorSwordAttack1.anim.meta
+++ b/Assets/Resources/Animations/meteorSwordAttack1.anim.meta
+fileFormatVersion: 2
+guid: fb54a2d7c435b1341970ae6e62c5562e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Animations/meteorSwordAttack2.anim
+++ b/Assets/Resources/Animations/meteorSwordAttack2.anim
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: meteorSwordAttack2
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings: []
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_Events: []
--- a/Assets/Resources/Animations/meteorSwordAttack2.anim.meta
+++ b/Assets/Resources/Animations/meteorSwordAttack2.anim.meta
+fileFormatVersion: 2
+guid: e2cd638927de2f348ade4a23a15ebd97
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Animations/morgensternAttack1.anim
+++ b/Assets/Resources/Animations/morgensternAttack1.anim
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: morgensternAttack1
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Enabled
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.42
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Offset.x
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Offset.y
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.53
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Size.x
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Size.y
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 20
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: damage
+    path: AttackColider
+    classID: 114
+    script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 21300000, guid: bae70a52c1619cd478cb9d32f0cb7083, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 2942363444
+      attribute: 3305885265
+      script: {fileID: 0}
+      typeID: 61
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    - serializedVersion: 2
+      path: 2942363444
+      attribute: 413499720
+      script: {fileID: 0}
+      typeID: 61
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2942363444
+      attribute: 1872933342
+      script: {fileID: 0}
+      typeID: 61
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2942363444
+      attribute: 4197328169
+      script: {fileID: 0}
+      typeID: 61
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2942363444
+      attribute: 2368279999
+      script: {fileID: 0}
+      typeID: 61
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2942363444
+      attribute: 298341484
+      script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
+      typeID: 114
+      customType: 0
+      isPPtrCurve: 0
+    pptrCurveMapping:
+    - {fileID: 21300000, guid: bae70a52c1619cd478cb9d32f0cb7083, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.016666668
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Enabled
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.42
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Offset.x
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Offset.y
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.53
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Size.x
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Size.y
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 20
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: damage
+    path: AttackColider
+    classID: 114
+    script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_Events: []
--- a/Assets/Resources/Animations/morgensternAttack1.anim.meta
+++ b/Assets/Resources/Animations/morgensternAttack1.anim.meta
+fileFormatVersion: 2
+guid: 97dd0032ba365894a9c8673da013350e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Animations/morgensternAttack2.anim
+++ b/Assets/Resources/Animations/morgensternAttack2.anim
--- a/Assets/Resources/Animations/morgensternAttack2.anim.meta
+++ b/Assets/Resources/Animations/morgensternAttack2.anim.meta
+fileFormatVersion: 2
+guid: ba1d4aab4b6992e4d99eaa96e60f8c09
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/PlayScene.unity
+++ b/Assets/Scenes/PlayScene.unity
@@ -267,11 +267,6 @@ Prefab:
  m_Modification:
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
-        type: 2}
-      propertyPath: m_RootOrder
-      value: 12
-      objectReference: {fileID: 0}
    - target: {fileID: 224158395360498114, guid: 7c6db9a9ca4150a438bd5114c58a37cf,
        type: 2}
      propertyPath: m_LocalPosition.x
@@ -364,7 +359,7 @@ Prefab:
      objectReference: {fileID: 0}
    - target: {fileID: 1560605499280558, guid: 7c6db9a9ca4150a438bd5114c58a37cf, type: 2}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 7c6db9a9ca4150a438bd5114c58a37cf, type: 2}
@@ -828,6 +823,12 @@ Prefab:
      propertyPath: m_RootOrder
      value: 11
      objectReference: {fileID: 0}
+    - target: {fileID: 114939219159237616, guid: 62a83d11a7addc342ad436145784e698,
+        type: 2}
+      propertyPath: droppedPrefab
+      value: 
+      objectReference: {fileID: 1610049888013262, guid: ee63f05b79e18ce4bad2c226aa70a28e,
+        type: 2}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 62a83d11a7addc342ad436145784e698, type: 2}
  m_IsPrefabAsset: 0
@@ -1021,38 +1022,12 @@ Prefab:
      objectReference: {fileID: 1908917313}
    - target: {fileID: 114294925164316638, guid: 3d077a5f727dd1e4780e9265ed26e036,
        type: 2}
-      propertyPath: rbAttackGravityScale
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 61129044981816742, guid: 3d077a5f727dd1e4780e9265ed26e036,
-        type: 2}
-      propertyPath: m_Enabled
-      value: 0
+      propertyPath: itemLayer.m_Bits
+      value: 8192
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 3d077a5f727dd1e4780e9265ed26e036, type: 2}
  m_IsPrefabAsset: 0
--- !u!1 &1618052741 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1862495014651308, guid: 3d077a5f727dd1e4780e9265ed26e036,
-    type: 2}
-  m_PrefabInternal: {fileID: 1618052740}
--- !u!114 &1618052742
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1618052741}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  damage: 0
-  knockBackMultiplier: 1
-  debuffNum: 0
-  debuffType: 
-  debuffTime: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
 --- !u!1001 &1708140758
 Prefab:
  m_ObjectHideFlags: 0

--- a/Assets/Scripts/Characters/PlayerController.cs
+++ b/Assets/Scripts/Characters/PlayerController.cs
@@ -53,13 +53,18 @@ public class PlayerController : MonoBehaviour
    [SerializeField]
    private LayerMask outerwallLayer;
    [SerializeField]
+    private LayerMask itemLayer;
+    [SerializeField]
    private float ropeDistance = 0.3f;
    [SerializeField]
    private float rayDistance;
    [SerializeField]
    private float ropeUp, ropeDown;
-
-    
+    [SerializeField]
+    private DroppedItem lastDropItem;
+    private DroppedLifeStone lastLifeStone;
+    private float interaction;
+    private bool interactionCoolDown=true;
    public PlayerState playerState, previousState;
    
    void Start()
@@ -73,7 +78,7 @@ public class PlayerController : MonoBehaviour
        horizontal = Input.GetAxis("Horizontal");
        horizontalRaw = Input.GetAxisRaw("Horizontal");
        verticalRaw = Input.GetAxisRaw("Vertical");
-
+        interaction = Input.GetAxisRaw("interaction");
        if (Input.GetButtonDown("Jump"))
        {
            jump = true;
@@ -91,6 +96,23 @@ public class PlayerController : MonoBehaviour
                rb.gravityScale = rbAttackGravityScale;
                return;
            }
+            if (GetItemRay() == false && lastDropItem!=null)
+            {
+                lastDropItem.HighlightSwitch(false);
+                lastDropItem = null;
+            }
+            if (interaction != 1f) interactionCoolDown = true;
+            if (lastDropItem!=null && interaction == 1f &&interactionCoolDown)
+            {
+                interactionCoolDown = false;
+                print(lastDropItem.PushItem()+"냠냠");
+            }
+            if(lastLifeStone!=null && interaction == 1f && interactionCoolDown)
+            {
+                interactionCoolDown = false;
+                lastLifeStone.ApplyLifeStone();
+                   print("생명석 냠냠");
+            }

            if (isGrounded)
                isJumpable = true;
@@ -244,6 +266,76 @@ public class PlayerController : MonoBehaviour
        return (hit1.collider != null || hit2.collider != null || hit3.collider != null|| 
            hit4.collider != null || hit5.collider != null || hit6.collider != null) && rb.velocity.y == 0;//플랫폼 점프 버그 방지
    }
+
+    bool GetItemRay()
+    {
+        RaycastHit2D hit1 = Physics2D.Raycast(transform.position + new Vector3(Player.X / 2f *0f, 0, 0), Vector2.down, rayDistance, itemLayer);
+       // RaycastHit2D hit2 = Physics2D.Raycast(transform.position - new Vector3(Player.X / 2f, 0, 0), Vector2.down, rayDistance, itemLayer);
+        Debug.DrawRay(transform.position + new Vector3(Player.X / 2f*0f, 0, 0), rayDistance * Vector2.down, Color.white);
+        if (hit1.collider != null)
+        {
+            DroppedItem temp = hit1.collider.GetComponent<DroppedItem>();
+            DroppedLifeStone stoneTemp;
+            if (temp == null)
+            {
+                stoneTemp = hit1.collider.GetComponent<DroppedLifeStone>();
+                if (lastLifeStone!= stoneTemp)
+                {
+                    if (lastLifeStone != null)
+                    {
+                        lastLifeStone.HighlightSwitch(false);
+
+                    }
+                    lastLifeStone = stoneTemp;
+                    stoneTemp.HighlightSwitch(true);
+                }
+
+            }
+           else if (lastDropItem != temp)
+            {
+                if (lastDropItem != null)
+                {
+                    lastDropItem.HighlightSwitch(false);
+
+                }
+                lastDropItem = temp;
+                temp.HighlightSwitch(true);
+            }
+            
+        }
+        /*else if(hit2.collider != null)
+        {
+            DroppedItem temp = hit2.collider.GetComponent<DroppedItem>();
+            DroppedLifeStone stoneTemp;
+            if (temp == null)
+            {
+                stoneTemp = hit2.collider.GetComponent<DroppedLifeStone>();
+                if (lastLifeStone != stoneTemp)
+                {
+                    if (lastLifeStone != null)
+                    {
+                        lastLifeStone.HighlightSwitch(false);
+
+                    }
+                    lastLifeStone = stoneTemp;
+                    stoneTemp.HighlightSwitch(true);
+                }
+
+            }
+            else if (lastDropItem != temp)
+            {
+                if (lastDropItem != null)
+                {
+                    lastDropItem.HighlightSwitch(false);
+                    
+                }
+                lastDropItem = temp;
+                temp.HighlightSwitch(true);
+
+            }
+        }*/
+        return hit1.collider != null  ;
+    }
    bool IsInRope()   // Is player in rope?
    {
        RaycastHit2D hit1 = Physics2D.Raycast(transform.position + ropeUp * Vector3.up, Vector2.right, ropeDistance, ropeLayer);

--- a/Assets/Scripts/Item/AddonDrag.cs
+++ b/Assets/Scripts/Item/AddonDrag.cs
@@ -8,10 +8,13 @@ public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDra
    public int num;
    InventoryUI ui;
    InventoryManager manager;
+    Transform addonGroup, discardBin;
    void Start()
    {
        ui = GameObject.Find("InventoryCanvas").GetComponent<InventoryUI>();
        manager = GameObject.Find("InventoryManager").GetComponent<InventoryManager>();
+        addonGroup = ui.gameObject.transform.Find("AddonGroup");
+        discardBin = ui.gameObject.transform.Find("DiscardBin");
    }
    public void OnBeginDrag(PointerEventData eventData)
    {
@@ -25,11 +28,19 @@ public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDra

    public void OnEndDrag(PointerEventData eventData)
    {
-        
+        if (CheckBetween(Input.mousePosition, discardBin.position, discardBin.GetComponent<RectTransform>().sizeDelta))
+        {
+            if (num < 9)
+                manager.DiscardAddon(num);
+            else
+                manager.DiscardAddon(ui.selectedItem, (AddonType)(num - 9));
+            manager.SetOnPosition();
+            return;
+        }
        if (num < 9)
        {
            int type = (int)manager.addonList[num].type;
-            if (manager.itemList[ui.selectedItem].attachable[type])
+            if (ui.selectedItem != -1 && manager.itemList[ui.selectedItem].attachable[type])
            {
                if (CheckBetween(Input.mousePosition, ui.infoAddonsFrame[type].transform.position, ui.infoAddonsFrame[type].GetComponent<RectTransform>().sizeDelta))
                {
@@ -40,7 +51,7 @@ public class AddonDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDra
        }
        else
        {
-            if (CheckBetween(Input.mousePosition, ui.gameObject.transform.Find("AddonGroup").position, ui.gameObject.transform.Find("AddonGroup").GetComponent<RectTransform>().sizeDelta))
+            if (CheckBetween(Input.mousePosition, addonGroup.position, addonGroup.GetComponent<RectTransform>().sizeDelta))
                manager.DetachAddon(ui.selectedItem, (AddonType)(num - 9));
        }
        manager.SetOnPosition();

--- a/Assets/Scripts/Item/DroppedItem.cs
+++ b/Assets/Scripts/Item/DroppedItem.cs
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class DroppedItem : MonoBehaviour
+{
+    InventoryManager inventoryManager;
+    public bool itemAddon; //false: item true: addon
+    public Item item;
+    public Addon addon;
+    float itemSizeMultiplier = 0.0077f;
+    Rigidbody2D rb2D;
+    BoxCollider2D bc2D;
+    SpriteRenderer sprt;
+    public void Init(Item _item, Vector3 pos)
+    {
+        inventoryManager = GameObject.Find("InventoryManager").GetComponent<InventoryManager>();
+        item = _item;
+        itemAddon = false;
+        rb2D = GetComponent<Rigidbody2D>();
+        bc2D = GetComponent<BoxCollider2D>();
+        sprt = GetComponent<SpriteRenderer>();
+
+        transform.position = pos;
+        sprt.sprite = item.sprite;
+        bc2D.size = sprt.size;
+        transform.localScale = new Vector3((item.sizeInventory.x * itemSizeMultiplier) / sprt.size.x, (item.sizeInventory.y * itemSizeMultiplier) / sprt.size.y, 1);
+        
+    }
+    public void Init(Addon _addon, Vector3 pos)
+    {
+        inventoryManager = GameObject.Find("InventoryManager").GetComponent<InventoryManager>();
+        addon = _addon;
+        itemAddon = true;
+        rb2D = GetComponent<Rigidbody2D>();
+        bc2D = GetComponent<BoxCollider2D>();
+        sprt = GetComponent<SpriteRenderer>();
+
+        transform.position = pos;
+        sprt.sprite = addon.sprite;
+        sprt.size = addon.sizeInventory / 100f;
+        bc2D.size = sprt.size;
+        transform.localScale = new Vector3((addon.sizeInventory.x * itemSizeMultiplier) / sprt.size.x, (addon.sizeInventory.y * itemSizeMultiplier) / sprt.size.y, 1);
+    }
+    public bool PushItem()
+    {
+        if (!itemAddon && inventoryManager.PushItem(item))
+        {
+            Destroy(gameObject);
+            return true;
+        }
+        else if (itemAddon && inventoryManager.PushAddon(addon))
+        {
+            Destroy(gameObject);
+            return true;
+        }
+        return false;
+    }
+    public void HighlightSwitch(bool enabled)
+    {
+        if (itemAddon) Debug.Log(addon.name + (enabled ? "on" : "off"));
+        else Debug.Log(item.name + (enabled ? "on" : "off"));
+    }
+}
--- a/Assets/Prefabs/Pickups.meta
+++ b/Assets/Prefabs/Pickups.meta
 fileFormatVersion: 2
-guid: c79d1b9e77ee763459cf72b866a00367
-folderAsset: yes
-DefaultImporter:
+guid: f734cf02cf882904b9735e036ad7fbda
+MonoImporter:
  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/Scripts/Item/InventoryManager.cs
+++ b/Assets/Scripts/Item/InventoryManager.cs
--- a/Assets/Scripts/Item/InventoryUI.cs
+++ b/Assets/Scripts/Item/InventoryUI.cs
--- a/Assets/Scripts/Item/ItemDrag.cs
+++ b/Assets/Scripts/Item/ItemDrag.cs
--- a/Assets/Scripts/Item/Items/Baculus.cs
+++ b/Assets/Scripts/Item/Items/Baculus.cs
--- a/Assets/Scripts/Item/Items/BambooSpear.cs
+++ b/Assets/Scripts/Item/Items/BambooSpear.cs
--- a/Assets/Scripts/Item/Items/Bow.cs
+++ b/Assets/Scripts/Item/Items/Bow.cs
--- a/Assets/Scripts/Item/Items/ChainSickle.cs
+++ b/Assets/Scripts/Item/Items/ChainSickle.cs
--- a/Assets/Scripts/Item/Items/ExplosionGloves.cs
+++ b/Assets/Scripts/Item/Items/ExplosionGloves.cs
--- a/Assets/Scripts/Item/Items/FrostShield.cs
+++ b/Assets/Scripts/Item/Items/FrostShield.cs
--- a/Assets/Scripts/Item/Items/Ksanife.cs
+++ b/Assets/Scripts/Item/Items/Ksanife.cs
--- a/Assets/Scripts/Item/Items/MeteorSword.cs
+++ b/Assets/Scripts/Item/Items/MeteorSword.cs
--- a/Assets/Scripts/Item/Items/Morgenstern.cs
+++ b/Assets/Scripts/Item/Items/Morgenstern.cs
--- a/ProjectSettings/InputManager.asset
+++ b/ProjectSettings/InputManager.asset
--- a/ProjectSettings/Physics2DSettings.asset
+++ b/ProjectSettings/Physics2DSettings.asset
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset