closed #232, #233 인벤토리 시스템 적용

BlueWater/Assets/02.Scripts/BlueWater.cs

@@ -188,6 +188,24 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
                     ""processors"": """",
                     ""interactions"": """",
                     ""initialStateCheck"": false
+                },
+                {
+                    ""name"": ""ItemInventory"",
+                    ""type"": ""Button"",
+                    ""id"": ""1a1c112e-8c2b-47b5-b6ff-e7c113db0b1f"",
+                    ""expectedControlType"": ""Button"",
+                    ""processors"": """",
+                    ""interactions"": """",
+                    ""initialStateCheck"": false
+                },
+                {
+                    ""name"": ""Esc"",
+                    ""type"": ""Button"",
+                    ""id"": ""4984fb85-de31-4918-9a06-61edbd3502e8"",
+                    ""expectedControlType"": ""Button"",
+                    ""processors"": """",
+                    ""interactions"": """",
+                    ""initialStateCheck"": false
                 }
             ],
             ""bindings"": [
@@ -443,6 +461,28 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
                     ""action"": ""ToggleLaunchMode"",
                     ""isComposite"": false,
                     ""isPartOfComposite"": false
+                },
+                {
+                    ""name"": """",
+                    ""id"": ""ba74fb0a-93f0-42ef-abb7-4086df2a23fe"",
+                    ""path"": ""<Keyboard>/i"",
+                    ""interactions"": """",
+                    ""processors"": """",
+                    ""groups"": ""Keyboard&Mouse"",
+                    ""action"": ""ItemInventory"",
+                    ""isComposite"": false,
+                    ""isPartOfComposite"": false
+                },
+                {
+                    ""name"": """",
+                    ""id"": ""9eacb0a0-9492-4531-9579-743e48d41b7e"",
+                    ""path"": ""<Keyboard>/escape"",
+                    ""interactions"": """",
+                    ""processors"": """",
+                    ""groups"": ""Keyboard&Mouse"",
+                    ""action"": ""Esc"",
+                    ""isComposite"": false,
+                    ""isPartOfComposite"": false
                 }
             ]
         },
@@ -624,6 +664,8 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
         m_Player_LaunchCannon = m_Player.FindAction("LaunchCannon", throwIfNotFound: true);
         m_Player_ShiftKey = m_Player.FindAction("ShiftKey", throwIfNotFound: true);
         m_Player_BuildMode = m_Player.FindAction("BuildMode", throwIfNotFound: true);
+        m_Player_ItemInventory = m_Player.FindAction("ItemInventory", throwIfNotFound: true);
+        m_Player_Esc = m_Player.FindAction("Esc", throwIfNotFound: true);
         // Camera
         m_Camera = asset.FindActionMap("Camera", throwIfNotFound: true);
         m_Camera_Zoom = m_Camera.FindAction("Zoom", throwIfNotFound: true);
@@ -712,6 +754,8 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
     private readonly InputAction m_Player_LaunchCannon;
     private readonly InputAction m_Player_ShiftKey;
     private readonly InputAction m_Player_BuildMode;
+    private readonly InputAction m_Player_ItemInventory;
+    private readonly InputAction m_Player_Esc;
     public struct PlayerActions
     {
         private @BlueWater m_Wrapper;
@@ -734,6 +778,8 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
         public InputAction @LaunchCannon => m_Wrapper.m_Player_LaunchCannon;
         public InputAction @ShiftKey => m_Wrapper.m_Player_ShiftKey;
         public InputAction @BuildMode => m_Wrapper.m_Player_BuildMode;
+        public InputAction @ItemInventory => m_Wrapper.m_Player_ItemInventory;
+        public InputAction @Esc => m_Wrapper.m_Player_Esc;
         public InputActionMap Get() { return m_Wrapper.m_Player; }
         public void Enable() { Get().Enable(); }
         public void Disable() { Get().Disable(); }
@@ -797,6 +843,12 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
             @BuildMode.started += instance.OnBuildMode;
             @BuildMode.performed += instance.OnBuildMode;
             @BuildMode.canceled += instance.OnBuildMode;
+            @ItemInventory.started += instance.OnItemInventory;
+            @ItemInventory.performed += instance.OnItemInventory;
+            @ItemInventory.canceled += instance.OnItemInventory;
+            @Esc.started += instance.OnEsc;
+            @Esc.performed += instance.OnEsc;
+            @Esc.canceled += instance.OnEsc;
         }
 
         private void UnregisterCallbacks(IPlayerActions instance)
@@ -855,6 +907,12 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
             @BuildMode.started -= instance.OnBuildMode;
             @BuildMode.performed -= instance.OnBuildMode;
             @BuildMode.canceled -= instance.OnBuildMode;
+            @ItemInventory.started -= instance.OnItemInventory;
+            @ItemInventory.performed -= instance.OnItemInventory;
+            @ItemInventory.canceled -= instance.OnItemInventory;
+            @Esc.started -= instance.OnEsc;
+            @Esc.performed -= instance.OnEsc;
+            @Esc.canceled -= instance.OnEsc;
         }
 
         public void RemoveCallbacks(IPlayerActions instance)
@@ -1026,6 +1084,8 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
         void OnLaunchCannon(InputAction.CallbackContext context);
         void OnShiftKey(InputAction.CallbackContext context);
         void OnBuildMode(InputAction.CallbackContext context);
+        void OnItemInventory(InputAction.CallbackContext context);
+        void OnEsc(InputAction.CallbackContext context);
     }
     public interface ICameraActions
     {

BlueWater/Assets/02.Scripts/BlueWater.inputactions

@@ -166,6 +166,24 @@
                     "processors": "",
                     "interactions": "",
                     "initialStateCheck": false
+                },
+                {
+                    "name": "ItemInventory",
+                    "type": "Button",
+                    "id": "1a1c112e-8c2b-47b5-b6ff-e7c113db0b1f",
+                    "expectedControlType": "Button",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": false
+                },
+                {
+                    "name": "Esc",
+                    "type": "Button",
+                    "id": "4984fb85-de31-4918-9a06-61edbd3502e8",
+                    "expectedControlType": "Button",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": false
                 }
             ],
             "bindings": [
@@ -421,6 +439,28 @@
                     "action": "ToggleLaunchMode",
                     "isComposite": false,
                     "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "ba74fb0a-93f0-42ef-abb7-4086df2a23fe",
+                    "path": "<Keyboard>/i",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "Keyboard&Mouse",
+                    "action": "ItemInventory",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "9eacb0a0-9492-4531-9579-743e48d41b7e",
+                    "path": "<Keyboard>/escape",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "Keyboard&Mouse",
+                    "action": "Esc",
+                    "isComposite": false,
+                    "isPartOfComposite": false
                 }
             ]
         },

BlueWater/Assets/02.Scripts/Boid.cs

@@ -12,7 +12,7 @@ namespace BlueWaterProject
     public class Boid : MonoBehaviour, IDroppable
     {
         [field: Title("FishInfo")]
-        [field: SerializeField] public DropItemTable DropItemTable { get; set; }
+        [field: SerializeField] public int ItemDropTableIdx { get; set; }
         
         [Title("개체 설정")]
         [SerializeField] private float obstacleDistance = 10;

BlueWater/Assets/02.Scripts/Boids.cs

@@ -332,7 +332,7 @@ namespace BlueWaterProject
                 var z = Random.Range(bounds.min.z, bounds.max.z);
                 var randomPos = new Vector3(x, 0, z);
                 
-                currentBoid.DropItemTable.ItemDrop(randomPos);
+                ItemManager.Inst.ItemDrop(currentBoid.ItemDropTableIdx, randomPos);
                 
                 boidList.RemoveAt(0);
                 Destroy(currentBoid.gameObject);

BlueWater/Assets/02.Scripts/Character/CombatPlayer2D/CombatInput.cs

@@ -49,5 +49,19 @@ namespace BlueWaterProject
         {
             OnAttackInputReceived?.Invoke(context);
         }
+
+        private void OnItemInventory()
+        {
+            var activeSelf = UiManager.Inst.CombatUi.CombatItemInventoryUi.gameObject.activeSelf;
+            UiManager.Inst.CombatUi.CombatItemInventoryUi.SetActiveInventoryUi(!activeSelf);
+        }
+        
+        private void OnEsc()
+        {
+            if (UiManager.Inst.CombatUi.CombatItemInventoryUi.gameObject.activeSelf)
+            {
+                UiManager.Inst.CombatUi.CombatItemInventoryUi.SetActiveInventoryUi(false);
+            }
+        }
     }
 }

BlueWater/Assets/02.Scripts/Character/Enemy/Enemy.cs

@@ -98,7 +98,7 @@ namespace BlueWaterProject
         [SerializeField] protected bool beAttacked;
         
         [field: Title("드롭 아이템")]
-        [field: SerializeField] public DropItemTable DropItemTable { get; set; }
+        [field: SerializeField] public int ItemDropTableIdx { get; set; }
 
         // 일반 변수
         protected bool isAttacking;
@@ -327,7 +327,7 @@ namespace BlueWaterProject
 
         private void DieEvent()
         {
-            DropItemTable?.ItemDrop(transform.position + Vector3.up * 0.5f);
+            ItemManager.Inst.ItemDrop(ItemDropTableIdx, transform.position + Vector3.up * 0.5f);
             
             Destroy(hpSlider.gameObject);
             Destroy(gameObject);

BlueWater/Assets/02.Scripts/Character/Enemy/Type/FieldMinion/FieldMinion.cs

@@ -8,8 +8,6 @@ namespace BlueWaterProject
     {
         #region Properties and variables
         
-        public DropItemTable DropItemTable { get; set; }
-        
         // Hash
         protected static readonly int AttackHash = Animator.StringToHash("Attack");
         protected static readonly int AttackStateHash = Animator.StringToHash("AttackState");

BlueWater/Assets/02.Scripts/Character/Player/Type/ShipPlayer.cs

@@ -246,6 +246,20 @@ namespace BlueWaterProject
             
         }
         
+        private void OnItemInventory()
+        {
+            var activeSelf = UiManager.Inst.OceanUi.OceanItemInventoryUi.gameObject.activeSelf;
+            UiManager.Inst.OceanUi.OceanItemInventoryUi.SetActiveInventoryUi(!activeSelf);
+        }
+
+        private void OnEsc()
+        {
+            if (UiManager.Inst.OceanUi.OceanItemInventoryUi.gameObject.activeSelf)
+            {
+                UiManager.Inst.OceanUi.OceanItemInventoryUi.SetActiveInventoryUi(false);
+            }
+        }
+        
         #endregion
         
         /***********************************************************************
@@ -297,7 +311,8 @@ namespace BlueWaterProject
             {
                 var boost = isBoosting ? boostCoefficient : 1f;
                 var speed = boost * acceleration;
-                rb.AddForce(inputMoveDirection * speed, ForceMode.Acceleration);
+                var isOverWeightSpeed = DataManager.Inst.CurrentInventory.IsOverWeight ? 0.1f : 1f;
+                rb.AddForce(inputMoveDirection * (speed * isOverWeightSpeed), ForceMode.Acceleration);
 
                 if (rb.velocity.magnitude > maxSpeed * boost)
                 {

BlueWater/Assets/02.Scripts/CombatUi.cs

@@ -15,6 +15,9 @@ namespace BlueWaterProject
         [field: SerializeField] public SkillUi MainSkillUi { get; private set; }
         [field: SerializeField] public FieldBossHpSlider FieldBossHpSlider { get; private set; }
         [field: SerializeField] public DropItemGroupController DropItemGroupController { get; set; }
+        [field: SerializeField] public ItemInventoryUi OceanItemInventoryUi { get; set; }
+        [field: SerializeField] public ItemInventoryUi CombatItemInventoryUi { get; set; }
+        [field: SerializeField] public DiscardPopupUi DiscardPopupUi { get; set; }
         
         
         [Button("셋팅 초기화")]
@@ -31,6 +34,9 @@ namespace BlueWaterProject
             MainSkillUi = MainCanvas.transform.Find("MainSkillUi").GetComponent<SkillUi>();
             FieldBossHpSlider = MainCanvas.transform.Find("FieldBossHpSlider").GetComponent<FieldBossHpSlider>();
             DropItemGroupController = MainCanvas.transform.Find("DropItemGroup").GetComponent<DropItemGroupController>();
+            OceanItemInventoryUi = MainCanvas.transform.Find("OceanItemInventoryUi").GetComponent<ItemInventoryUi>();
+            CombatItemInventoryUi = MainCanvas.transform.Find("CombatItemInventoryUi").GetComponent<ItemInventoryUi>();
+            DiscardPopupUi = MainCanvas.transform.Find("DiscardPopupUi").GetComponent<DiscardPopupUi>();
         }
         
         private void Awake()

BlueWater/Assets/02.Scripts/DataManager.cs

@@ -1,8 +1,8 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Sirenix.OdinInspector;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 
 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
@@ -10,7 +10,9 @@ namespace BlueWaterProject
     public class DataManager : Singleton<DataManager>
     {
         [field: Title("Inventory")]
-        [field: SerializeField] public PlayerInventory PlayerInventory { get; private set; }
+        [field: SerializeField] public PlayerInventory OceanInventory { get; private set; } = new();
+        [field: SerializeField] public PlayerInventory CombatInventory { get; private set; } = new();
+        public PlayerInventory CurrentInventory { get; set; }
         public int Gold { get; set; } = 0;
     
         [Title("DataBase", "GameObject")] 
@@ -41,7 +43,14 @@ namespace BlueWaterProject
         
         private void Init()
         {
-            PlayerInventory = new PlayerInventory();
+            if (SceneManager.GetActiveScene().name == "02.Ocean")
+            {
+                CurrentInventory = OceanInventory;
+            }
+            else if (SceneManager.GetActiveScene().name == "02.Combat_2D")
+            {
+                CurrentInventory = CombatInventory;
+            }
         }
 
         protected override void OnAwake()

BlueWater/Assets/02.Scripts/DestructibleObject.cs

@@ -8,7 +8,7 @@ namespace BlueWaterProject
     public class DestructibleObject : MonoBehaviour, IDroppable
     {
         [field: Title("기본 설정")]
-        [field: SerializeField] public DropItemTable DropItemTable { get; set; }
+        [field: SerializeField] public int ItemDropTableIdx { get; set; }
         [field: SerializeField] public int Strength { get; private set; } = 100;
         [SerializeField] private float power = 10f;
         [SerializeField] private float damageCooldown = 2f;
@@ -58,7 +58,7 @@ namespace BlueWaterProject
         {
             rb.isKinematic = false;
             rayfire.Demolish();
-            DropItemTable.ItemDrop(other.collider.bounds.center);
+            ItemManager.Inst.ItemDrop(ItemDropTableIdx, other.collider.bounds.center);
         }
         
         private void Hit(IDestructible iDestructible)

BlueWater/Assets/02.Scripts/Interface/IDroppable.cs

@@ -3,6 +3,6 @@ namespace BlueWaterProject
 {
     public interface IDroppable
     {
-        DropItemTable DropItemTable { get; set; }
+        int ItemDropTableIdx { get; set; }
     }
 }

BlueWater/Assets/02.Scripts/Item/CurrencyItem/CurrencyItem.cs

@@ -1,15 +1,15 @@
-using System;
-using UnityEngine;
-
-// ReSharper disable once CheckNamespace
-namespace BlueWaterProject
-{
-    [CreateAssetMenu(fileName = "CurrencyItem", menuName = "ScriptableObjects/Item/CurrencyItem")]
-    public class CurrencyItem : Item
-    {
-        public override void Use()
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
+// using System;
+// using UnityEngine;
+//
+// // ReSharper disable once CheckNamespace
+// namespace BlueWaterProject
+// {
+//     [CreateAssetMenu(fileName = "CurrencyItem", menuName = "ScriptableObjects/Item/CurrencyItem")]
+//     public class CurrencyItem : Item
+//     {
+//         public override void Use()
+//         {
+//             throw new NotImplementedException();
+//         }
+//     }
+// }

BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo/BigBarrelDropTable.asset

@@ -13,14 +13,12 @@ MonoBehaviour:
   m_Name: BigBarrelDropTable
   m_EditorClassIdentifier: 
   itemInstanceList:
-  - <Item>k__BackingField: {fileID: 11400000, guid: b6bf3a02ded696840a990636e2151830,
-      type: 2}
+  - <Idx>k__BackingField: 20001
     <Probability>k__BackingField: 80
-    <Count>k__BackingField: {x: 1, y: 100}
+    <Count>k__BackingField: {x: 1, y: 1}
     prefab: {fileID: 4185765918994780331, guid: 0bb294b26cbcae54a8508211b077a88d,
       type: 3}
-  - <Item>k__BackingField: {fileID: 11400000, guid: b60d264f0506e60469c4ad5cffb8c6ba,
-      type: 2}
+  - <Idx>k__BackingField: 20002
     <Probability>k__BackingField: 20
     <Count>k__BackingField: {x: 1, y: 1}
     prefab: {fileID: 4185765918994780331, guid: 0bb294b26cbcae54a8508211b077a88d,

BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo/OrkDropTable.asset

@@ -13,14 +13,12 @@ MonoBehaviour:
   m_Name: OrkDropTable
   m_EditorClassIdentifier: 
   itemInstanceList:
-  - <Item>k__BackingField: {fileID: 11400000, guid: b6bf3a02ded696840a990636e2151830,
-      type: 2}
+  - <Idx>k__BackingField: 20001
     <Probability>k__BackingField: 80
-    <Count>k__BackingField: {x: 1, y: 100}
+    <Count>k__BackingField: {x: 1, y: 1}
     prefab: {fileID: 4185765918994780331, guid: 8ab179a0b6cfa1740a787520a9d2c722,
       type: 3}
-  - <Item>k__BackingField: {fileID: 11400000, guid: b60d264f0506e60469c4ad5cffb8c6ba,
-      type: 2}
+  - <Idx>k__BackingField: 20002
     <Probability>k__BackingField: 20
     <Count>k__BackingField: {x: 1, y: 1}
     prefab: {fileID: 4185765918994780331, guid: 8ab179a0b6cfa1740a787520a9d2c722,

BlueWater/Assets/02.Scripts/Item/CurrencyItem/DropSo/SmallBarrelDropTable.asset

@@ -13,14 +13,12 @@ MonoBehaviour:
   m_Name: SmallBarrelDropTable
   m_EditorClassIdentifier: 
   itemInstanceList:
-  - <Item>k__BackingField: {fileID: 11400000, guid: b6bf3a02ded696840a990636e2151830,
-      type: 2}
+  - <Idx>k__BackingField: 20001
     <Probability>k__BackingField: 80
-    <Count>k__BackingField: {x: 1, y: 100}
+    <Count>k__BackingField: {x: 1, y: 1}
     prefab: {fileID: 4185765918994780331, guid: 0bb294b26cbcae54a8508211b077a88d,
       type: 3}
-  - <Item>k__BackingField: {fileID: 11400000, guid: b60d264f0506e60469c4ad5cffb8c6ba,
-      type: 2}
+  - <Idx>k__BackingField: 20002
     <Probability>k__BackingField: 20
     <Count>k__BackingField: {x: 1, y: 1}
     prefab: {fileID: 4185765918994780331, guid: 0bb294b26cbcae54a8508211b077a88d,

BlueWater/Assets/02.Scripts/Item/DropItemController.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections;
 using Sirenix.OdinInspector;
 using UnityEngine;
@@ -29,8 +28,7 @@ namespace BlueWaterProject
         [SerializeField] private float acquisitionTime = 1f;
         [SerializeField] private LayerMask targetLayer;
 
-        private ItemInstance itemInstance;
-        private int itemCount;
+        private ItemSlot itemSlot;
         private Collider[] hitColliders = new Collider[1];
         private Collider targetCollider;
         private WaitForSeconds lootCoroutineTime = new(0.5f);
@@ -44,13 +42,12 @@ namespace BlueWaterProject
             Gizmos.DrawWireSphere(transform.position, radius);
         }
 
-        public void Init(ItemInstance newItemInstance, int count)
+        public void Init(ItemSlot itemSlotValue)
         {
-            itemInstance = newItemInstance;
-            itemCount = count;
+            itemSlot = itemSlotValue;
             if (spriteRenderer)
             {
-                spriteRenderer.sprite = itemInstance.Item.icon;
+                spriteRenderer.sprite = ItemManager.Inst.ItemDictionary[itemSlot.Idx].sprite;
             }
 
             var myPos = transform.position;
@@ -115,7 +112,7 @@ namespace BlueWaterProject
                 yield return null;
             }
 
-            itemInstance.Item.Acquire(itemCount);
+            ItemManager.Inst.Acquire(itemSlot);
             if (itemLootUi)
             {
                 itemLootUi.gameObject.SetActive(false);
@@ -135,7 +132,7 @@ namespace BlueWaterProject
             {
                 dropItemGroupController = UiManager.Inst.CombatUi.DropItemGroupController;
             }
-            dropItemGroupController?.ShowDropItemInfoUi(itemInstance.Item, itemCount);
+            dropItemGroupController?.ShowDropItemInfoUi(ItemManager.Inst.ItemDictionary[itemSlot.Idx], itemSlot.Count);
             
             if (audioSource && audioSource.resource)
             {

BlueWater/Assets/02.Scripts/Item/DropItemGroupController.cs

@@ -25,7 +25,7 @@ namespace BlueWaterProject
                     if (list.UiView.gameObject.activeSelf) continue;
 
                     var itemText = item.name + " x" + count;
-                    list.SetInfo(item.icon, itemText);
+                    list.SetInfo(item.sprite, itemText);
                     list.ShowUi();
 
                     while (list.UiView.gameObject.activeSelf)

BlueWater/Assets/02.Scripts/Item/DropItemTable.cs

@@ -1,58 +1,58 @@
-using System.Collections.Generic;
-using System.Linq;
-using UnityEngine;
-
-// ReSharper disable once CheckNamespace
-namespace BlueWaterProject
-{
-    [CreateAssetMenu(fileName = "DropItemTable", menuName = "ScriptableObjects/Item/DropItemTable")]
-    public class DropItemTable : ScriptableObject
-    {
-        public List<ItemInstance> itemInstanceList = new();
-
-        // private ItemInstance PickItem()
-        // {
-        //     var count = itemInstanceList.Count;
-        //
-        //     if (count == 0) return null;
-        //
-        //     var sumRatio = itemInstanceList.Sum(element => element.Probability);
-        //     var randomRatio = Random.Range(0, sumRatio);
-        //
-        //     for (var i = 0; i < count; i++)
-        //     {
-        //         randomRatio -= itemInstanceList[i].Probability;
-        //
-        //         if (randomRatio < 0)
-        //         {
-        //             return itemInstanceList[i];
-        //         }
-        //     }
-        //
-        //     return null;
-        // }
-        //
-        // public void ItemDrop(Vector3 dropPosition)
-        // {
-        //     var dropItem = PickItem();
-        //     if (dropItem == null) return;
-        //
-        //     var dropCount = Random.Range((int)dropItem.Count.x, (int)dropItem.Count.y + 1);
-        //     var instantiateItem = dropItem.Item.InstantiateItem(dropItem.prefab, dropPosition);
-        //     instantiateItem.GetComponentInChildren<DropItemController>().Init(dropItem, dropCount);
-        // }
-        
-        public void ItemDrop(Vector3 dropPosition)
-        {
-            foreach (var element in itemInstanceList)
-            {
-                var dropChance = Random.Range(0, 101);
-                if (dropChance > element.Probability) continue;
-                
-                var dropCount = Random.Range((int)element.Count.x, (int)element.Count.y + 1);
-                var instantiateItem = element.Item.InstantiateItem(element.prefab, dropPosition);
-                instantiateItem.GetComponentInChildren<DropItemController>().Init(element, dropCount);
-            }
-        }
-    }
-}
+// using System.Collections.Generic;
+// using System.Linq;
+// using UnityEngine;
+//
+// // ReSharper disable once CheckNamespace
+// namespace BlueWaterProject
+// {
+//     [CreateAssetMenu(fileName = "DropItemTable", menuName = "ScriptableObjects/Item/DropItemTable")]
+//     public class DropItemTable : ScriptableObject
+//     {
+//         public List<ItemInstance> itemInstanceList = new();
+//
+//         // private ItemInstance PickItem()
+//         // {
+//         //     var count = itemInstanceList.Count;
+//         //
+//         //     if (count == 0) return null;
+//         //
+//         //     var sumRatio = itemInstanceList.Sum(element => element.Probability);
+//         //     var randomRatio = Random.Range(0, sumRatio);
+//         //
+//         //     for (var i = 0; i < count; i++)
+//         //     {
+//         //         randomRatio -= itemInstanceList[i].Probability;
+//         //
+//         //         if (randomRatio < 0)
+//         //         {
+//         //             return itemInstanceList[i];
+//         //         }
+//         //     }
+//         //
+//         //     return null;
+//         // }
+//         //
+//         // public void ItemDrop(Vector3 dropPosition)
+//         // {
+//         //     var dropItem = PickItem();
+//         //     if (dropItem == null) return;
+//         //
+//         //     var dropCount = Random.Range((int)dropItem.Count.x, (int)dropItem.Count.y + 1);
+//         //     var instantiateItem = dropItem.Item.InstantiateItem(dropItem.prefab, dropPosition);
+//         //     instantiateItem.GetComponentInChildren<DropItemController>().Init(dropItem, dropCount);
+//         // }
+//         
+//         public void ItemDrop(Vector3 dropPosition)
+//         {
+//             foreach (var element in itemInstanceList)
+//             {
+//                 var dropChance = Random.Range(0, 101);
+//                 if (dropChance > element.Probability) continue;
+//                 
+//                 var dropCount = Random.Range((int)element.Count.x, (int)element.Count.y + 1);
+//                 var instantiateItem = ItemManager.Inst.InstantiateItem(element.prefab, dropPosition);
+//                 instantiateItem.GetComponentInChildren<DropItemController>().Init(element, dropCount);
+//             }
+//         }
+//     }
+// }

BlueWater/Assets/02.Scripts/Item/FishItem/DropSo/HammerheadSharkDropTable.asset

@@ -13,8 +13,7 @@ MonoBehaviour:
   m_Name: HammerheadSharkDropTable
   m_EditorClassIdentifier: 
   itemInstanceList:
-  - <Item>k__BackingField: {fileID: 11400000, guid: 5adade6dd915b424e8de993bea9e3eb1,
-      type: 2}
+  - <Idx>k__BackingField: 10201
     <Probability>k__BackingField: 100
     <Count>k__BackingField: {x: 1, y: 10}
     prefab: {fileID: 4185765918994780331, guid: 3e821daa41aac7d47b39f8cfebac29d0,

BlueWater/Assets/02.Scripts/Item/FishItem/DropSo/MackerelDropTable.asset

@@ -13,8 +13,7 @@ MonoBehaviour:
   m_Name: MackerelDropTable
   m_EditorClassIdentifier: 
   itemInstanceList:
-  - <Item>k__BackingField: {fileID: 11400000, guid: e67e7a41d059c6747960d8e91b37b29d,
-      type: 2}
+  - <Idx>k__BackingField: 10202
     <Probability>k__BackingField: 100
     <Count>k__BackingField: {x: 1, y: 3}
     prefab: {fileID: 4185765918994780331, guid: 3e821daa41aac7d47b39f8cfebac29d0,

BlueWater/Assets/02.Scripts/Item/FishItem/DropSo/StingrayDropTable.asset

@@ -13,8 +13,7 @@ MonoBehaviour:
   m_Name: StingrayDropTable
   m_EditorClassIdentifier: 
   itemInstanceList:
-  - <Item>k__BackingField: {fileID: 11400000, guid: 0205e1f648508a547b6cc1a05030c7eb,
-      type: 2}
+  - <Idx>k__BackingField: 10204
     <Probability>k__BackingField: 100
     <Count>k__BackingField: {x: 1, y: 5}
     prefab: {fileID: 4185765918994780331, guid: 3e821daa41aac7d47b39f8cfebac29d0,

BlueWater/Assets/02.Scripts/Item/FishItem/FishItem.cs

@@ -1,15 +1,15 @@
-using System;
-using UnityEngine;
-
-// ReSharper disable once CheckNamespace
-namespace BlueWaterProject
-{
-    [CreateAssetMenu(fileName = "FishItem", menuName = "ScriptableObjects/Item/FishItem")]
-    public class FishItem : Item
-    {
-        public override void Use()
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
+// using System;
+// using UnityEngine;
+//
+// // ReSharper disable once CheckNamespace
+// namespace BlueWaterProject
+// {
+//     [CreateAssetMenu(fileName = "FishItem", menuName = "ScriptableObjects/Item/FishItem")]
+//     public class FishItem : Item
+//     {
+//         public override void Use()
+//         {
+//             throw new NotImplementedException();
+//         }
+//     }
+// }

BlueWater/Assets/02.Scripts/Item/InventoryItem.cs

@@ -1,22 +0,0 @@
-using System;
-using UnityEngine;
-
-// ReSharper disable once CheckNamespace
-namespace BlueWaterProject
-{
-    [Serializable]
-    public class InventoryItem
-    {
-        [field: Tooltip("아이템 데이터")]
-        [field: SerializeField] public Item Item { get; set; }
-
-        [field: Tooltip("아이템 수량")]
-        [field: SerializeField] public int Count { get; set; }
-        
-        public InventoryItem(Item item, int count)
-        {
-            Item = item;
-            Count = count;
-        }
-    }
-}

BlueWater/Assets/02.Scripts/Item/Item.cs

@@ -1,51 +1,54 @@
+using System;
+using Sirenix.OdinInspector;
 using UnityEngine;
 
 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
 {
-    public enum ItemRarity
+    public enum ItemCategory
     {
-        COMMON,
-        UNCOMMON,
-        RARE,
-        LEGENDARY
+        NONE = 0,
+        FOOD_INGREDIENT,
+        CURRENCY,
+        QUEST = 9
+    }
+
+    public enum ItemType
+    {
+        NONE = 0,
+        MEAT,
+        FISH,
+        EGG,
+        FRUIT,
+        SHELLFISH,
+        SEASONING
     }
     
-    [CreateAssetMenu(fileName = "Item", menuName = "ScriptableObjects/Item/BaseItem")]
-    public abstract class Item : ScriptableObject
+    [Serializable]
+    public class Item
     {
-        [Tooltip("고유 식별 ID")]
-        public string id;
-        
+        [Tooltip("고유 식별 ID"), Required]
+        public int idx;
+
         [Tooltip("이름")]
         public string name;
-        
-        [Tooltip("아이콘")]
-        public Sprite icon;
-        
-        [Tooltip("설명"), TextArea(3, 10)]
-        public string description;
-        
+
+        [Tooltip("아이템 종류")]
+        public ItemCategory category;
+
+        [Tooltip("재료 종류")]
+        public ItemType type;
+
         [Tooltip("가격")]
         public int price;
-        
+
         [Tooltip("무게")]
         public int weight;
-        
-        [Tooltip("등급")]
-        public ItemRarity rarity;
 
-        public abstract void Use();
+        [Tooltip("스프라이트")]
+        public Sprite sprite;
 
-        public void Acquire(int count)
-        {
-            DataManager.Inst.PlayerInventory.AddItem(this, count);
-        }
-        
-        public GameObject InstantiateItem(GameObject prefab, Vector3 position, Quaternion rotation = default)
-        {
-            var instantiateItem = Instantiate(prefab, position, rotation);
-            return instantiateItem;
-        }
+        [Tooltip("설명"), TextArea(3, 10)]
+        public string description;
     }
 }

BlueWater/Assets/02.Scripts/Item/ItemDropTable.cs

@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using Random = UnityEngine.Random;
+
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    [Serializable]
+    public class ItemDropTable
+    {
+        public enum ItemDropType
+        {
+            NONE = 0,
+            OCEAN,
+            FIELD
+        }
+        
+        [Tooltip("드랍 테이블 인덱스")]
+        public int idx;
+        
+        [Tooltip("드랍 테이블 이름")]
+        public string name;
+        
+        public int item1_idx;
+        public int item1_prob;
+        public int item1_min;
+        public int item1_max;
+        
+        public int item2_idx;
+        public int item2_prob;
+        public int item2_min;
+        public int item2_max;
+        
+        public int item3_idx;
+        public int item3_prob;
+        public int item3_min;
+        public int item3_max;
+        
+        public int item4_idx;
+        public int item4_prob;
+        public int item4_min;
+        public int item4_max;
+
+        public ItemDropType item_drop_type;
+        
+        public List<ItemSlot> GetDroppedItemList()
+        {
+            var newItemSlotList = new List<ItemSlot>();
+            
+            CheckAndAddItem(newItemSlotList, item1_idx, item1_prob, item1_min, item1_max);
+            CheckAndAddItem(newItemSlotList, item2_idx, item2_prob, item2_min, item2_max);
+            CheckAndAddItem(newItemSlotList, item3_idx, item3_prob, item3_min, item3_max);
+            CheckAndAddItem(newItemSlotList, item4_idx, item4_prob, item4_min, item4_max);
+
+            return newItemSlotList;
+        }
+
+        private void CheckAndAddItem(List<ItemSlot> itemSlotList, int itemIdx, int probability, int min, int max)
+        {
+            if (itemIdx == 0) return;
+            
+            var dropChance = Random.Range(0, 101);
+            if (dropChance > probability) return;
+
+            var randomCount = Random.Range(min, max + 1);
+            itemSlotList.Add(new ItemSlot(itemIdx, randomCount));
+        }
+    }
+}

BlueWater/Assets/02.Scripts/Item/ItemInstance.cs

@@ -1,29 +0,0 @@
-using System;
-using UnityEngine;
-
-// ReSharper disable once CheckNamespace
-namespace BlueWaterProject
-{
-    [Serializable]
-    public class ItemInstance
-    {
-        [field: Tooltip("아이템 데이터")]
-        [field: SerializeField] public Item Item { get; set; }
-        
-        [field: Tooltip("아이템 드롭 비율"), Range(0, 100)]
-        [field: SerializeField] public int Probability { get; set; }
-        
-        [field: Tooltip("아이템 랜덤 드롭 갯수")]
-        [field: SerializeField] public Vector2 Count { get; set; }
-        
-        [Tooltip("프리팹")]
-        public GameObject prefab;
-
-        public ItemInstance(Item item, int probability, Vector2 count)
-        {
-            Item = item;
-            Probability = probability;
-            Count = count;
-        }
-    }
-}

BlueWater/Assets/02.Scripts/Item/ItemInventoryUi.cs

@@ -0,0 +1,224 @@
+using System;
+using System.Collections.Generic;
+using Sirenix.OdinInspector;
+using TMPro;
+using UnityEngine;
+
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    public class ItemInventoryUi : MonoBehaviour
+    {
+        private enum InventoryType
+        {
+            NONE = 0,
+            OCEAN_INVENTORY_IN_OCEAN,
+            OCEAN_INVENTORY_IN_COMBAT,
+            COMBAT_INVENTORY_IN_COMBAT,
+        }
+
+        [SerializeField] private InventoryType inventoryType;
+        [SerializeField, Required] private TMP_Dropdown sortingDropdown;
+        [SerializeField, Required] private TMP_Text currentWeight;
+        [SerializeField, Required] private GameObject itemSlotUiPrefab;
+        [SerializeField, Required] private Transform instantiateLocation;
+        
+        [field: SerializeField] public List<ItemSlotUi> ItemSlotUiList { get; set; } = new();
+        
+        private PlayerInventory inventory;
+        private List<ItemSlotUi> selectedList = new();
+
+        private void OnEnable()
+        {
+            InitAndUpdateInventory();
+            inventory.OnChangeItemSlot += ChangedData;
+        }
+
+        private void Start()
+        {
+            InitAndUpdateInventory();
+        }
+
+        private void OnDisable()
+        {
+            inventory.OnChangeItemSlot -= ChangedData;
+        }
+
+        public void InitAndUpdateInventory()
+        {
+            inventory ??= GetPlayerInventory();
+            
+            InitInventory();
+            InventorySynchronization();
+            InitWeight();
+        }
+
+        private PlayerInventory GetPlayerInventory()
+        {
+            switch (inventoryType)
+            {
+                case InventoryType.NONE:
+                    return null;
+                case InventoryType.OCEAN_INVENTORY_IN_OCEAN:
+                case InventoryType.OCEAN_INVENTORY_IN_COMBAT:
+                    return DataManager.Inst.OceanInventory;
+                case InventoryType.COMBAT_INVENTORY_IN_COMBAT:
+                    return DataManager.Inst.CombatInventory;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+
+        private void InitInventory()
+        {
+            ItemSlotUiList.Clear();
+
+            foreach (Transform element in instantiateLocation)
+            {
+                Destroy(element.gameObject);
+            }
+        }
+
+        private void InventorySynchronization()
+        {
+            foreach (var element in inventory.ItemSlotList)
+            {
+                var newItemContent = Instantiate(itemSlotUiPrefab, instantiateLocation).GetComponent<ItemSlotUi>();
+                newItemContent.InitData(element);
+                ItemSlotUiList.Add(newItemContent);
+            }
+        }
+
+        private void InitWeight()
+        {
+            if (float.IsPositiveInfinity(inventory.WeightLimit))
+            {
+                currentWeight.text = inventory.CurrentTotalWeight + " / ∞Kg";
+            }
+            else
+            {
+                currentWeight.text = inventory.CurrentTotalWeight + " / " + inventory.WeightLimit + "Kg";
+            }
+            
+            currentWeight.color = inventory.IsOverWeight ? Color.red : Color.white;
+        }
+        
+        public void ChangedData(ItemSlot changedItemSlot, bool added)
+        {
+            if (added)
+            {
+                AddItem(changedItemSlot);
+            }
+            else
+            {
+                RemoveItem(changedItemSlot);
+            }
+            InitWeight();
+        }
+        
+        private void AddItem(ItemSlot addItemSlot)
+        {
+            var existingItemSlotUi = ItemSlotUiList.Find(i => i.ItemSlot.Idx == addItemSlot.Idx);
+            if (existingItemSlotUi != null)
+            {
+                existingItemSlotUi.UpdateData(addItemSlot);
+            }
+            else
+            {
+                var newItemSlot = Instantiate(itemSlotUiPrefab, instantiateLocation).GetComponent<ItemSlotUi>();
+                newItemSlot.InitData(addItemSlot);
+                ItemSlotUiList.Add(newItemSlot);
+            }
+        }
+
+        private void RemoveItem(ItemSlot removeItemSlot)
+        {
+            var existingItemSlotUi = ItemSlotUiList.Find(i => i.ItemSlot.Idx == removeItemSlot.Idx);
+            if (existingItemSlotUi != null)
+            {
+                existingItemSlotUi.UpdateData(removeItemSlot);
+                if (existingItemSlotUi.ItemSlot.Count <= 0)
+                {
+                    ItemSlotUiList.Remove(existingItemSlotUi);
+                    Destroy(existingItemSlotUi.gameObject);
+                }
+            }
+        }
+
+        public void SelectAll()
+        {
+            foreach (var element in ItemSlotUiList)
+            {
+                element.ToggleOn();
+            }
+        }
+
+        public void DeselectAll()
+        {
+            foreach (var element in ItemSlotUiList)
+            {
+                element.ToggleOff();
+            }
+        }
+
+        public void DiscardButton()
+        {
+            selectedList.Clear();
+            foreach (var element in ItemSlotUiList)
+            {
+                if (!element.ToggleIsOn) continue;
+
+                selectedList.Add(element);
+            }
+
+            if (selectedList.Count == 1)
+            {
+                UiManager.Inst.CurrentDiscardPopupUi.DiscardMessage(selectedList[0]);
+            }
+            else if (selectedList.Count > 1)
+            {
+                UiManager.Inst.CurrentDiscardPopupUi.DiscardAllMessage(selectedList);
+            }
+        }
+
+        public void SortButton()
+        {
+            if (sortingDropdown.value == 0) return;
+            
+            inventory.SortItem((InventorySortingType)sortingDropdown.value);
+            SortItemSlotUi((InventorySortingType)sortingDropdown.value);
+
+            sortingDropdown.value = 0;
+        }
+        
+        private void SortItemSlotUi(InventorySortingType sortingType)
+        {
+            switch (sortingType)
+            {
+                case InventorySortingType.NONE:
+                    return;
+                case InventorySortingType.RECENT:
+                    ItemSlotUiList.Sort((x, y) => y.ItemSlot.AcquisitionTime.CompareTo(x.ItemSlot.AcquisitionTime));
+                    break;
+                case InventorySortingType.NAME:
+                    ItemSlotUiList.Sort((x, y) => string.Compare(ItemManager.Inst.ItemDictionary[x.ItemSlot.Idx].name, ItemManager.Inst.ItemDictionary[y.ItemSlot.Idx].name, StringComparison.Ordinal));
+                    break;
+                case InventorySortingType.CATEGORY:
+                    ItemSlotUiList.Sort((x, y) => ItemManager.Inst.ItemDictionary[x.ItemSlot.Idx].category.CompareTo(ItemManager.Inst.ItemDictionary[y.ItemSlot.Idx].category));
+                    break;
+                case InventorySortingType.QUANTITY:
+                    ItemSlotUiList.Sort((x, y) => y.ItemSlot.Count.CompareTo(x.ItemSlot.Count));
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+            
+            for (var i = 0; i < ItemSlotUiList.Count; i++)
+            {
+                ItemSlotUiList[i].transform.SetSiblingIndex(i);
+            }
+        }
+
+        public void SetActiveInventoryUi(bool value) => gameObject.SetActive(value);
+    }
+}

BlueWater/Assets/02.Scripts/Item/ItemInventoryUi.cs.meta

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

BlueWater/Assets/02.Scripts/Item/ItemManager.cs

@@ -0,0 +1,86 @@
+using System.Collections.Generic;
+using Sirenix.OdinInspector;
+using UnityEngine;
+
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    public class ItemManager : Singleton<ItemManager>
+    {
+        [SerializeField, Required] private GameObject oceanItemDropPrefab;
+        [SerializeField, Required] private GameObject fieldItemDropPrefab;
+        
+        [SerializeField] private List<Item> itemList;
+        public Dictionary<int, Item> ItemDictionary { get; private set; }
+
+        [SerializeField] private List<ItemDropTable> itemDropTableList;
+        public Dictionary<int, ItemDropTable> ItemDropTableDictionary { get; private set; }
+        
+        protected override void OnAwake()
+        {
+            base.OnAwake();
+            
+            Init();
+        }
+
+        private void Init()
+        {
+            ItemDictionary = new Dictionary<int, Item>(itemList.Count);
+            foreach (var element in itemList)
+            {
+                ItemDictionary.TryAdd(element.idx, element);
+            }
+
+            ItemDropTableDictionary = new Dictionary<int, ItemDropTable>(itemDropTableList.Count);
+            foreach (var element in itemDropTableList)
+            {
+                ItemDropTableDictionary.TryAdd(element.idx, element);
+            }
+        }
+
+        [Button("FromJson")]
+        private void LoadItemsFromJson()
+        {
+            var jsonFile = Resources.Load<TextAsset>("JSON/item_table");
+            var items = JsonHelper.FromJson<Item>(jsonFile.text);
+
+            foreach (var element in items)
+            {
+                itemList.Add(element);
+            }
+            
+            jsonFile = Resources.Load<TextAsset>("JSON/item_drop_table");
+            var itemDropTables = JsonHelper.FromJson<ItemDropTable>(jsonFile.text);
+
+            foreach (var element in itemDropTables)
+            {
+                itemDropTableList.Add(element);
+            }
+        }
+        
+        public void ItemDrop(int idx, Vector3 dropPosition)
+        {
+            var itemDropTable = ItemDropTableDictionary[idx];
+            var droppedItemList = itemDropTable.GetDroppedItemList();
+            foreach (var element in droppedItemList)
+            {
+                GameObject prefab = null;
+                if (itemDropTable.item_drop_type == ItemDropTable.ItemDropType.OCEAN)
+                {
+                    prefab = oceanItemDropPrefab;
+                }
+                else if (itemDropTable.item_drop_type == ItemDropTable.ItemDropType.FIELD)
+                {
+                    prefab = fieldItemDropPrefab;
+                }
+                var instantiateItem = Instantiate(prefab, dropPosition, Quaternion.identity);
+                instantiateItem.GetComponentInChildren<DropItemController>().Init(element);
+            }
+        }
+        
+        public void Acquire(ItemSlot itemSlot)
+        {
+            DataManager.Inst.CurrentInventory.AddItem(itemSlot);
+        }
+    }
+}

BlueWater/Assets/02.Scripts/Item/ItemManager.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 5f85bdd84486b7b45add3babe2b742ac

BlueWater/Assets/02.Scripts/Item/ItemSlot.cs

@@ -0,0 +1,47 @@
+using System;
+using UnityEngine;
+
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    [Serializable]
+    public class ItemSlot
+    {
+        [field: Tooltip("아이템 인덱스")]
+        [field: SerializeField] public int Idx { get; private set; }
+
+        [field: Tooltip("아이템 수량")]
+        [field: SerializeField] public int Count { get; set; }
+        
+        [field: Tooltip("아이템 수량")]
+        [field: SerializeField] public long AcquisitionTime { get; set; }
+        
+        public ItemSlot(int idx, int count)
+        {
+            Idx = idx;
+            Count = count;
+            AcquisitionTime = FormatDateTimeAsNumeric(DateTime.UtcNow);
+        }
+
+        public void AddItemCount(int count)
+        {
+            Count += count;
+            AcquisitionTime = FormatDateTimeAsNumeric(DateTime.UtcNow);
+        }
+
+        public void RemoveItemCount(int count)
+        {
+            Count -= count;
+            if (Count < 0)
+            {
+                Count = 0;
+            }
+        }
+        
+        private static long FormatDateTimeAsNumeric(DateTime dateTime)
+        {
+            var formattedDateTime = dateTime.ToString("yyyyMMddHHmmss");
+            return long.Parse(formattedDateTime);
+        }
+    }
+}

BlueWater/Assets/02.Scripts/Item/ItemSlotUi.cs

@@ -0,0 +1,40 @@
+using Sirenix.OdinInspector;
+using TMPro;
+using UnityEngine;
+using UnityEngine.UI;
+
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    public class ItemSlotUi : MonoBehaviour
+    {
+        [field: SerializeField] public ItemSlot ItemSlot { get; private set; }
+        [SerializeField, Required] private Toggle itemSelectToggle;
+        [SerializeField, Required] private Image image;
+        [SerializeField, Required] private TMP_Text nameText;
+        [SerializeField, Required] private TMP_Text weightText;
+        [SerializeField, Required] private TMP_Text countText;
+
+        public bool ToggleIsOn => itemSelectToggle.isOn;
+
+        public void InitData(ItemSlot itemSlot)
+        {
+            ItemSlot = itemSlot;
+
+            UpdateData(itemSlot);
+        }
+
+        public void UpdateData(ItemSlot itemSlot)
+        {
+            var item = ItemManager.Inst.ItemDictionary[itemSlot.Idx];
+            image.sprite = item.sprite;
+            nameText.text = item.name;
+            weightText.text = item.weight * ItemSlot.Count + "kg";
+            countText.text = "x" + ItemSlot.Count;
+        }
+
+        public void ToggleOn() => itemSelectToggle.isOn = true;
+        public void ToggleOff() => itemSelectToggle.isOn = false;
+        public void ClickToggle() => itemSelectToggle.isOn = !itemSelectToggle.isOn;
+    }
+}

BlueWater/Assets/02.Scripts/Item/ItemSlotUi.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 7af23fb3c5a90d6448e8c39bc969bdf1

BlueWater/Assets/02.Scripts/OceanUi.cs

@@ -19,8 +19,9 @@ namespace BlueWaterProject
         [field: SerializeField] public GameObject SpeedLines { get; set; }
 
         [field: SerializeField] public DropItemGroupController DropItemGroupController { get; set; }
-        
         [field: SerializeField] public WeatherUi WeatherUi { get; private set; }
+        [field: SerializeField] public ItemInventoryUi OceanItemInventoryUi { get; set; }
+        [field: SerializeField] public DiscardPopupUi DiscardPopupUi { get; set; }
         
         public Canvas MainCanvas { get; private set; }
         
@@ -52,8 +53,9 @@ namespace BlueWaterProject
             SpeedLines.SetActive(false);
 
             DropItemGroupController = MainCanvas.transform.Find("DropItemGroup").GetComponent<DropItemGroupController>();
-            
             WeatherUi = MainCanvas.transform.Find("WeatherUi").GetComponent<WeatherUi>();
+            OceanItemInventoryUi = MainCanvas.transform.Find("OceanItemInventoryUi").GetComponent<ItemInventoryUi>();
+            DiscardPopupUi = MainCanvas.transform.Find("DiscardPopupUi").GetComponent<DiscardPopupUi>();
 
             InstantiateUi = MainCanvas.transform.Find("InstantiateUi");
             if (!InstantiateUi)

BlueWater/Assets/02.Scripts/PlayerInventory.cs

@@ -5,22 +5,103 @@ using UnityEngine;
 // ReSharper disable once CheckNamespace
 namespace BlueWaterProject
 {
+    public enum InventorySortingType
+    {
+        NONE = 0,
+        RECENT,
+        NAME,
+        CATEGORY,
+        QUANTITY,
+    }
+    
     [Serializable]
     public class PlayerInventory
     {
-        [SerializeField] private List<InventoryItem> inventoryItemList = new();
+        [field: SerializeField] public List<ItemSlot> ItemSlotList { get; set; } = new();
+        [field: SerializeField] public float WeightLimit { get; set; } = float.PositiveInfinity;
+        [field: SerializeField] public float CurrentTotalWeight { get; set; }
+        [field: SerializeField] public bool IsOverWeight { get; set; }
+
+        public delegate void ChangeItemSlot(ItemSlot changeItemSlot, bool added);
+        public event ChangeItemSlot OnChangeItemSlot;
         
-        public void AddItem(Item item, int count)
+        public void AddItem(ItemSlot newItemSlot)
         {
-            var existingItem = inventoryItemList.Find(i => i.Item.name == item.name);
+            // 현재 인벤토리 내에 같은 idx인 아이템 찾기
+            var existingItemIdx = ItemSlotList.Find(i => i.Idx == newItemSlot.Idx);
             
-            if (existingItem != null)
+            // 같은 idx가 있으면, 갯수만 추가
+            // 같은 idx가 없으면, 리스트에 아이템 새로 추가
+            if (existingItemIdx != null)
             {
-                existingItem.Count += count;
+                existingItemIdx.AddItemCount(newItemSlot.Count);
             }
             else
             {
-                inventoryItemList.Add(new InventoryItem(item, count));
+                ItemSlotList.Add(newItemSlot);
+            }
+
+            // 추가된 아이템에 맞게 인벤토리 내의 무게 계산
+            CalculateInventoryWeight();
+            
+            // 인벤토리 UI에 업데이트
+            OnChangeItemSlot?.Invoke(newItemSlot, true);
+        }
+        
+        public void RemoveItem(ItemSlot removeItemSlot, int removeCount)
+        {
+            var existingItem = ItemSlotList.Find(i => i.Idx == removeItemSlot.Idx);
+            
+            if (existingItem != null)
+            {
+                existingItem.RemoveItemCount(removeCount);
+                if (existingItem.Count <= 0)
+                {
+                    ItemSlotList.Remove(existingItem);
+                }
+            }
+            else
+            {
+                Debug.Log("Item not found in inventory to remove.");
+            }
+
+            CalculateInventoryWeight();
+            OnChangeItemSlot?.Invoke(removeItemSlot, false);
+        }
+        
+        public void CalculateInventoryWeight()
+        {
+            CurrentTotalWeight = 0f;
+            
+            foreach (var element in ItemSlotList)
+            {
+                var elementWeight = ItemManager.Inst.ItemDictionary[element.Idx].weight;
+                CurrentTotalWeight += elementWeight * element.Count;
+            }
+            
+            IsOverWeight = CurrentTotalWeight >= WeightLimit;
+        }
+
+        public void SortItem(InventorySortingType sortingType)
+        {
+            switch (sortingType)
+            {
+                case InventorySortingType.NONE:
+                    return;
+                case InventorySortingType.RECENT:
+                    ItemSlotList.Sort((x, y) => y.AcquisitionTime.CompareTo(x.AcquisitionTime));
+                    break;
+                case InventorySortingType.NAME:
+                    ItemSlotList.Sort((x, y) => string.Compare(ItemManager.Inst.ItemDictionary[x.Idx].name, ItemManager.Inst.ItemDictionary[y.Idx].name, StringComparison.Ordinal));
+                    break;
+                case InventorySortingType.CATEGORY:
+                    ItemSlotList.Sort((x, y) => ItemManager.Inst.ItemDictionary[x.Idx].category.CompareTo(ItemManager.Inst.ItemDictionary[y.Idx].category));
+                    break;
+                case InventorySortingType.QUANTITY:
+                    ItemSlotList.Sort((x, y) => y.Count.CompareTo(x.Count));
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
             }
         }
     }

BlueWater/Assets/02.Scripts/Ui/DiscardPopupUi.cs

@@ -0,0 +1,88 @@
+using System.Collections.Generic;
+using Sirenix.OdinInspector;
+using TMPro;
+using UnityEngine;
+
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    public class DiscardPopupUi : MonoBehaviour
+    {
+        private enum RemoveType
+        {
+            NONE = 0,
+            SINGLE,
+            MULTI
+        }
+        
+        [SerializeField, Required] private TMP_Text contentText;
+        [SerializeField, Required] private TMP_Text countText;
+        [SerializeField, Required] private GameObject countSelectUi;
+
+        private List<ItemSlotUi> selectedList = new();
+        private int currentCount = 1;
+        private RemoveType removeType;
+
+        public void DiscardMessage(ItemSlotUi selectedSlot)
+        {
+            removeType = RemoveType.SINGLE;
+            selectedList.Clear();
+            selectedList.Add(selectedSlot);
+            contentText.text = ItemManager.Inst.ItemDictionary[selectedSlot.ItemSlot.Idx].name + "을(를) 버리시겠습니까?";
+            currentCount = 1;
+            countText.text = currentCount.ToString();
+            
+            countSelectUi.SetActive(true);
+            gameObject.SetActive(true);
+        }
+        
+        public void DiscardAllMessage(List<ItemSlotUi> selectedSlotList)
+        {
+            removeType = RemoveType.MULTI;
+            selectedList = new List<ItemSlotUi>(selectedSlotList);
+            contentText.text = "선택한 물품을 모두 버리시겠습니까?";
+            
+            countSelectUi.SetActive(false);
+            gameObject.SetActive(true);
+        }
+
+        public void CountDownButton()
+        {
+            currentCount--;
+            currentCount = Mathf.Clamp(currentCount, 1, selectedList[0].ItemSlot.Count);
+            countText.text = currentCount.ToString();
+        }
+        
+        public void CountUpButton()
+        {
+            currentCount++;
+            currentCount = Mathf.Clamp(currentCount , 1, selectedList[0].ItemSlot.Count);
+            countText.text = currentCount.ToString();
+        }
+
+        public void DiscardButton()
+        {
+            if (removeType == RemoveType.SINGLE)
+            {
+                DataManager.Inst.CurrentInventory.RemoveItem(selectedList[0].ItemSlot, currentCount);
+            }
+            else if (removeType == RemoveType.MULTI)
+            {
+                foreach (var element in selectedList)
+                {
+                    DataManager.Inst.CurrentInventory.RemoveItem(element.ItemSlot, element.ItemSlot.Count);
+                }
+            }
+            
+            CancelButton();
+        }
+        
+        public void CancelButton()
+        {
+            removeType = RemoveType.NONE;
+            selectedList.Clear();
+            countSelectUi.SetActive(false);
+            gameObject.SetActive(false);
+        }
+    }
+}

BlueWater/Assets/02.Scripts/Ui/DiscardPopupUi.cs.meta

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

BlueWater/Assets/02.Scripts/Ui/UiManager.cs

@@ -1,6 +1,7 @@
 using Doozy.Runtime.UIManager.Containers;
 using Sirenix.OdinInspector;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 
 
 // ReSharper disable once CheckNamespace
@@ -20,12 +21,25 @@ namespace BlueWaterProject
         [Title("Combat")] 
         public CombatUi CombatUi { get; set; }
         
+        public ItemInventoryUi CurrentItemInventoryUi { get; set; }
+        public DiscardPopupUi CurrentDiscardPopupUi { get; set; }
 
         private void Start()
         {
             CursorTextureChange();
 
             //RadarTargetInit();
+            
+            if (SceneManager.GetActiveScene().name == "02.Ocean")
+            {
+                CurrentItemInventoryUi = OceanUi.OceanItemInventoryUi;
+                CurrentDiscardPopupUi = OceanUi.DiscardPopupUi;
+            }
+            else if (SceneManager.GetActiveScene().name == "02.Combat_2D")
+            {
+                CurrentItemInventoryUi = CombatUi.CombatItemInventoryUi;
+                CurrentDiscardPopupUi = CombatUi.DiscardPopupUi;
+            }
         }
     
         private void CursorTextureChange()

BlueWater/Assets/02.Scripts/Utility/JsonHelper.cs

@@ -0,0 +1,22 @@
+using System;
+using UnityEngine;
+
+// ReSharper disable once CheckNamespace
+namespace BlueWaterProject
+{
+    public static class JsonHelper
+    {
+        public static T[] FromJson<T>(string json)
+        {
+            var newJson = "{ \"array\": " + json + "}";
+            var wrapper = JsonUtility.FromJson<Wrapper<T>>(newJson);
+            return wrapper.array;
+        }
+
+        [Serializable]
+        private class Wrapper<T>
+        {
+            public T[] array;
+        }
+    }
+}

BlueWater/Assets/02.Scripts/Utility/JsonHelper.cs.meta

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

BlueWater/Assets/03.Images/weight01.png.meta

@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 73957eba1cc2b2548a0e19fbfae910e0
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/03.Images/weight02.png.meta

@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 81a980dc0e34eed4b93169b0c56dd58d
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/03.Images/weight03.png.meta

@@ -0,0 +1,140 @@
+fileFormatVersion: 2
+guid: 2f500519a753f174996edea544d5b8f5
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/03.Materials/Skill/HammerSwing.mat

@@ -135,7 +135,7 @@ Material:
     - _DstBlend: 0
     - _DstBlendAlpha: 0
     - _EnvironmentReflections: 1
-    - _Fill: 0
+    - _Fill: 0.744
     - _GlossMapScale: 0
     - _Glossiness: 0
     - _GlossyReflections: 0

BlueWater/Assets/04.Fonts/Warhaven_OTF_Bold SDF.asset

@@ -10,10 +10,8 @@ Texture2D:
   m_ImageContentsHash:
     serializedVersion: 2
     Hash: 00000000000000000000000000000000
-  m_ForcedFallbackFormat: 4
-  m_DownscaleFallback: 0
   m_IsAlphaChannelOptional: 0
-  serializedVersion: 2
+  serializedVersion: 3
   m_Width: 4096
   m_Height: 4096
   m_CompleteImageSize: 16777216
@@ -60,15 +58,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
   m_Name: Warhaven_OTF_Bold SDF
   m_EditorClassIdentifier: 
-  hashCode: -452106887
-  material: {fileID: 2356238409700980164}
-  materialHashCode: -1241048263
   m_Version: 1.1.0
-  m_SourceFontFileGUID: ca9494c57744841448704ea26a49d46d
-  m_SourceFontFile_EditorRef: {fileID: 12800000, guid: ca9494c57744841448704ea26a49d46d,
-    type: 3}
-  m_SourceFontFile: {fileID: 0}
-  m_AtlasPopulationMode: 0
   m_FaceInfo:
     m_FaceIndex: 0
     m_FamilyName: Warhaven OTF
@@ -91,6 +81,31 @@ MonoBehaviour:
     m_StrikethroughOffset: 6.8
     m_StrikethroughThickness: 0
     m_TabWidth: 7
+  m_Material: {fileID: 2356238409700980164}
+  m_SourceFontFileGUID: ca9494c57744841448704ea26a49d46d
+  m_CreationSettings:
+    sourceFontFileName: 
+    sourceFontFileGUID: ca9494c57744841448704ea26a49d46d
+    faceIndex: 0
+    pointSizeSamplingMode: 0
+    pointSize: 30
+    padding: 5
+    paddingMode: 0
+    packingMode: 0
+    atlasWidth: 4096
+    atlasHeight: 4096
+    characterSetSelectionMode: 5
+    characterSequence: 32-126, 44032-55215
+    referencedFontAssetGUID: 
+    referencedTextAssetGUID: 
+    fontStyle: 0
+    fontStyleModifier: 0
+    renderMode: 4165
+    includeFontFeatures: 0
+  m_SourceFontFile: {fileID: 0}
+  m_SourceFontFilePath: 
+  m_AtlasPopulationMode: 0
+  InternalDynamicOS: 0
   m_GlyphTable:
   - m_Index: 1
     m_Metrics:
@@ -214170,7 +214185,12 @@ MonoBehaviour:
   - {fileID: -6341607768640371147}
   m_AtlasTextureIndex: 0
   m_IsMultiAtlasTexturesEnabled: 0
+  m_GetFontFeatures: 1
   m_ClearDynamicDataOnBuild: 0
+  m_AtlasWidth: 4096
+  m_AtlasHeight: 4096
+  m_AtlasPadding: 5
+  m_AtlasRenderMode: 4165
   m_UsedGlyphRects:
   - m_X: 0
     m_Y: 0
@@ -260705,57 +260725,14 @@ MonoBehaviour:
     m_Y: 3735
     m_Width: 648
     m_Height: 190
-  m_fontInfo:
-    Name: 
-    PointSize: 0
-    Scale: 0
-    CharacterCount: 0
-    LineHeight: 0
-    Baseline: 0
-    Ascender: 0
-    CapHeight: 0
-    Descender: 0
-    CenterLine: 0
-    SuperscriptOffset: 0
-    SubscriptOffset: 0
-    SubSize: 0
-    Underline: 0
-    UnderlineThickness: 0
-    strikethrough: 0
-    strikethroughThickness: 0
-    TabWidth: 0
-    Padding: 0
-    AtlasWidth: 0
-    AtlasHeight: 0
-  atlas: {fileID: 0}
-  m_AtlasWidth: 4096
-  m_AtlasHeight: 4096
-  m_AtlasPadding: 5
-  m_AtlasRenderMode: 4165
-  m_glyphInfoList: []
-  m_KerningTable:
-    kerningPairs: []
   m_FontFeatureTable:
+    m_MultipleSubstitutionRecords: []
+    m_LigatureSubstitutionRecords: []
     m_GlyphPairAdjustmentRecords: []
-  fallbackFontAssets: []
+    m_MarkToBaseAdjustmentRecords: []
+    m_MarkToMarkAdjustmentRecords: []
+  m_ShouldReimportFontFeatures: 0
   m_FallbackFontAssetTable: []
-  m_CreationSettings:
-    sourceFontFileName: 
-    sourceFontFileGUID: ca9494c57744841448704ea26a49d46d
-    pointSizeSamplingMode: 0
-    pointSize: 30
-    padding: 5
-    packingMode: 0
-    atlasWidth: 4096
-    atlasHeight: 4096
-    characterSetSelectionMode: 5
-    characterSequence: 32-126, 44032-55215
-    referencedFontAssetGUID: 
-    referencedTextAssetGUID: 
-    fontStyle: 0
-    fontStyleModifier: 0
-    renderMode: 4165
-    includeFontFeatures: 0
   m_FontWeightTable:
   - regularTypeface: {fileID: 0}
     italicTypeface: {fileID: 0}
@@ -260784,6 +260761,33 @@ MonoBehaviour:
   boldSpacing: 7
   italicStyle: 35
   tabSize: 10
+  m_fontInfo:
+    Name: 
+    PointSize: 0
+    Scale: 0
+    CharacterCount: 0
+    LineHeight: 0
+    Baseline: 0
+    Ascender: 0
+    CapHeight: 0
+    Descender: 0
+    CenterLine: 0
+    SuperscriptOffset: 0
+    SubscriptOffset: 0
+    SubSize: 0
+    Underline: 0
+    UnderlineThickness: 0
+    strikethrough: 0
+    strikethroughThickness: 0
+    TabWidth: 0
+    Padding: 0
+    AtlasWidth: 0
+    AtlasHeight: 0
+  m_glyphInfoList: []
+  m_KerningTable:
+    kerningPairs: []
+  fallbackFontAssets: []
+  atlas: {fileID: 0}
 --- !u!21 &2356238409700980164
 Material:
   serializedVersion: 8
@@ -260868,8 +260872,8 @@ Material:
     - _Stencil: 0
     - _StencilComp: 8
     - _StencilOp: 0
-    - _StencilReadMask: 255
-    - _StencilWriteMask: 255
+    - _StencilReadMask: 1
+    - _StencilWriteMask: 0
     - _TextureHeight: 4096
     - _TextureWidth: 4096
     - _UnderlayDilate: 0
@@ -260892,3 +260896,4 @@ Material:
     - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
     - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

BlueWater/Assets/05.Prefabs/Boids/Boid/HammerheadShark.prefab

@@ -134,9 +134,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b5a4bdb4c510d354687a785c3f642878, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  <DropItemTable>k__BackingField: {fileID: 11400000, guid: c51eff58445ec1e46ab8087108f66d18,
-    type: 2}
-  <RandomCount>k__BackingField: {x: 10, y: 1}
+  <ItemDropTableIdx>k__BackingField: 1000002
   obstacleDistance: 10
   viewAngle: 120
   maxNeighbourCount: 10

BlueWater/Assets/05.Prefabs/Boids/Boid/Mackerel.prefab

@@ -46,9 +46,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b5a4bdb4c510d354687a785c3f642878, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  <DropItemTable>k__BackingField: {fileID: 11400000, guid: 06a066700640ea048830e1eb2f1881cd,
-    type: 2}
-  <RandomCount>k__BackingField: {x: 1, y: 4}
+  <ItemDropTableIdx>k__BackingField: 1000001
   obstacleDistance: 10
   viewAngle: 120
   maxNeighbourCount: 10

BlueWater/Assets/05.Prefabs/Boids/Boid/Stingray.prefab

@@ -46,9 +46,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b5a4bdb4c510d354687a785c3f642878, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  <DropItemTable>k__BackingField: {fileID: 11400000, guid: a526734a70dfd254e8ecb570e1474540,
-    type: 2}
-  <RandomCount>k__BackingField: {x: 5, y: 7}
+  <ItemDropTableIdx>k__BackingField: 1000003
   obstacleDistance: 10
   viewAngle: 120
   maxNeighbourCount: 10

BlueWater/Assets/05.Prefabs/Characters/Enemies/RedOrc1.prefab

@@ -3292,6 +3292,7 @@ MonoBehaviour:
   <IsCombated>k__BackingField: 0
   <BeAttackedInIdle>k__BackingField: 0
   beAttacked: 0
+  <ItemDropTableIdx>k__BackingField: 3000001
   <ViewRadius>k__BackingField: 15
   <Targets>k__BackingField:
   - {fileID: 0}

BlueWater/Assets/05.Prefabs/Items/DiscardPopupUi.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3e821daa41aac7d47b39f8cfebac29d0
+guid: 69cc62c186ba8fe44af29df72fb672ce
 PrefabImporter:
   externalObjects: {}
   userData: 

BlueWater/Assets/05.Prefabs/Items/Drop/DropItem.prefab

@@ -1,223 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &1733947209264972765
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6499268732264954890}
-  - component: {fileID: 8975262077732393561}
-  m_Layer: 0
-  m_Name: Audio
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &6499268732264954890
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1733947209264972765}
-  serializedVersion: 2
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 726335702565593345}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!82 &8975262077732393561
-AudioSource:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1733947209264972765}
-  m_Enabled: 1
-  serializedVersion: 4
-  OutputAudioMixerGroup: {fileID: 0}
-  m_audioClip: {fileID: 8300000, guid: de54536a55703434b8ad53b9a7da3d35, type: 3}
-  m_Resource: {fileID: 8300000, guid: de54536a55703434b8ad53b9a7da3d35, type: 3}
-  m_PlayOnAwake: 0
-  m_Volume: 1
-  m_Pitch: 1
-  Loop: 0
-  Mute: 0
-  Spatialize: 0
-  SpatializePostEffects: 0
-  Priority: 128
-  DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
-  Pan2D: 0
-  rolloffMode: 0
-  BypassEffects: 0
-  BypassListenerEffects: 0
-  BypassReverbZones: 0
-  rolloffCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    - serializedVersion: 3
-      time: 1
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  panLevelCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  spreadCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  reverbZoneMixCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
---- !u!1 &4185765918994780331
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 726335702565593345}
-  m_Layer: 0
-  m_Name: DropItem
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &726335702565593345
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4185765918994780331}
-  serializedVersion: 2
-  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_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 816226554442943762}
-  - {fileID: 6499268732264954890}
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &7996128800962867104
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 816226554442943762}
-  - component: {fileID: 1871283123640341369}
-  m_Layer: 21
-  m_Name: DropItemController
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &816226554442943762
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7996128800962867104}
-  serializedVersion: 2
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 726335702565593345}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1871283123640341369
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7996128800962867104}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e474579c3021c964cb86b13cbec28e89, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  spriteRenderer: {fileID: 0}
-  audioSource: {fileID: 8975262077732393561}
-  itemUiPrefab: {fileID: 3090447943159425444, guid: 0d213e978cd398441bcd61573163ca16,
-    type: 3}
-  pointingArrowUiPrefab: {fileID: 3183496459896387822, guid: 71ca57d34077f5d4492c5d47fb465d59,
-    type: 3}
-  arrowOffset: 10
-  useAutoDestroy: 0
-  autoDestroyTime: 30
-  drawGizmos: 1
-  radius: 15
-  acquisitionTime: 1.5
-  targetLayer:
-    serializedVersion: 2
-    m_Bits: 512

BlueWater/Assets/05.Prefabs/Items/Drop/FieldItemDrop.prefab

@@ -139,7 +139,7 @@ GameObject:
   m_Component:
   - component: {fileID: 726335702565593345}
   m_Layer: 0
-  m_Name: FieldDropItem
+  m_Name: FieldItemDrop
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

BlueWater/Assets/05.Prefabs/Items/Drop/OceanItemDrop.prefab

@@ -139,7 +139,7 @@ GameObject:
   m_Component:
   - component: {fileID: 726335702565593345}
   m_Layer: 0
-  m_Name: FishDropItem
+  m_Name: OceanItemDrop
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

BlueWater/Assets/05.Prefabs/Items/Drop/OceanPropsDropItem.prefab

@@ -1,223 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &1733947209264972765
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6499268732264954890}
-  - component: {fileID: 8975262077732393561}
-  m_Layer: 0
-  m_Name: Audio
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &6499268732264954890
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1733947209264972765}
-  serializedVersion: 2
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 726335702565593345}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!82 &8975262077732393561
-AudioSource:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1733947209264972765}
-  m_Enabled: 1
-  serializedVersion: 4
-  OutputAudioMixerGroup: {fileID: 0}
-  m_audioClip: {fileID: 8300000, guid: de54536a55703434b8ad53b9a7da3d35, type: 3}
-  m_Resource: {fileID: 8300000, guid: de54536a55703434b8ad53b9a7da3d35, type: 3}
-  m_PlayOnAwake: 0
-  m_Volume: 1
-  m_Pitch: 1
-  Loop: 0
-  Mute: 0
-  Spatialize: 0
-  SpatializePostEffects: 0
-  Priority: 128
-  DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
-  Pan2D: 0
-  rolloffMode: 0
-  BypassEffects: 0
-  BypassListenerEffects: 0
-  BypassReverbZones: 0
-  rolloffCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    - serializedVersion: 3
-      time: 1
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  panLevelCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  spreadCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  reverbZoneMixCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
---- !u!1 &4185765918994780331
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 726335702565593345}
-  m_Layer: 0
-  m_Name: OceanPropsDropItem
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &726335702565593345
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4185765918994780331}
-  serializedVersion: 2
-  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_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 816226554442943762}
-  - {fileID: 6499268732264954890}
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &7996128800962867104
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 816226554442943762}
-  - component: {fileID: 1871283123640341369}
-  m_Layer: 21
-  m_Name: DropItemController
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &816226554442943762
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7996128800962867104}
-  serializedVersion: 2
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 726335702565593345}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1871283123640341369
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7996128800962867104}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e474579c3021c964cb86b13cbec28e89, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  spriteRenderer: {fileID: 0}
-  audioSource: {fileID: 8975262077732393561}
-  itemUiPrefab: {fileID: 3090447943159425444, guid: 0d213e978cd398441bcd61573163ca16,
-    type: 3}
-  pointingArrowUiPrefab: {fileID: 3183496459896387822, guid: 71ca57d34077f5d4492c5d47fb465d59,
-    type: 3}
-  arrowOffset: 10
-  useAutoDestroy: 0
-  autoDestroyTime: 30
-  drawGizmos: 1
-  radius: 15
-  acquisitionTime: 1.5
-  targetLayer:
-    serializedVersion: 2
-    m_Bits: 512

BlueWater/Assets/05.Prefabs/Items/DropItemGroup.prefab

@@ -886,7 +886,7 @@ MonoBehaviour:
   m_BlockingObjects: 0
   m_BlockingMask:
     serializedVersion: 2
-    m_Bits: 2187568767
+    m_Bits: 2183374463
 --- !u!114 &1056168417308380869
 MonoBehaviour:
   m_ObjectHideFlags: 0

BlueWater/Assets/05.Prefabs/Items/ItemInventoryUi.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cded349812c1d624d9cc649e63d1b868
+guid: d96bf988529067d4383a3a91281636c7
 PrefabImporter:
   externalObjects: {}
   userData: 

BlueWater/Assets/05.Prefabs/Items/ItemSlotUi.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: d329a78ae6fd1bb43b1c4cfd0e09f745
-DefaultImporter:
+guid: 9a52cdb9161f87943b721aeba961ac50
+PrefabImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/Barrels/Barrel.prefab

@@ -438,8 +438,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9b69f7e57a6e2a641936534835f324ea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  <DropItemTable>k__BackingField: {fileID: 11400000, guid: 05eadc282e9d88f4394eee3679190a71,
-    type: 2}
+  <ItemDropTableIdx>k__BackingField: 2000001
   <Strength>k__BackingField: 50
   power: 10
   damageCooldown: 2

BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/Barrels/BigBarrel.prefab

@@ -105,6 +105,11 @@ PrefabInstance:
       value: 
       objectReference: {fileID: 11400000, guid: 0cbd0ef58813bb848a45b92be06ede0a,
         type: 2}
+    - target: {fileID: 6133121076405265868, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6,
+        type: 3}
+      propertyPath: <ItemDropTableIdx>k__BackingField
+      value: 2000002
+      objectReference: {fileID: 0}
     - target: {fileID: 6133121076405265868, guid: e1e9d8e539bb53c4baa0bfd2ca4113e6,
         type: 3}
       propertyPath: itemInfo.<ItemCount>k__BackingField

BlueWater/Assets/11.MuseResource/carrot.asset

@@ -0,0 +1,890 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a6b9796d1c0440eba061ace5e9dff6, type: 3}
+  m_Name: carrot
+  m_EditorClassIdentifier: 
+  assetsData:
+  - rid: 5746642013497065609
+  - rid: 5746642013497065617
+  - rid: 5746642013497065624
+  - rid: 5746642013497065631
+  - rid: 5746642013497065638
+  - rid: 5746642013497065645
+  - rid: 5746642013497065652
+  - rid: 5746642013497065659
+  currentMode: TextToSprite
+  m_Data:
+  - rid: 5746642013497065597
+  - rid: 5746642013497065598
+  - rid: 5746642013497065599
+  - rid: 5746642013497065600
+  - rid: 5746642013497065601
+  - rid: 5746642013497065602
+  - rid: 5746642013497065610
+  preRefinedArtifact:
+    rid: -2
+  refinedArtifact:
+    rid: -2
+  selectedArtifact:
+    rid: -2
+  m_Operators:
+  - rid: 5746642013497065603
+  - rid: 5746642013497065604
+  - rid: 5746642013497065605
+  - rid: 5746642013497065606
+  - rid: 5746642013497065607
+  - rid: 5746642013497065608
+  m_PreRefineOperators: []
+  m_ExportedArtifacts: []
+  references:
+    version: 2
+    RefIds:
+    - rid: -2
+      type: {class: , ns: , asm: }
+    - rid: 5746642013497065597
+      type: {class: FeedbackManager, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data:
+        m_Liked:
+          m_Values: []
+        m_Disliked:
+          m_Values: []
+    - rid: 5746642013497065598
+      type: {class: DefaultStyleData, ns: Unity.Muse.Sprite.Data, asm: Unity.Muse.Sprite}
+      data: 
+    - rid: 5746642013497065599
+      type: {class: GenerateButtonData, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data: 
+    - rid: 5746642013497065600
+      type: {class: MainUI/UISize, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data:
+        m_NodeListWidth: 300
+        m_NodeListRefineWidth: 300
+        m_AssetListRefineWidth: 200
+    - rid: 5746642013497065601
+      type: {class: SessionData, ns: Unity.Muse.Sprite.Data, asm: Unity.Muse.Sprite}
+      data:
+        m_SessionId: 81953490-e269-4577-8389-618e992dd50e
+        sessionLoaded: 
+    - rid: 5746642013497065602
+      type: {class: BookmarkManager, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data:
+        m_BookmarkedArtifacts:
+          m_Values: []
+        m_IsFilterEnabled: 0
+    - rid: 5746642013497065603
+      type: {class: GenerateOperator, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data:
+        m_OperatorData:
+          type: GenerateOperator
+          version: 0.0.1
+          settings:
+          - TextToSprite
+          - 4
+          enabled: 1
+          assembly: 
+    - rid: 5746642013497065604
+      type: {class: PromptOperator, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data:
+        m_OperatorData:
+          type: PromptOperator
+          version: 0.0.2
+          settings:
+          - 2d pixel carrot
+          - 
+          enabled: 1
+          assembly: 
+    - rid: 5746642013497065605
+      type: {class: SpriteGeneratorSettingsOperator, ns: Unity.Muse.Sprite.Operators,
+        asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.SpriteGeneratorSettingsOperator
+          version: 0.0.1
+          settings:
+          - 
+          - 
+          - 0.85
+          - 512
+          - 512
+          - 1
+          - 1
+          - 61028
+          - 0
+          - 0
+          - 5cc104e0-423a-473e-8034-b9d346cb2357
+          - 0
+          - 0
+          - 
+          - 
+          - 
+          enabled: 1
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065606
+      type: {class: KeyImageOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.KeyImageOperator
+          version: 0.0.1
+          settings:
+          - 
+          - 
+          - True
+          - 512
+          - 512
+          - 0.5
+          enabled: 1
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065607
+      type: {class: SpriteRefiningMaskOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data: 
+    - rid: 5746642013497065608
+      type: {class: SessionOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.SessionOperator
+          version: 0.0.1
+          settings:
+          - 81953490-e269-4577-8389-618e992dd50e
+          enabled: 0
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065609
+      type: {class: SpriteMuseArtifact, ns: Unity.Muse.Sprite.Artifacts, asm: Unity.Muse.Sprite}
+      data:
+        Guid: 96dc757c-c354-4a3d-922b-43aadb14db07
+        Seed: 108
+        m_Operators:
+        - rid: 5746642013497065611
+        - rid: 5746642013497065612
+        - rid: 5746642013497065613
+        - rid: 5746642013497065614
+        - rid: 5746642013497065615
+        - rid: 5746642013497065616
+        history:
+        - rid: 5746642013497065609
+        m_UnsafeContent: 1
+    - rid: 5746642013497065610
+      type: {class: GenerateCountData, ns: Unity.Muse.Sprite.Data, asm: Unity.Muse.Sprite}
+      data:
+        m_Counter: 0
+    - rid: 5746642013497065611
+      type: {class: GenerateOperator, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data:
+        m_OperatorData:
+          type: GenerateOperator
+          version: 0.0.1
+          settings:
+          - TextToSprite
+          - 4
+          enabled: 1
+          assembly: 
+    - rid: 5746642013497065612
+      type: {class: PromptOperator, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data:
+        m_OperatorData:
+          type: PromptOperator
+          version: 0.0.2
+          settings:
+          - carrot
+          - 
+          enabled: 1
+          assembly: 
+    - rid: 5746642013497065613
+      type: {class: SpriteGeneratorSettingsOperator, ns: Unity.Muse.Sprite.Operators,
+        asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.SpriteGeneratorSettingsOperator
+          version: 0.0.1
+          settings:
+          - 
+          - 
+          - 0.85
+          - 512
+          - 512
+          - 1
+          - 1
+          - 108
+          - 96dc757c-c354-4a3d-922b-43aadb14db07
+          - 0
+          - 5cc104e0-423a-473e-8034-b9d346cb2357
+          - 0
+          - 03fa404b-39fc-4979-9272-deb5d8c4b24c
+          - 'Happy Harvest [Orion V4 2000]'
+          - 8 Nov 2023
+          - 
+          enabled: 1
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065614
+      type: {class: KeyImageOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.KeyImageOperator
+          version: 0.0.1
+          settings:
+          - 
+          - 
+          - True
+          - 512
+          - 512
+          - 0.5
+          enabled: 1
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065615
+      type: {class: SpriteRefiningMaskOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data: 
+    - rid: 5746642013497065616
+      type: {class: SessionOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.SessionOperator
+          version: 0.0.1
+          settings:
+          - 81953490-e269-4577-8389-618e992dd50e
+          enabled: 0
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065617
+      type: {class: SpriteMuseArtifact, ns: Unity.Muse.Sprite.Artifacts, asm: Unity.Muse.Sprite}
+      data:
+        Guid: cdc00d6d-573a-4915-ac40-582907252954
+        Seed: 35089
+        m_Operators:
+        - rid: 5746642013497065618
+        - rid: 5746642013497065619
+        - rid: 5746642013497065620
+        - rid: 5746642013497065621
+        - rid: 5746642013497065622
+        - rid: 5746642013497065623
+        history:
+        - rid: 5746642013497065617
+        m_UnsafeContent: 0
+    - rid: 5746642013497065618
+      type: {class: GenerateOperator, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data:
+        m_OperatorData:
+          type: GenerateOperator
+          version: 0.0.1
+          settings:
+          - TextToSprite
+          - 4
+          enabled: 1
+          assembly: 
+    - rid: 5746642013497065619
+      type: {class: PromptOperator, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data:
+        m_OperatorData:
+          type: PromptOperator
+          version: 0.0.2
+          settings:
+          - carrot
+          - 
+          enabled: 1
+          assembly: 
+    - rid: 5746642013497065620
+      type: {class: SpriteGeneratorSettingsOperator, ns: Unity.Muse.Sprite.Operators,
+        asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.SpriteGeneratorSettingsOperator
+          version: 0.0.1
+          settings:
+          - 
+          - 
+          - 0.85
+          - 512
+          - 512
+          - 1
+          - 1
+          - 35089
+          - cdc00d6d-573a-4915-ac40-582907252954
+          - 0
+          - 5cc104e0-423a-473e-8034-b9d346cb2357
+          - 0
+          - 03fa404b-39fc-4979-9272-deb5d8c4b24c
+          - 'Happy Harvest [Orion V4 2000]'
+          - 8 Nov 2023
+          - 
+          enabled: 1
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065621
+      type: {class: KeyImageOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.KeyImageOperator
+          version: 0.0.1
+          settings:
+          - 
+          - 
+          - True
+          - 512
+          - 512
+          - 0.5
+          enabled: 1
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065622
+      type: {class: SpriteRefiningMaskOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data: 
+    - rid: 5746642013497065623
+      type: {class: SessionOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.SessionOperator
+          version: 0.0.1
+          settings:
+          - 81953490-e269-4577-8389-618e992dd50e
+          enabled: 0
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065624
+      type: {class: SpriteMuseArtifact, ns: Unity.Muse.Sprite.Artifacts, asm: Unity.Muse.Sprite}
+      data:
+        Guid: 2ba45465-5d7d-47f6-8b27-ebe075822885
+        Seed: 60372
+        m_Operators:
+        - rid: 5746642013497065625
+        - rid: 5746642013497065626
+        - rid: 5746642013497065627
+        - rid: 5746642013497065628
+        - rid: 5746642013497065629
+        - rid: 5746642013497065630
+        history:
+        - rid: 5746642013497065624
+        m_UnsafeContent: 1
+    - rid: 5746642013497065625
+      type: {class: GenerateOperator, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data:
+        m_OperatorData:
+          type: GenerateOperator
+          version: 0.0.1
+          settings:
+          - TextToSprite
+          - 4
+          enabled: 1
+          assembly: 
+    - rid: 5746642013497065626
+      type: {class: PromptOperator, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data:
+        m_OperatorData:
+          type: PromptOperator
+          version: 0.0.2
+          settings:
+          - carrot
+          - 
+          enabled: 1
+          assembly: 
+    - rid: 5746642013497065627
+      type: {class: SpriteGeneratorSettingsOperator, ns: Unity.Muse.Sprite.Operators,
+        asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.SpriteGeneratorSettingsOperator
+          version: 0.0.1
+          settings:
+          - 
+          - 
+          - 0.85
+          - 512
+          - 512
+          - 1
+          - 1
+          - 60372
+          - 2ba45465-5d7d-47f6-8b27-ebe075822885
+          - 0
+          - 5cc104e0-423a-473e-8034-b9d346cb2357
+          - 0
+          - 03fa404b-39fc-4979-9272-deb5d8c4b24c
+          - 'Happy Harvest [Orion V4 2000]'
+          - 8 Nov 2023
+          - 
+          enabled: 1
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065628
+      type: {class: KeyImageOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.KeyImageOperator
+          version: 0.0.1
+          settings:
+          - 
+          - 
+          - True
+          - 512
+          - 512
+          - 0.5
+          enabled: 1
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065629
+      type: {class: SpriteRefiningMaskOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data: 
+    - rid: 5746642013497065630
+      type: {class: SessionOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.SessionOperator
+          version: 0.0.1
+          settings:
+          - 81953490-e269-4577-8389-618e992dd50e
+          enabled: 0
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065631
+      type: {class: SpriteMuseArtifact, ns: Unity.Muse.Sprite.Artifacts, asm: Unity.Muse.Sprite}
+      data:
+        Guid: 2891ecf8-81ea-4e77-85d4-0112de5263ec
+        Seed: 15983
+        m_Operators:
+        - rid: 5746642013497065632
+        - rid: 5746642013497065633
+        - rid: 5746642013497065634
+        - rid: 5746642013497065635
+        - rid: 5746642013497065636
+        - rid: 5746642013497065637
+        history:
+        - rid: 5746642013497065631
+        m_UnsafeContent: 1
+    - rid: 5746642013497065632
+      type: {class: GenerateOperator, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data:
+        m_OperatorData:
+          type: GenerateOperator
+          version: 0.0.1
+          settings:
+          - TextToSprite
+          - 4
+          enabled: 1
+          assembly: 
+    - rid: 5746642013497065633
+      type: {class: PromptOperator, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data:
+        m_OperatorData:
+          type: PromptOperator
+          version: 0.0.2
+          settings:
+          - carrot
+          - 
+          enabled: 1
+          assembly: 
+    - rid: 5746642013497065634
+      type: {class: SpriteGeneratorSettingsOperator, ns: Unity.Muse.Sprite.Operators,
+        asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.SpriteGeneratorSettingsOperator
+          version: 0.0.1
+          settings:
+          - 
+          - 
+          - 0.85
+          - 512
+          - 512
+          - 1
+          - 1
+          - 15983
+          - 2891ecf8-81ea-4e77-85d4-0112de5263ec
+          - 0
+          - 5cc104e0-423a-473e-8034-b9d346cb2357
+          - 0
+          - 03fa404b-39fc-4979-9272-deb5d8c4b24c
+          - 'Happy Harvest [Orion V4 2000]'
+          - 8 Nov 2023
+          - 
+          enabled: 1
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065635
+      type: {class: KeyImageOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.KeyImageOperator
+          version: 0.0.1
+          settings:
+          - 
+          - 
+          - True
+          - 512
+          - 512
+          - 0.5
+          enabled: 1
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065636
+      type: {class: SpriteRefiningMaskOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data: 
+    - rid: 5746642013497065637
+      type: {class: SessionOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.SessionOperator
+          version: 0.0.1
+          settings:
+          - 81953490-e269-4577-8389-618e992dd50e
+          enabled: 0
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065638
+      type: {class: SpriteMuseArtifact, ns: Unity.Muse.Sprite.Artifacts, asm: Unity.Muse.Sprite}
+      data:
+        Guid: 17af6fb4-12f6-443b-b55e-e256929f272d
+        Seed: 51225
+        m_Operators:
+        - rid: 5746642013497065639
+        - rid: 5746642013497065640
+        - rid: 5746642013497065641
+        - rid: 5746642013497065642
+        - rid: 5746642013497065643
+        - rid: 5746642013497065644
+        history:
+        - rid: 5746642013497065638
+        m_UnsafeContent: 1
+    - rid: 5746642013497065639
+      type: {class: GenerateOperator, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data:
+        m_OperatorData:
+          type: GenerateOperator
+          version: 0.0.1
+          settings:
+          - TextToSprite
+          - 4
+          enabled: 1
+          assembly: 
+    - rid: 5746642013497065640
+      type: {class: PromptOperator, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data:
+        m_OperatorData:
+          type: PromptOperator
+          version: 0.0.2
+          settings:
+          - 2d pixel carrot
+          - 
+          enabled: 1
+          assembly: 
+    - rid: 5746642013497065641
+      type: {class: SpriteGeneratorSettingsOperator, ns: Unity.Muse.Sprite.Operators,
+        asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.SpriteGeneratorSettingsOperator
+          version: 0.0.1
+          settings:
+          - 
+          - 
+          - 0.85
+          - 512
+          - 512
+          - 1
+          - 1
+          - 51225
+          - 17af6fb4-12f6-443b-b55e-e256929f272d
+          - 0
+          - 5cc104e0-423a-473e-8034-b9d346cb2357
+          - 0
+          - 03fa404b-39fc-4979-9272-deb5d8c4b24c
+          - 'Happy Harvest [Orion V4 2000]'
+          - 8 Nov 2023
+          - 
+          enabled: 1
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065642
+      type: {class: KeyImageOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.KeyImageOperator
+          version: 0.0.1
+          settings:
+          - 
+          - 
+          - True
+          - 512
+          - 512
+          - 0.5
+          enabled: 1
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065643
+      type: {class: SpriteRefiningMaskOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data: 
+    - rid: 5746642013497065644
+      type: {class: SessionOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.SessionOperator
+          version: 0.0.1
+          settings:
+          - 81953490-e269-4577-8389-618e992dd50e
+          enabled: 0
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065645
+      type: {class: SpriteMuseArtifact, ns: Unity.Muse.Sprite.Artifacts, asm: Unity.Muse.Sprite}
+      data:
+        Guid: 08e1803e-dfe6-4527-a735-b9face6069ad
+        Seed: 25046
+        m_Operators:
+        - rid: 5746642013497065646
+        - rid: 5746642013497065647
+        - rid: 5746642013497065648
+        - rid: 5746642013497065649
+        - rid: 5746642013497065650
+        - rid: 5746642013497065651
+        history:
+        - rid: 5746642013497065645
+        m_UnsafeContent: 1
+    - rid: 5746642013497065646
+      type: {class: GenerateOperator, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data:
+        m_OperatorData:
+          type: GenerateOperator
+          version: 0.0.1
+          settings:
+          - TextToSprite
+          - 4
+          enabled: 1
+          assembly: 
+    - rid: 5746642013497065647
+      type: {class: PromptOperator, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data:
+        m_OperatorData:
+          type: PromptOperator
+          version: 0.0.2
+          settings:
+          - 2d pixel carrot
+          - 
+          enabled: 1
+          assembly: 
+    - rid: 5746642013497065648
+      type: {class: SpriteGeneratorSettingsOperator, ns: Unity.Muse.Sprite.Operators,
+        asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.SpriteGeneratorSettingsOperator
+          version: 0.0.1
+          settings:
+          - 
+          - 
+          - 0.85
+          - 512
+          - 512
+          - 1
+          - 1
+          - 25046
+          - 08e1803e-dfe6-4527-a735-b9face6069ad
+          - 0
+          - 5cc104e0-423a-473e-8034-b9d346cb2357
+          - 0
+          - 03fa404b-39fc-4979-9272-deb5d8c4b24c
+          - 'Happy Harvest [Orion V4 2000]'
+          - 8 Nov 2023
+          - 
+          enabled: 1
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065649
+      type: {class: KeyImageOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.KeyImageOperator
+          version: 0.0.1
+          settings:
+          - 
+          - 
+          - True
+          - 512
+          - 512
+          - 0.5
+          enabled: 1
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065650
+      type: {class: SpriteRefiningMaskOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data: 
+    - rid: 5746642013497065651
+      type: {class: SessionOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.SessionOperator
+          version: 0.0.1
+          settings:
+          - 81953490-e269-4577-8389-618e992dd50e
+          enabled: 0
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065652
+      type: {class: SpriteMuseArtifact, ns: Unity.Muse.Sprite.Artifacts, asm: Unity.Muse.Sprite}
+      data:
+        Guid: 07084480-b7e6-4164-ad3b-1559dc1ae81f
+        Seed: 16738
+        m_Operators:
+        - rid: 5746642013497065653
+        - rid: 5746642013497065654
+        - rid: 5746642013497065655
+        - rid: 5746642013497065656
+        - rid: 5746642013497065657
+        - rid: 5746642013497065658
+        history:
+        - rid: 5746642013497065652
+        m_UnsafeContent: 1
+    - rid: 5746642013497065653
+      type: {class: GenerateOperator, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data:
+        m_OperatorData:
+          type: GenerateOperator
+          version: 0.0.1
+          settings:
+          - TextToSprite
+          - 4
+          enabled: 1
+          assembly: 
+    - rid: 5746642013497065654
+      type: {class: PromptOperator, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data:
+        m_OperatorData:
+          type: PromptOperator
+          version: 0.0.2
+          settings:
+          - 2d pixel carrot
+          - 
+          enabled: 1
+          assembly: 
+    - rid: 5746642013497065655
+      type: {class: SpriteGeneratorSettingsOperator, ns: Unity.Muse.Sprite.Operators,
+        asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.SpriteGeneratorSettingsOperator
+          version: 0.0.1
+          settings:
+          - 
+          - 
+          - 0.85
+          - 512
+          - 512
+          - 1
+          - 1
+          - 16738
+          - 07084480-b7e6-4164-ad3b-1559dc1ae81f
+          - 0
+          - 5cc104e0-423a-473e-8034-b9d346cb2357
+          - 0
+          - 03fa404b-39fc-4979-9272-deb5d8c4b24c
+          - 'Happy Harvest [Orion V4 2000]'
+          - 8 Nov 2023
+          - 
+          enabled: 1
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065656
+      type: {class: KeyImageOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.KeyImageOperator
+          version: 0.0.1
+          settings:
+          - 
+          - 
+          - True
+          - 512
+          - 512
+          - 0.5
+          enabled: 1
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065657
+      type: {class: SpriteRefiningMaskOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data: 
+    - rid: 5746642013497065658
+      type: {class: SessionOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.SessionOperator
+          version: 0.0.1
+          settings:
+          - 81953490-e269-4577-8389-618e992dd50e
+          enabled: 0
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065659
+      type: {class: SpriteMuseArtifact, ns: Unity.Muse.Sprite.Artifacts, asm: Unity.Muse.Sprite}
+      data:
+        Guid: 4996cf57-5f37-4001-9a5b-0a97fdc2d3a4
+        Seed: 25013
+        m_Operators:
+        - rid: 5746642013497065660
+        - rid: 5746642013497065661
+        - rid: 5746642013497065662
+        - rid: 5746642013497065663
+        - rid: 5746642013497065664
+        - rid: 5746642013497065665
+        history:
+        - rid: 5746642013497065659
+        m_UnsafeContent: 1
+    - rid: 5746642013497065660
+      type: {class: GenerateOperator, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data:
+        m_OperatorData:
+          type: GenerateOperator
+          version: 0.0.1
+          settings:
+          - TextToSprite
+          - 4
+          enabled: 1
+          assembly: 
+    - rid: 5746642013497065661
+      type: {class: PromptOperator, ns: Unity.Muse.Common, asm: Unity.Muse.Common}
+      data:
+        m_OperatorData:
+          type: PromptOperator
+          version: 0.0.2
+          settings:
+          - 2d pixel carrot
+          - 
+          enabled: 1
+          assembly: 
+    - rid: 5746642013497065662
+      type: {class: SpriteGeneratorSettingsOperator, ns: Unity.Muse.Sprite.Operators,
+        asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.SpriteGeneratorSettingsOperator
+          version: 0.0.1
+          settings:
+          - 
+          - 
+          - 0.85
+          - 512
+          - 512
+          - 1
+          - 1
+          - 25013
+          - 4996cf57-5f37-4001-9a5b-0a97fdc2d3a4
+          - 0
+          - 5cc104e0-423a-473e-8034-b9d346cb2357
+          - 0
+          - 03fa404b-39fc-4979-9272-deb5d8c4b24c
+          - 'Happy Harvest [Orion V4 2000]'
+          - 8 Nov 2023
+          - 
+          enabled: 1
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065663
+      type: {class: KeyImageOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.KeyImageOperator
+          version: 0.0.1
+          settings:
+          - 
+          - 
+          - True
+          - 512
+          - 512
+          - 0.5
+          enabled: 1
+          assembly: Unity.Muse.Sprite
+    - rid: 5746642013497065664
+      type: {class: SpriteRefiningMaskOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data: 
+    - rid: 5746642013497065665
+      type: {class: SessionOperator, ns: Unity.Muse.Sprite.Operators, asm: Unity.Muse.Sprite}
+      data:
+        m_OperatorData:
+          type: Unity.Muse.Sprite.Operators.SessionOperator
+          version: 0.0.1
+          settings:
+          - 81953490-e269-4577-8389-618e992dd50e
+          enabled: 0
+          assembly: Unity.Muse.Sprite

BlueWater/Assets/11.MuseResource/carrot.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 37823b9ef884b3b45a1005b74527f5e7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BlueWater/Assets/Resources/Excel/item_drop_table.xlsx.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 345812049ef08e7448c90d5beeeddf46
+guid: 42b93ceb453cc6540a16354c7e2842cc
 DefaultImporter:
   externalObjects: {}
   userData: 

BlueWater/Assets/Resources/Excel/item_table.xlsx.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 961736e00e6d3884da5f586d5ba02cf5
+guid: 2f2f1184de3242e46a04dc5038742c0b
 DefaultImporter:
   externalObjects: {}
   userData: 

BlueWater/Assets/Resources/JSON/food_ingredient.json

@@ -1,268 +0,0 @@
-[
-  {
-    "idx": 101,
-    "name": "킹크랩",
-    "type": 1,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 102,
-    "name": "공룡 고기",
-    "type": 1,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 103,
-    "name": "램고기",
-    "type": 1,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 104,
-    "name": "닭고기",
-    "type": 1,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 105,
-    "name": "뱀고기",
-    "type": 1,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 106,
-    "name": "코뿔소 뿔",
-    "type": 1,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 107,
-    "name": "코뿔소 다리살",
-    "type": 1,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 201,
-    "name": "백상어",
-    "type": 2,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 202,
-    "name": "니모",
-    "type": 2,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 203,
-    "name": "해파리",
-    "type": 2,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 204,
-    "name": "가오리",
-    "type": 2,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 205,
-    "name": "우럭",
-    "type": 2,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 301,
-    "name": "데스도어의 알",
-    "type": 3,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 302,
-    "name": "공룡알",
-    "type": 3,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 401,
-    "name": "메론",
-    "type": 4,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 402,
-    "name": "토마토",
-    "type": 4,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 403,
-    "name": "사과",
-    "type": 4,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 404,
-    "name": "레몬",
-    "type": 4,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 405,
-    "name": "토마토",
-    "type": 4,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 501,
-    "name": "마늘",
-    "type": 5,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 502,
-    "name": "양파",
-    "type": 5,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 503,
-    "name": "대파",
-    "type": 5,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 504,
-    "name": "파슬리",
-    "type": 5,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 505,
-    "name": "다시마",
-    "type": 5,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 506,
-    "name": "파프리카",
-    "type": 5,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 507,
-    "name": "배추",
-    "type": 5,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 508,
-    "name": "브로콜리",
-    "type": 5,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 509,
-    "name": "깻잎",
-    "type": 5,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 601,
-    "name": "진주 조개",
-    "type": 6,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 602,
-    "name": "바다 조개",
-    "type": 6,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 603,
-    "name": "거대 조개",
-    "type": 6,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 701,
-    "name": "소금",
-    "type": 7,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 702,
-    "name": "고춧가루",
-    "type": 7,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 703,
-    "name": "후추",
-    "type": 7,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 704,
-    "name": "간장",
-    "type": 7,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 705,
-    "name": "버터",
-    "type": 7,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 706,
-    "name": "설탕",
-    "type": 7,
-    "money": 0,
-    "weight": 100
-  },
-  {
-    "idx": 707,
-    "name": "테스트",
-    "type": -1,
-    "money": "null",
-    "weight": ""
-  }
-]

BlueWater/Assets/Resources/JSON/food_table.json

@@ -1,306 +0,0 @@
-[
-  {
-    "idx": 1001,
-    "name": "킹크랩 앞발 구이",
-    "type": 1,
-    "taste": 1,
-    "money": 500,
-    "time": 40,
-    "plate": 10,
-    "ing1": 101,
-    "ing1_count": 1,
-    "ing2": 404,
-    "ing2_count": 1,
-    "ing3": 504,
-    "ing3_count": 1,
-    "ing4": 703,
-    "ing4_count": 1,
-    "ing5": 0,
-    "ing5_count": 0
-  },
-  {
-    "idx": 1002,
-    "name": "백상어 통구이",
-    "type": 1,
-    "taste": 1,
-    "money": 150,
-    "time": 20,
-    "plate": 10,
-    "ing1": 201,
-    "ing1_count": 1,
-    "ing2": 404,
-    "ing2_count": 1,
-    "ing3": 508,
-    "ing3_count": 1,
-    "ing4": 704,
-    "ing4_count": 1,
-    "ing5": 0,
-    "ing5_count": 0
-  },
-  {
-    "idx": 1003,
-    "name": "우럭 소금 구이",
-    "type": 1,
-    "taste": 3,
-    "money": 140,
-    "time": 25,
-    "plate": 10,
-    "ing1": 205,
-    "ing1_count": 1,
-    "ing2": 509,
-    "ing2_count": 1,
-    "ing3": 701,
-    "ing3_count": 1,
-    "ing4": 0,
-    "ing4_count": 0,
-    "ing5": 0,
-    "ing5_count": 0
-  },
-  {
-    "idx": 1004,
-    "name": "공룡 바비큐",
-    "type": 1,
-    "taste": 2,
-    "money": 500,
-    "time": 40,
-    "plate": 10,
-    "ing1": 102,
-    "ing1_count": 1,
-    "ing2": 0,
-    "ing2_count": 0,
-    "ing3": 0,
-    "ing3_count": 0,
-    "ing4": 0,
-    "ing4_count": 0,
-    "ing5": 0,
-    "ing5_count": 0
-  },
-  {
-    "idx": 2001,
-    "name": "얼큰해파리스튜",
-    "type": 2,
-    "taste": 2,
-    "money": 150,
-    "time": 20,
-    "plate": 10,
-    "ing1": 203,
-    "ing1_count": 1,
-    "ing2": 702,
-    "ing2_count": 1,
-    "ing3": 0,
-    "ing3_count": 0,
-    "ing4": 0,
-    "ing4_count": 0,
-    "ing5": 0,
-    "ing5_count": 0
-  },
-  {
-    "idx": 2002,
-    "name": "짠 얼큰해파리스튜",
-    "type": 2,
-    "taste": 3,
-    "money": 140,
-    "time": 25,
-    "plate": 10,
-    "ing1": 203,
-    "ing1_count": 1,
-    "ing2": 701,
-    "ing2_count": 1,
-    "ing3": 0,
-    "ing3_count": 0,
-    "ing4": 0,
-    "ing4_count": 0,
-    "ing5": 0,
-    "ing5_count": 0
-  },
-  {
-    "idx": 2003,
-    "name": "가오리 얼큰 스튜",
-    "type": 2,
-    "taste": 2,
-    "money": 500,
-    "time": 40,
-    "plate": 10,
-    "ing1": 404,
-    "ing1_count": 1,
-    "ing2": 505,
-    "ing2_count": 1,
-    "ing3": 601,
-    "ing3_count": 1,
-    "ing4": 702,
-    "ing4_count": 1,
-    "ing5": 0,
-    "ing5_count": 0
-  },
-  {
-    "idx": 2004,
-    "name": "코뿔소 뿔 튀김",
-    "type": 2,
-    "taste": 4,
-    "money": 150,
-    "time": 20,
-    "plate": 10,
-    "ing1": 106,
-    "ing1_count": 1,
-    "ing2": 506,
-    "ing2_count": 1,
-    "ing3": 704,
-    "ing3_count": 1,
-    "ing4": 0,
-    "ing4_count": 0,
-    "ing5": 0,
-    "ing5_count": 0
-  },
-  {
-    "idx": 2005,
-    "name": "우럭 매운탕",
-    "type": 2,
-    "taste": 2,
-    "money": 140,
-    "time": 25,
-    "plate": 10,
-    "ing1": 205,
-    "ing1_count": 1,
-    "ing2": 503,
-    "ing2_count": 1,
-    "ing3": 601,
-    "ing3_count": 1,
-    "ing4": 702,
-    "ing4_count": 1,
-    "ing5": 0,
-    "ing5_count": 0
-  },
-  {
-    "idx": 3001,
-    "name": "킹크랩 미트",
-    "type": 3,
-    "taste": 1,
-    "money": 200,
-    "time": 30,
-    "plate": 10,
-    "ing1": 101,
-    "ing1_count": 1,
-    "ing2": 0,
-    "ing2_count": 0,
-    "ing3": 0,
-    "ing3_count": 0,
-    "ing4": 0,
-    "ing4_count": 0,
-    "ing5": 0,
-    "ing5_count": 0
-  },
-  {
-    "idx": 3002,
-    "name": "매운 킹크랩 미트",
-    "type": 3,
-    "taste": 2,
-    "money": 220,
-    "time": 35,
-    "plate": 10,
-    "ing1": 101,
-    "ing1_count": 1,
-    "ing2": 703,
-    "ing2_count": 1,
-    "ing3": 0,
-    "ing3_count": 0,
-    "ing4": 0,
-    "ing4_count": 0,
-    "ing5": 0,
-    "ing5_count": 0
-  },
-  {
-    "idx": 3003,
-    "name": "공룡알 후라이",
-    "type": 3,
-    "taste": 4,
-    "money": 100,
-    "time": 10,
-    "plate": 10,
-    "ing1": 302,
-    "ing1_count": 1,
-    "ing2": 0,
-    "ing2_count": 0,
-    "ing3": 0,
-    "ing3_count": 0,
-    "ing4": 0,
-    "ing4_count": 0,
-    "ing5": 0,
-    "ing5_count": 0
-  },
-  {
-    "idx": 3004,
-    "name": "콜뿔소 뒷다리 고기",
-    "type": 3,
-    "taste": 1,
-    "money": 500,
-    "time": 40,
-    "plate": 10,
-    "ing1": 107,
-    "ing1_count": 1,
-    "ing2": 507,
-    "ing2_count": 1,
-    "ing3": 701,
-    "ing3_count": 1,
-    "ing4": 0,
-    "ing4_count": 0,
-    "ing5": 0,
-    "ing5_count": 0
-  },
-  {
-    "idx": 3005,
-    "name": "컬트오드더램",
-    "type": 3,
-    "taste": 1,
-    "money": 150,
-    "time": 20,
-    "plate": 10,
-    "ing1": 103,
-    "ing1_count": 1,
-    "ing2": 402,
-    "ing2_count": 1,
-    "ing3": 501,
-    "ing3_count": 1,
-    "ing4": 701,
-    "ing4_count": 1,
-    "ing5": 0,
-    "ing5_count": 0
-  },
-  {
-    "idx": 3006,
-    "name": "버터 조개 구이",
-    "type": 3,
-    "taste": 4,
-    "money": 140,
-    "time": 25,
-    "plate": 10,
-    "ing1": 603,
-    "ing1_count": 1,
-    "ing2": 503,
-    "ing2_count": 1,
-    "ing3": 705,
-    "ing3_count": 1,
-    "ing4": 0,
-    "ing4_count": 0,
-    "ing5": 0,
-    "ing5_count": 0
-  },
-  {
-    "idx": 4001,
-    "name": "해파리 젤리",
-    "type": 4,
-    "taste": 4,
-    "money": 0,
-    "time": 0,
-    "plate": 0,
-    "ing1": 0,
-    "ing1_count": 0,
-    "ing2": 0,
-    "ing2_count": 0,
-    "ing3": 0,
-    "ing3_count": 0,
-    "ing4": 0,
-    "ing4_count": 0,
-    "ing5": 0,
-    "ing5_count": 0
-  }
-]

BlueWater/Assets/Resources/JSON/item_drop_table.json

@@ -1,62 +1,128 @@
 [
   {
-    "idx": 10101,
-    "name": "테스트",
-    "item_1": 106,
-    "prob": 100,
-    "min": 1,
-    "max": 1,
-    "item_2": 107,
-    "prob_1": 100,
-    "min_1": 1,
-    "max_1": 1,
-    "item_3": 102,
-    "prob_2": 70,
-    "min_2": 1,
-    "max_2": 10,
-    "item_4": 102,
-    "prob_3": 30,
-    "min_3": 5,
-    "max_3": 10
+    "idx": 1000001,
+    "name": "니모",
+    "item1_idx": 10202,
+    "item1_prob": 100,
+    "item1_min": 1,
+    "item1_max": 3,
+    "item2_idx": 10701,
+    "item2_prob": 80,
+    "item2_min": 1,
+    "item2_max": 1,
+    "item3_idx": 0,
+    "item3_prob": 0,
+    "item3_min": 0,
+    "item3_max": 0,
+    "item4_idx": 0,
+    "item4_prob": 0,
+    "item4_min": 0,
+    "item4_max": 0,
+    "item_drop_type": 1
   },
   {
-    "idx": 10102,
+    "idx": 1000002,
     "name": "상어",
-    "item_1": 201,
-    "prob": 100,
-    "min": 1,
-    "max": 5,
-    "item_2": 202,
-    "prob_1": 50,
-    "min_1": 1,
-    "max_1": 2,
-    "item_3": 0,
-    "prob_2": 0,
-    "min_2": 0,
-    "max_2": 0,
-    "item_4": 0,
-    "prob_3": 0,
-    "min_3": 0,
-    "max_3": 0
+    "item1_idx": 10201,
+    "item1_prob": 100,
+    "item1_min": 1,
+    "item1_max": 5,
+    "item2_idx": 10702,
+    "item2_prob": 70,
+    "item2_min": 1,
+    "item2_max": 2,
+    "item3_idx": 0,
+    "item3_prob": 0,
+    "item3_min": 0,
+    "item3_max": 0,
+    "item4_idx": 0,
+    "item4_prob": 0,
+    "item4_min": 0,
+    "item4_max": 0,
+    "item_drop_type": 1
   },
   {
-    "idx": 10103,
+    "idx": 1000003,
     "name": "가오리",
-    "item_1": 204,
-    "prob": 100,
-    "min": 1,
-    "max": 1,
-    "item_2": 204,
-    "prob_1": 50,
-    "min_1": 1,
-    "max_1": 1,
-    "item_3": 203,
-    "prob_2": 50,
-    "min_2": 3,
-    "max_2": 5,
-    "item_4": 0,
-    "prob_3": 0,
-    "min_3": 0,
-    "max_3": 0
+    "item1_idx": 10204,
+    "item1_prob": 100,
+    "item1_min": 3,
+    "item1_max": 5,
+    "item2_idx": 10703,
+    "item2_prob": 50,
+    "item2_min": 1,
+    "item2_max": 3,
+    "item3_idx": 0,
+    "item3_prob": 0,
+    "item3_min": 0,
+    "item3_max": 0,
+    "item4_idx": 0,
+    "item4_prob": 0,
+    "item4_min": 0,
+    "item4_max": 0,
+    "item_drop_type": 1
+  },
+  {
+    "idx": 2000001,
+    "name": "작은 술통",
+    "item1_idx": 20001,
+    "item1_prob": 80,
+    "item1_min": 1,
+    "item1_max": 1,
+    "item2_idx": 20002,
+    "item2_prob": 50,
+    "item2_min": 1,
+    "item2_max": 1,
+    "item3_idx": 0,
+    "item3_prob": 0,
+    "item3_min": 0,
+    "item3_max": 0,
+    "item4_idx": 0,
+    "item4_prob": 0,
+    "item4_min": 0,
+    "item4_max": 0,
+    "item_drop_type": 1
+  },
+  {
+    "idx": 2000002,
+    "name": "큰 술통",
+    "item1_idx": 20002,
+    "item1_prob": 80,
+    "item1_min": 1,
+    "item1_max": 1,
+    "item2_idx": 20003,
+    "item2_prob": 50,
+    "item2_min": 1,
+    "item2_max": 1,
+    "item3_idx": 0,
+    "item3_prob": 0,
+    "item3_min": 0,
+    "item3_max": 0,
+    "item4_idx": 0,
+    "item4_prob": 0,
+    "item4_min": 0,
+    "item4_max": 0,
+    "item_drop_type": 1
+  },
+  {
+    "idx": 3000001,
+    "name": "오크",
+    "item1_idx": 10102,
+    "item1_prob": 100,
+    "item1_min": 1,
+    "item1_max": 5,
+    "item2_idx": 20001,
+    "item2_prob": 30,
+    "item2_min": 1,
+    "item2_max": 1,
+    "item3_idx": 20002,
+    "item3_prob": 20,
+    "item3_min": 1,
+    "item3_max": 1,
+    "item4_idx": 20003,
+    "item4_prob": 10,
+    "item4_min": 1,
+    "item4_max": 1,
+    "item_drop_type": 2
   }
 ]

BlueWater/Assets/Resources/JSON/item_drop_table.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0d1812ace34fd604d9ebd88cfd031b6e
+guid: c821ab337537ddc44b1f92f098edeba6
 TextScriptImporter:
   externalObjects: {}
   userData: 

BlueWater/Assets/Resources/JSON/item_table.json

@@ -0,0 +1,330 @@
+[
+  {
+    "idx": 10101,
+    "name": "킹크랩",
+    "category": 1,
+    "type": 1,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10102,
+    "name": "공룡 고기",
+    "category": 1,
+    "type": 1,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10103,
+    "name": "램고기",
+    "category": 1,
+    "type": 1,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10104,
+    "name": "닭고기",
+    "category": 1,
+    "type": 1,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10105,
+    "name": "뱀고기",
+    "category": 1,
+    "type": 1,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10106,
+    "name": "코뿔소 뿔",
+    "category": 1,
+    "type": 1,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10107,
+    "name": "코뿔소 다리살",
+    "category": 1,
+    "type": 1,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10201,
+    "name": "백상어",
+    "category": 1,
+    "type": 2,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10202,
+    "name": "니모",
+    "category": 1,
+    "type": 2,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10203,
+    "name": "해파리",
+    "category": 1,
+    "type": 2,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10204,
+    "name": "가오리",
+    "category": 1,
+    "type": 2,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10205,
+    "name": "우럭",
+    "category": 1,
+    "type": 2,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10301,
+    "name": "데스도어의 알",
+    "category": 1,
+    "type": 3,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10302,
+    "name": "공룡알",
+    "category": 1,
+    "type": 3,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10401,
+    "name": "메론",
+    "category": 1,
+    "type": 4,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10402,
+    "name": "토마토",
+    "category": 1,
+    "type": 4,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10403,
+    "name": "사과",
+    "category": 1,
+    "type": 4,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10404,
+    "name": "레몬",
+    "category": 1,
+    "type": 4,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10405,
+    "name": "토마토",
+    "category": 1,
+    "type": 4,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10501,
+    "name": "마늘",
+    "category": 1,
+    "type": 5,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10502,
+    "name": "양파",
+    "category": 1,
+    "type": 5,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10503,
+    "name": "대파",
+    "category": 1,
+    "type": 5,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10504,
+    "name": "파슬리",
+    "category": 1,
+    "type": 5,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10505,
+    "name": "다시마",
+    "category": 1,
+    "type": 5,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10506,
+    "name": "파프리카",
+    "category": 1,
+    "type": 5,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10507,
+    "name": "배추",
+    "category": 1,
+    "type": 5,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10508,
+    "name": "브로콜리",
+    "category": 1,
+    "type": 5,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10509,
+    "name": "깻잎",
+    "category": 1,
+    "type": 5,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10601,
+    "name": "진주 조개",
+    "category": 1,
+    "type": 6,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10602,
+    "name": "바다 조개",
+    "category": 1,
+    "type": 6,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10603,
+    "name": "거대 조개",
+    "category": 1,
+    "type": 6,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10701,
+    "name": "소금",
+    "category": 1,
+    "type": 7,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10702,
+    "name": "고춧가루",
+    "category": 1,
+    "type": 7,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10703,
+    "name": "후추",
+    "category": 1,
+    "type": 7,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10704,
+    "name": "간장",
+    "category": 1,
+    "type": 7,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10705,
+    "name": "버터",
+    "category": 1,
+    "type": 7,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 10706,
+    "name": "설탕",
+    "category": 1,
+    "type": 7,
+    "price": 100,
+    "weight": 100
+  },
+  {
+    "idx": 20001,
+    "name": "보물 상자 (동)",
+    "category": 2,
+    "type": 0,
+    "price": 500,
+    "weight": 100
+  },
+  {
+    "idx": 20002,
+    "name": "보물 상자 (은)",
+    "category": 2,
+    "type": 0,
+    "price": 1000,
+    "weight": 100
+  },
+  {
+    "idx": 20003,
+    "name": "보물 상자 (금)",
+    "category": 2,
+    "type": 0,
+    "price": 2000,
+    "weight": 100
+  },
+  {
+    "idx": 20004,
+    "name": "미믹",
+    "category": 2,
+    "type": 0,
+    "price": 0,
+    "weight": 100
+  }
+]

BlueWater/Assets/Resources/JSON/item_table.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ae149b393d56f964883f9e06c41b068d
+guid: 83b4be2f668e0424bb69ec75d3b0d030
 TextScriptImporter:
   externalObjects: {}
   userData: 

BlueWater/Assets/TextMesh Pro/Glyph Report.txt.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1e26200cb116dbd48b9abd3c35634651
+guid: 33b30de91d4d83043ab5207d52366c78
 TextScriptImporter:
   externalObjects: {}
   userData: 

BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PNG/AimIcon.png.meta

@@ -3,7 +3,7 @@ guid: bcb197614baac43f2bbdf83b4cf9670c
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
@@ -20,9 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -31,9 +34,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1
@@ -45,7 +48,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 512
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -54,10 +57,15 @@ TextureImporter:
   textureType: 8
   textureShape: 1
   singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
+  ignorePngGamma: 0
   applyGammaDecoding: 1
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -69,6 +77,46 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -84,9 +132,9 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PNG/AlertBell.png.meta

@@ -3,7 +3,7 @@ guid: f5439b2897e504c8a9a098af22ba0590
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
@@ -20,9 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -31,9 +34,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1
@@ -45,7 +48,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 512
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -54,10 +57,15 @@ TextureImporter:
   textureType: 8
   textureShape: 1
   singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
+  ignorePngGamma: 0
   applyGammaDecoding: 1
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -69,6 +77,46 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -84,9 +132,9 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PNG/AmuletIcon.png.meta

@@ -3,7 +3,7 @@ guid: 49bed6963b52c46929ab8f33ab3159a1
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
@@ -20,9 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -31,9 +34,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1
@@ -45,7 +48,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 512
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -54,10 +57,15 @@ TextureImporter:
   textureType: 8
   textureShape: 1
   singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
+  ignorePngGamma: 0
   applyGammaDecoding: 1
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -69,6 +77,46 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -84,9 +132,9 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PNG/Apple Green.png.meta

@@ -3,7 +3,7 @@ guid: 749f5c219653c4eb18d6b43107370e78
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
@@ -20,9 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -31,9 +34,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1
@@ -45,7 +48,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 512
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -54,10 +57,15 @@ TextureImporter:
   textureType: 8
   textureShape: 1
   singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
+  ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -69,6 +77,46 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -84,9 +132,9 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PNG/AppleIcon.png.meta

@@ -3,7 +3,7 @@ guid: c24ab8dd38a6b4f0b83d997a855cc22d
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
@@ -20,9 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -31,9 +34,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1
@@ -45,7 +48,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 512
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -54,10 +57,15 @@ TextureImporter:
   textureType: 8
   textureShape: 1
   singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
+  ignorePngGamma: 0
   applyGammaDecoding: 1
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -69,6 +77,46 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -84,9 +132,9 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PNG/ArmIcon.png.meta

@@ -3,7 +3,7 @@ guid: 018976723a69b4aa29f1d6e58c8209c7
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
@@ -20,9 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -31,9 +34,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1
@@ -45,7 +48,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 512
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -54,10 +57,15 @@ TextureImporter:
   textureType: 8
   textureShape: 1
   singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
+  ignorePngGamma: 0
   applyGammaDecoding: 1
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -69,6 +77,46 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -84,9 +132,9 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PNG/ArmorBodyIcon.png.meta

@@ -3,7 +3,7 @@ guid: 302c8c89ca0a34eb3b0f28c615abac99
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
@@ -20,9 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -31,9 +34,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1
@@ -45,7 +48,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 512
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -54,10 +57,15 @@ TextureImporter:
   textureType: 8
   textureShape: 1
   singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
+  ignorePngGamma: 0
   applyGammaDecoding: 1
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -69,6 +77,46 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -84,9 +132,9 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PNG/Asteroide3Icon.png.meta

@@ -3,7 +3,7 @@ guid: f76ccad1fcb5f41759e72440bf360da3
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
@@ -20,9 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -31,9 +34,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1
@@ -45,7 +48,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 512
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -54,10 +57,15 @@ TextureImporter:
   textureType: 8
   textureShape: 1
   singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
+  ignorePngGamma: 0
   applyGammaDecoding: 1
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -69,6 +77,46 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -84,9 +132,9 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PNG/AsteroideIcon.png.meta

@@ -3,7 +3,7 @@ guid: 04880f7536e0c4425b43bbb3c3ea7cf6
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
@@ -20,9 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -31,9 +34,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1
@@ -45,7 +48,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 512
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -54,10 +57,15 @@ TextureImporter:
   textureType: 8
   textureShape: 1
   singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
+  ignorePngGamma: 0
   applyGammaDecoding: 1
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -69,6 +77,46 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -84,9 +132,9 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PNG/Avatar Neutal - Dark.png.meta

@@ -3,7 +3,7 @@ guid: 91209e2ea704d4a898b2e14a7081d065
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
@@ -20,9 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -31,9 +34,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1
@@ -45,7 +48,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 512
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -54,10 +57,15 @@ TextureImporter:
   textureType: 8
   textureShape: 1
   singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
+  ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -69,6 +77,46 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -84,9 +132,9 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PNG/Avatar Neutral - Green.png.meta

@@ -3,7 +3,7 @@ guid: f2cdf1da27ce4416891b50a565f6a008
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
@@ -20,9 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -31,9 +34,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1
@@ -45,7 +48,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 512
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -54,10 +57,15 @@ TextureImporter:
   textureType: 8
   textureShape: 1
   singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
+  ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -69,6 +77,46 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -84,9 +132,9 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PNG/Avatar Neutral - Light.png.meta

@@ -3,7 +3,7 @@ guid: 6ba79a246a6dd4e28aa30fca0918fe6e
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
@@ -20,9 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -31,9 +34,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1
@@ -45,7 +48,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 512
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -54,10 +57,15 @@ TextureImporter:
   textureType: 8
   textureShape: 1
   singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
+  ignorePngGamma: 0
   applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -69,6 +77,46 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -84,9 +132,9 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

BlueWater/Assets/UltimateCleanGUIPack/Common/Sources/Icons Colored/PNG/AvatarBoyIcon.png.meta

@@ -3,7 +3,7 @@ guid: e46bda76bed06449f88530d91fbab88b
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 11
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 0
@@ -20,9 +20,12 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -31,9 +34,9 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
     wrapU: 1
     wrapV: 1
     wrapW: 1
@@ -45,7 +48,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 512
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -54,10 +57,15 @@ TextureImporter:
   textureType: 8
   textureShape: 1
   singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
+  ignorePngGamma: 0
   applyGammaDecoding: 1
+  swizzle: 50462976
+  cookieLightType: 1
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -69,6 +77,46 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
@@ -84,9 +132,9 @@ TextureImporter:
     edges: []
     weights: []
     secondaryTextures: []
-  spritePackingTag: 
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
   pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: