2026-06-24 복구

2026-06-24 18:11:59 +09:00
parent 5ebb11395c
commit b92bb65ba6
6 changed files with 12 additions and 37 deletions
--- a/project/Inventory/Scripts/InventoryManager.cs
+++ b/project/Inventory/Scripts/InventoryManager.cs
@@ -794,7 +794,6 @@ private void NotifyAllItemsChanged()
        onInventoryChanged?.Invoke();
    }

-<<<<<<< HEAD
    private void NotifyMemoryPieceProgress()
    {
        int current = GetItemCount(memoryPieceItemType);
@@ -826,13 +825,11 @@ private void NotifyMemoryPieceProgress()
    public void DebugClearInventory() => ClearInventory();
    public void DebugDeleteSave() => DeleteSavedInventory();

-=======
    public void InventoryUIToggle()
    {
        _inventoryUI.gameObject.SetActive(!_inventoryUI.gameObject.activeSelf);
    }

->>>>>>> 695f9b7a14841768ae101b4395af63c4ab86d096
 #if UNITY_EDITOR
    private void OnValidate()
    {