From d833da5bfae9f7d5849edb2aa6cd9f9425930a9e Mon Sep 17 00:00:00 2001 From: sharedacc520k Date: Mon, 30 Mar 2026 02:04:16 +0900 Subject: [PATCH] =?UTF-8?q?2026-03-30=20=EB=A8=B8=EB=A6=AC=EC=B9=B4?= =?UTF-8?q?=EB=9D=BD=20=EB=AC=BC=EB=A6=AC=ED=9A=A8=EA=B3=BC,=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=ED=85=9C=20=EC=8A=B5=EB=93=9D=20=EB=B2=84=EA=B7=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/GameScene.unity | 4 ++-- Assets/02_Scripts/Managers/Local/InventoryManager.cs | 2 -- Assets/02_Scripts/UI/Inventory/InventoryItemControl.cs | 2 +- Assets/02_Scripts/UI/Inventory/InventorySlot.cs | 2 -- Assets/02_Scripts/UI/_Shared/SplitWindowUI.cs | 1 - .../_Game/Players/Player_Gold/Player_Gold.prefab | 4 ++-- Assets/08_UI/Inventory/Prefabs/Slot.prefab | 2 +- ProjectSettings/TagManager.asset | 4 ++-- 8 files changed, 8 insertions(+), 13 deletions(-) diff --git a/Assets/01_Scenes/GameScene.unity b/Assets/01_Scenes/GameScene.unity index 6ff48d9..ecb5d0e 100644 --- a/Assets/01_Scenes/GameScene.unity +++ b/Assets/01_Scenes/GameScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17901d561df9a644bee04807b01786526d6ac09a7af77cb9c7db33ac1356cb22 -size 409521 +oid sha256:ab7af036102669ee2d3acaba24cdc3114fa29d2edf43177f54e77385c1822116 +size 429307 diff --git a/Assets/02_Scripts/Managers/Local/InventoryManager.cs b/Assets/02_Scripts/Managers/Local/InventoryManager.cs index 1ea5b88..cbfda70 100644 --- a/Assets/02_Scripts/Managers/Local/InventoryManager.cs +++ b/Assets/02_Scripts/Managers/Local/InventoryManager.cs @@ -79,8 +79,6 @@ public void MoveItem(int sourceIndex, int targetIndex) int canAdd = Items[targetIndex].Data.MaxStack - Items[targetIndex].CurrentStack; int actualAdd = Mathf.Min(canAdd, Items[sourceIndex].CurrentStack); - Debug.Log($"actualAdd : {actualAdd}"); - Items[targetIndex].CurrentStack += actualAdd; Items[sourceIndex].CurrentStack -= actualAdd; diff --git a/Assets/02_Scripts/UI/Inventory/InventoryItemControl.cs b/Assets/02_Scripts/UI/Inventory/InventoryItemControl.cs index 3be3af1..deb75f0 100644 --- a/Assets/02_Scripts/UI/Inventory/InventoryItemControl.cs +++ b/Assets/02_Scripts/UI/Inventory/InventoryItemControl.cs @@ -48,7 +48,7 @@ public void OnEndDrag(PointerEventData eventData) { // eventData.pointerEnter는 드래그가 끝난 지점에 마우스가 가리키고 있는 오브젝트 (이전까지 _canvasGroup.blocksRaycasts = false; 였으므로 자신 제외) // 가르키는 오브젝트가 없거나, UI 레이어가 아니라면 버린것으로 간주 - bool isDroppedOutsideUI = eventData.pointerEnter == null || eventData.pointerEnter.layer != LayerMask.NameToLayer("UI"); + bool isDroppedOutsideUI = eventData.pointerEnter == null || eventData.pointerEnter.layer != LayerMask.NameToLayer("ControlUI"); if (isDroppedOutsideUI) { diff --git a/Assets/02_Scripts/UI/Inventory/InventorySlot.cs b/Assets/02_Scripts/UI/Inventory/InventorySlot.cs index f8c012e..3fa6b24 100644 --- a/Assets/02_Scripts/UI/Inventory/InventorySlot.cs +++ b/Assets/02_Scripts/UI/Inventory/InventorySlot.cs @@ -80,8 +80,6 @@ public void OnDrop(PointerEventData eventData) } public void OnPointerEnter(PointerEventData eventData) { - Debug.Log("PointerEnter"); - if (currentItem != null && currentItem.Data != null) { // 드래그 중에는 툴팁 안띄움 diff --git a/Assets/02_Scripts/UI/_Shared/SplitWindowUI.cs b/Assets/02_Scripts/UI/_Shared/SplitWindowUI.cs index 7869a01..17862a8 100644 --- a/Assets/02_Scripts/UI/_Shared/SplitWindowUI.cs +++ b/Assets/02_Scripts/UI/_Shared/SplitWindowUI.cs @@ -10,7 +10,6 @@ public class SplitWindowUI : MonoBehaviour private void Start() { - gameObject.SetActive(false); } public void Open(int max, Action onConfirm) diff --git a/Assets/05_Characters/_Game/Players/Player_Gold/Player_Gold.prefab b/Assets/05_Characters/_Game/Players/Player_Gold/Player_Gold.prefab index fcf1d51..497d321 100644 --- a/Assets/05_Characters/_Game/Players/Player_Gold/Player_Gold.prefab +++ b/Assets/05_Characters/_Game/Players/Player_Gold/Player_Gold.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9355035d5f7df37a0e3a1266f104e1221212fab4110f49c38cf94bf903424ab -size 144333 +oid sha256:269784ffa34edd247a05d87b1d25bac4324aedf653a05fe8eb1e414217168485 +size 178903 diff --git a/Assets/08_UI/Inventory/Prefabs/Slot.prefab b/Assets/08_UI/Inventory/Prefabs/Slot.prefab index 3e0af78..8b3e4b6 100644 --- a/Assets/08_UI/Inventory/Prefabs/Slot.prefab +++ b/Assets/08_UI/Inventory/Prefabs/Slot.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6000bfe9a3cfbe17d57d1ce32f3b3682bc2db9506e05bd48428f1822a091055a +oid sha256:ad45b10af25b7d5f2d036000f8726f5b77e36a30946435fccae4efb3a9fb47c6 size 16476 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 0e77a08..22435d2 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0aae2176ebb4bf2c74dd02bd2ab4d10c37478782df4532d2df96c74c99af7b31 -size 541 +oid sha256:c723ca3b73df65da680155ba7dcfe00be894149c9095059367faff586e907a5d +size 550