Merge remote-tracking branch 'origin/droppedItem' into item

# Conflicts:
#	Assets/Prefabs/Characters/Player.prefab
#	Assets/Scripts/Item/InventoryManager.cs

Assets/Prefabs/Characters/Player.prefab

@@ -210,7 +210,7 @@ MonoBehaviour:
   maxSpeed: 3
   maxDashSpeed: 6
   accerlation: 1200
-  jumpSpeed: 11
+  jumpSpeed: 12
   ropeSpeed: 3
   doubleJumpSpeed: 10
   dashAccerlation: 2000

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: 

Assets/Prefabs/Pickups/Addon.prefab.meta

-fileFormatVersion: 2
-guid: 1ccb31a1ed695bb4ba0f4cb27dc7ecea
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 100100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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: 

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: 

Assets/Prefabs/Pickups/Frame.prefab.meta

-fileFormatVersion: 2
-guid: 0222e2d8b56397143aea40e4c1d2f7df
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 100100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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: 

Assets/Prefabs/Pickups/Item.prefab.meta

-fileFormatVersion: 2
-guid: 1ca84ddb657019041a7cfe19bb2885b7
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 100100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Prefabs/Pickups/LifeCrystal.prefab.meta

-fileFormatVersion: 2
-guid: 86dcaa3d062378746bffa7e9c773fa12
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 100100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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: 

Assets/Prefabs/Pickups/Potion.prefab.meta

-fileFormatVersion: 2
-guid: d8bc3f2dd1b5a704e86716847680ea95
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 100100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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: 0
+--- !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

Assets/Prefabs/Pickups/DroppedItem.prefab.meta → Assets/Prefabs/UI/In-Game UI/InventoryUI/DroppedItem.prefab.meta

 fileFormatVersion: 2
-guid: 4a28c3bf4e32d654facd1cc72d68c10b
+guid: ee63f05b79e18ce4bad2c226aa70a28e
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 100100000

Assets/Prefabs/UI/In-Game UI/InventoryUI/InventoryCanvas.prefab

@@ -2103,7 +2103,7 @@ 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

Assets/Prefabs/UI/In-Game UI/LifeCrystalUI/DroppedLifeUnitPrefab.prefab → 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

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
@@ -1019,40 +1020,9 @@ Prefab:
       propertyPath: inventoryManager
       value: 
       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
-      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

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"));
+    }
+}

Assets/Prefabs/Pickups.meta → Assets/Scripts/Item/DroppedItem.cs.meta

 fileFormatVersion: 2
-guid: c79d1b9e77ee763459cf72b866a00367
-folderAsset: yes
-DefaultImporter:
+guid: f734cf02cf882904b9735e036ad7fbda
+MonoImporter:
   externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Scripts/Item/InventoryManager.cs

@@ -9,6 +9,7 @@ public class InventoryManager : MonoBehaviour {
     InventoryUI ui;
     public List<string> itemPool = new List<string>();
     public List<string> addonPool = new List<string>();
+    public GameObject droppedPrefab;
 
     private void Start()
     {
@@ -16,13 +17,16 @@ public class InventoryManager : MonoBehaviour {
         //GameObject.Find("InventoryCanvas").SetActive(false);
 
         //itemPool
-        itemPool.Add("Bow");
+        itemPool.Add("Baculus");
         itemPool.Add("BambooSpear");
-        itemPool.Add("Ksanife");
+        itemPool.Add("Bow");
+        itemPool.Add("ChainSickle");
+        itemPool.Add("Festo");
 
         //addonPool
         addonPool.Add("ApprenticesMark");
         addonPool.Add("ParchmentPiece");
+        addonPool.Add("GlowingHerb");
 
         StartCoroutine("TestCoroutine");
     }
@@ -32,10 +36,19 @@ public class InventoryManager : MonoBehaviour {
         yield return null;
         PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[0])));
         PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[2])));
-        PushAddon((Addon)System.Activator.CreateInstance(System.Type.GetType(addonPool[0])));
-        PushAddon((Addon)System.Activator.CreateInstance(System.Type.GetType(addonPool[1])));
-        /*yield return new WaitForSeconds(1f);
-        ItemSelect(0);
+        yield return new WaitForSeconds(1.5f);
+        ItemInstantiate(itemPool[0], GameObject.Find("Player").transform.position);
+        yield return new WaitForSeconds(1.5f);
+        ItemInstantiate(itemPool[1], GameObject.Find("Player").transform.position);
+        yield return new WaitForSeconds(1.5f);
+        ItemInstantiate(itemPool[2], GameObject.Find("Player").transform.position);
+        yield return new WaitForSeconds(1.5f);
+        ItemInstantiate(itemPool[3], GameObject.Find("Player").transform.position);
+        yield return new WaitForSeconds(1.5f);
+        AddonInstantiate(addonPool[0], GameObject.Find("Player").transform.position);
+        yield return new WaitForSeconds(1.5f);
+        AddonInstantiate(addonPool[1], GameObject.Find("Player").transform.position);
+        /*ItemSelect(0);
         yield return new WaitForSeconds(1f);
         PushItem((Item)System.Activator.CreateInstance(System.Type.GetType(itemPool[1])));
         yield return new WaitForSeconds(1f);
@@ -49,6 +62,16 @@ public class InventoryManager : MonoBehaviour {
         yield return new WaitForSeconds(1f);
         */
     }
+    public void ItemInstantiate(string str, Vector3 pos)
+    {
+        GameObject tmpItem = Instantiate(droppedPrefab);
+        tmpItem.GetComponent<DroppedItem>().Init((Item)System.Activator.CreateInstance(System.Type.GetType(str)), pos);
+    }
+    public void AddonInstantiate(string str, Vector3 pos)
+    {
+        GameObject tmpItem = Instantiate(droppedPrefab);
+        tmpItem.GetComponent<DroppedItem>().Init((Addon)System.Activator.CreateInstance(System.Type.GetType(str)), pos);
+    }
     public void SetOnPosition()
     {
         ui.SetOnPosition(itemList, addonList);
@@ -58,17 +81,27 @@ public class InventoryManager : MonoBehaviour {
         ui.selectedItem = itemIndex;
         ui.SetOnPosition(itemList, addonList);
     }
-    public void PushItem(Item item)
+    public bool PushItem(Item item)
     {
-        if(itemList.Count < 9)
-            itemList.Add(item);
+        for(int i = 0; i<item.skillNum; i++)
+            foreach (Item tmpItem in itemList)
+                for (int j = 0; j < tmpItem.skillNum; j++)
+                    if (item.combo[i].Equals(tmpItem.combo[j]))
+                        return false;
+
+        if (itemList.Count > 8) return false;
+
+        itemList.Add(item);
         ui.SetOnPosition(itemList, addonList);
+        return true;
     }
-    public void PushAddon(Addon addon)
+    public bool PushAddon(Addon addon)
     {
-        if (addonList.Count < 9)
-            addonList.Add(addon);
+        if (addonList.Count > 8) return false;
+
+        addonList.Add(addon);
         ui.SetOnPosition(itemList, addonList);
+        return true;
     }
     public void DiscardItem(int index)
     {

ProjectSettings/Physics2DSettings.asset

@@ -52,4 +52,4 @@ Physics2DSettings:
   m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432}
   m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745}
   m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804}
-  m_LayerCollisionMatrix: ffdffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe9fffffffdfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+  m_LayerCollisionMatrix: ffdffefffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe9fffffffdffffffffffffffefffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff

ProjectSettings/TagManager.asset

@@ -7,6 +7,8 @@ TagManager:
   - MapManager
   - Tetrimino
   - TetriminoSpawner
+  - DroppedLifeStone
+  - DroppedItem
   layers:
   - Default
   - TransparentFX