From c51958a03d954581fcd3bf230e71bb58078248df Mon Sep 17 00:00:00 2001 From: Nam Tae Gun Date: Wed, 3 Jul 2024 03:48:11 +0900 Subject: [PATCH] =?UTF-8?q?=EC=95=84=EC=9D=B4=ED=85=9C=20=EB=93=9C?= =?UTF-8?q?=EB=A1=AD=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01.Scenes/02.Combat.unity | 1 - Assets/02.Scripts/Item/ItemManager.cs | 10 +++++----- Assets/05.Prefabs/Items/Item.prefab | 2 +- ProjectSettings/DynamicsManager.asset | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Assets/01.Scenes/02.Combat.unity b/Assets/01.Scenes/02.Combat.unity index 66259f74f..3d0994e68 100644 --- a/Assets/01.Scenes/02.Combat.unity +++ b/Assets/01.Scenes/02.Combat.unity @@ -1156,7 +1156,6 @@ MonoBehaviour: _persistent: 0 _cinemachineCameras: {fileID: 0} k__BackingField: {fileID: 0} - MainCamera: {fileID: 0} --- !u!114 &191889757 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/02.Scripts/Item/ItemManager.cs b/Assets/02.Scripts/Item/ItemManager.cs index e0bb66fff..06dddeb03 100644 --- a/Assets/02.Scripts/Item/ItemManager.cs +++ b/Assets/02.Scripts/Item/ItemManager.cs @@ -76,12 +76,12 @@ namespace BlueWater.Items { itemPrefab = _defaultItemPrefab; } - var instantiatePosition = new Vector3(dropPosition.x, dropPosition.y, dropPosition.z); - var instantiateItem = Instantiate(itemPrefab, instantiatePosition, itemPrefab.transform.rotation); - instantiateItem.Initialize(element); - var dropDirection = newDropPosition - instantiatePosition; - instantiateItem.AddForce(dropDirection * 20f, ForceMode.Impulse); + var instantiateItem = Instantiate(itemPrefab, dropPosition, itemPrefab.transform.rotation); + instantiateItem.Initialize(element); + + var pushPower = Vector3.up * 30f + (newDropPosition - dropPosition) * 10f; + instantiateItem.AddForce(pushPower, ForceMode.Impulse); } } diff --git a/Assets/05.Prefabs/Items/Item.prefab b/Assets/05.Prefabs/Items/Item.prefab index 9854166d6..0d8cf40f0 100644 --- a/Assets/05.Prefabs/Items/Item.prefab +++ b/Assets/05.Prefabs/Items/Item.prefab @@ -284,7 +284,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5611097802189151736, guid: a6a0d1675321b7a43b4132ca15cf7ca0, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index 176c6a276..d9d6019e8 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -17,7 +17,7 @@ PhysicsManager: m_EnableAdaptiveForce: 0 m_ClothInterCollisionDistance: 0 m_ClothInterCollisionStiffness: 0 - m_LayerCollisionMatrix: 0000000000000000000000000000000000000000000000000067010000670100c0670100c0010100c00101000000000000000000c0210100c001010000000000c0670100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_LayerCollisionMatrix: 0000000000000000000000000000000000000000000000000067010000670100c0670100c0010100c00101000000000000000000c0010100c001010000000000c0670100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 m_SimulationMode: 0 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 1