2026-06-24 복구

Assets/My project/Inventory/Scripts/InventoryItemType.cs

@@ -1,15 +0,0 @@
-using UnityEngine;
-
-/// <summary>
-/// 인벤토리에서 관리할 아이템 종류입니다.
-/// 문자열 대신 enum을 사용하면 오타로 인한 버그를 줄일 수 있습니다.
-/// </summary>
-public enum InventoryItemType
-{
-    Fish,
-    OldCompass,
-    Trash,
-    Bottle,
-    MemoryPiece,
-    Coin
-}

Assets/My project/Inventory/Scripts/InventoryItemType.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: a363e83699ebc374c8aab5d2859976cd

Assets/My 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()
     {

Packages/manifest.json

@@ -1,10 +1,7 @@
 {
   "dependencies": {
-<<<<<<< HEAD
     "com.unity.2d.sprite": "1.0.0",
-=======
     "com.unity.ai.navigation": "2.0.13",
->>>>>>> 695f9b7a14841768ae101b4395af63c4ab86d096
     "com.unity.burst": "1.8.27",
     "com.unity.cinemachine": "3.1.7",
     "com.unity.cloud.gltfast": "6.19.0",

Packages/packages-lock.json

@@ -1,12 +1,11 @@
 {
   "dependencies": {
-<<<<<<< HEAD
     "com.unity.2d.sprite": {
       "version": "1.0.0",
       "depth": 0,
       "source": "builtin",
       "dependencies": {}
-=======
+    },
     "com.unity.ai.navigation": {
       "version": "2.0.13",
       "depth": 0,
@@ -15,7 +14,6 @@
         "com.unity.modules.ai": "1.0.0"
       },
       "url": "https://packages.unity.com"
->>>>>>> 695f9b7a14841768ae101b4395af63c4ab86d096
     },
     "com.unity.bindings.openimageio": {
       "version": "1.0.2",
@@ -97,8 +95,8 @@
       "depth": 0,
       "source": "builtin",
       "dependencies": {
-        "com.unity.ide.visualstudio": "2.0.26",
+        "com.unity.ide.visualstudio": "2.0.27",
-        "com.unity.ide.rider": "3.0.39",
+        "com.unity.ide.rider": "3.0.40",
         "com.unity.editorcoroutines": "1.0.1",
         "com.unity.performance.profile-analyzer": "1.2.4",
         "com.unity.test-framework": "1.6.0",
@@ -115,8 +113,8 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.39",
+      "version": "3.0.40",
-      "depth": 0,
+      "depth": 1,
       "source": "registry",
       "dependencies": {
         "com.unity.ext.nunit": "1.0.6"
@@ -124,8 +122,8 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.26",
+      "version": "2.0.27",
-      "depth": 0,
+      "depth": 1,
       "source": "registry",
       "dependencies": {
         "com.unity.test-framework": "1.1.33"
@@ -254,12 +252,12 @@
       }
     },
     "com.unity.splines": {
-      "version": "2.8.2",
+      "version": "2.6.1",
-      "depth": 1,
+      "depth": 0,
       "source": "registry",
       "dependencies": {
+        "com.unity.ugui": "1.0.0",
         "com.unity.mathematics": "1.2.1",
-        "com.unity.modules.imgui": "1.0.0",
         "com.unity.settings-manager": "1.0.3"
       },
       "url": "https://packages.unity.com"