diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 55799cf9c..003d8130a 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -3958,7 +3958,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _persistent: 0 - _customerDataSo: {fileID: 11400000, guid: e6ce9d58057b580479880585947969d8, type: 2} + k__BackingField: {fileID: 11400000, guid: e6ce9d58057b580479880585947969d8, type: 2} _customerPrefab: {fileID: -2302002259734456648, guid: 23195e611c71ad44b8a1ccb2b6e0efe5, type: 3} _customerSpawnTransform: {fileID: 1038321203} _checkEmptySeatInterval: 0.5 @@ -16893,10 +16893,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _persistent: 0 + k__BackingField: 3 + CurrentHeart: 0 + Invincibility: 0 + k__BackingField: 1 + k__BackingField: 1000 + k__BackingField: 1000 + k__BackingField: 1000 + k__BackingField: 1000 + k__BackingField: 1000 + k__BackingField: 1000 + k__BackingField: 1000 k__BackingField: {fileID: 1665075870} k__BackingField: {fileID: 1665075872} _dailyBgm: TycoonDailyBgm1 - _levelDataSo: {fileID: 11400000, guid: 702b1ed0ce71d1b4aa1ddbce67e475a1, type: 2} + k__BackingField: {fileID: 11400000, guid: 702b1ed0ce71d1b4aa1ddbce67e475a1, type: 2} + k__BackingField: {fileID: 11400000, guid: 4607b374e49ab734da548949f9e10fed, type: 2} --- !u!114 &1665075870 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderBeverage.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderBeverage.cs index 3a91356ee..a540c1f31 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderBeverage.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderBeverage.cs @@ -80,7 +80,7 @@ namespace BlueWater.BehaviorTrees.Actions { tycoonPlayer.GiveItem(); _balloonUi.ReceiveFood(); - var itemData = ItemManager.Instance.GetItemDataByIdx(carriedBeverageData.Idx); + var itemData = ItemManager.Instance.ItemDataSo.GetDataByIdx(carriedBeverageData.Idx); _customer.SetFood(itemData); if (itemData.Quality == ItemQuality.High) { diff --git a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderFood.cs b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderFood.cs index 23f03f3db..e4e4d5625 100644 --- a/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderFood.cs +++ b/Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/OrderFood.cs @@ -81,7 +81,7 @@ namespace BlueWater.BehaviorTrees.Actions { tycoonPlayer.GiveItem(); _balloonUi.ReceiveFood(); - var itemData = ItemManager.Instance.GetItemDataByIdx(carriedFoodData.Idx); + var itemData = ItemManager.Instance.ItemDataSo.GetDataByIdx(carriedFoodData.Idx); _customer.SetFood(itemData); if (itemData.Quality == ItemQuality.High) { diff --git a/Assets/02.Scripts/Character/Inventory.cs b/Assets/02.Scripts/Character/Inventory.cs index f65b76b98..fba4d122f 100644 --- a/Assets/02.Scripts/Character/Inventory.cs +++ b/Assets/02.Scripts/Character/Inventory.cs @@ -85,7 +85,7 @@ namespace BlueWater foreach (var element in ItemSlotList) { - var elementWeight = ItemManager.Instance.GetItemDataByIdx(element.Idx).Weight; + var elementWeight = ItemManager.Instance.ItemDataSo.GetDataByIdx(element.Idx).Weight; CurrentTotalWeight += elementWeight * element.Quantity; } @@ -103,12 +103,12 @@ namespace BlueWater break; case CombatInventorySortingType.Name: ItemSlotList.Sort((x, y) => - string.Compare(ItemManager.Instance.GetItemDataByIdx(x.Idx).Name, - ItemManager.Instance.GetItemDataByIdx(y.Idx).Name, StringComparison.Ordinal)); + string.Compare(ItemManager.Instance.ItemDataSo.GetDataByIdx(x.Idx).Name, + ItemManager.Instance.ItemDataSo.GetDataByIdx(y.Idx).Name, StringComparison.Ordinal)); break; case CombatInventorySortingType.Category: ItemSlotList.Sort((x, y) => - ItemManager.Instance.GetItemDataByIdx(x.Idx).Type.CompareTo(ItemManager.Instance.GetItemDataByIdx(y.Idx).Type)); + ItemManager.Instance.ItemDataSo.GetDataByIdx(x.Idx).Type.CompareTo(ItemManager.Instance.ItemDataSo.GetDataByIdx(y.Idx).Type)); break; case CombatInventorySortingType.Count: ItemSlotList.Sort((x, y) => y.Quantity.CompareTo(x.Quantity)); diff --git a/Assets/02.Scripts/Editor/ExcelToJsonConverter.cs b/Assets/02.Scripts/Editor/ExcelToJsonConverter.cs index e339efcfb..e00491481 100644 --- a/Assets/02.Scripts/Editor/ExcelToJsonConverter.cs +++ b/Assets/02.Scripts/Editor/ExcelToJsonConverter.cs @@ -21,10 +21,10 @@ namespace BlueWater.Editors public static ExcelToJsonConverter Instance { get; private set; } private Vector2 _scrollPosition; - [MenuItem("Tools/EXCEL TO JSON - BlueWater")] + [MenuItem("Tools/01.Excel -> Json")] public static void ShowWindow() { - Instance = GetWindow("EXCEL TO JSON"); + Instance = GetWindow("01.Excel -> Json"); } private void OnEnable() diff --git a/Assets/02.Scripts/Editor/JsonHelperEditor.cs b/Assets/02.Scripts/Editor/JsonHelperEditor.cs index bc28b39e6..66c8541dd 100644 --- a/Assets/02.Scripts/Editor/JsonHelperEditor.cs +++ b/Assets/02.Scripts/Editor/JsonHelperEditor.cs @@ -1,5 +1,7 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.IO; +using System.Reflection; using BlueWater.Interfaces; using BlueWater.Items; using BlueWater.Npcs.Customers; @@ -29,10 +31,10 @@ namespace BlueWater.Editors private string _assetFilePath = "Assets/02.Scripts/ScriptableObject/Item"; private DataType _dataType = DataType.None; - [MenuItem("Tools/Json파일 ScriptableObject로 자동 변환")] + [MenuItem("Tools/02. json -> ScriptableObject")] public static void ShowWindow() { - GetWindow("Json파일 ScriptableObject로 자동 변환"); + GetWindow("02. json -> ScriptableObject"); } private void OnGUI() @@ -114,15 +116,21 @@ namespace BlueWater.Editors return; } - var newData = JsonHelper.LoadJsonData(fullJsonFilePath); - if (newData == null || newData.Count == 0) + var newDataList = JsonHelper.LoadJsonData(fullJsonFilePath); + if (newDataList == null || newDataList.Count == 0) { EditorUtility.DisplayDialog("경고 메세지", "Json 파일 데이터가 비어있거나, 불러올 수 없습니다.\n" + fullJsonFilePath, "확인"); - Debug.LogError("Json 파일 데이터가 비어있거나, 불러올 수 없습니다.\n" + fullJsonFilePath); return; } - newData.Sort((x, y) => x.Idx.CompareTo(y.Idx)); + var newDataKeyValueList = new List>(); + foreach (var data in newDataList) + { + if (data != null) + { + newDataKeyValueList.Add(new SerializableKeyValuePair { Key = data.Idx, Value = data }); + } + } var assetFileName = Path.GetFileNameWithoutExtension(_jsonFilePath) + ".asset"; var assetPath = Path.Combine(_assetFilePath, assetFileName); @@ -133,7 +141,7 @@ namespace BlueWater.Editors so = CreateInstance(); if (so is IDataContainer container) { - container.SetData(newData); + container.SetSerializedDataList(newDataKeyValueList); } AssetDatabase.CreateAsset(so, assetPath); EditorUtility.DisplayDialog("알림 메세지", "새로운 ScriptableObject가 생성되었습니다.", "확인"); @@ -142,10 +150,10 @@ namespace BlueWater.Editors { if (so is IDataContainer container) { - var existingData = container.GetData(); - MergeData(existingData, newData); - existingData.Sort((x, y) => x.Idx.CompareTo(y.Idx)); - container.SetData(existingData); + var existingData = container.GetSerializedDataList(); + MergeData(existingData, newDataKeyValueList); + //existingData.Sort((x, y) => x.Idx.CompareTo(y.Idx)); + container.SetSerializedDataList(existingData); } EditorUtility.DisplayDialog("알림 메세지", "기존 ScriptableObject가 업데이트되었습니다.", "확인"); } @@ -154,62 +162,83 @@ namespace BlueWater.Editors AssetDatabase.SaveAssets(); AssetDatabase.Refresh(); } - - /// - /// Json에 있는 데이터만 덮어씌우도록 하는 함수 - /// Json안에 없는 데이터는 변경하지 않습니다. - /// - /// - /// - /// - private void MergeData(List existingData, List newData) where T : class, IIdx + + private void MergeData(List> existingData, List> newData) + where T : class, IIdx { - existingData ??= new List(); + existingData ??= new List>(); var newDataIdxSet = new HashSet(); foreach (var newDataItem in newData) { - if (newDataItem != null) + if (newDataItem != null && newDataItem.Value != null) { - newDataIdxSet.Add(newDataItem.Idx); + newDataIdxSet.Add(newDataItem.Key); // Key는 Idx에 해당 } } - existingData.RemoveAll(item => item == null || !newDataIdxSet.Contains(item.Idx)); + // 기존 데이터에서 JSON에 없는 항목 제거 + existingData.RemoveAll(item => item == null || !newDataIdxSet.Contains(item.Key)); - var existingDataDict = new Dictionary(); + // 기존 데이터를 Dictionary로 변환 + var existingDataDict = new Dictionary>(); foreach (var data in existingData) { - if (data != null) + if (data != null && data.Value != null) { - existingDataDict[data.Idx] = data; + existingDataDict[data.Key] = data; } } + // 새로운 데이터를 기존 데이터에 덮어쓰거나 추가 foreach (var newDataItem in newData) { - if (newDataItem == null) continue; + if (newDataItem == null || newDataItem.Value == null) continue; - if (existingDataDict.TryGetValue(newDataItem.Idx, out var existingItem)) + if (existingDataDict.TryGetValue(newDataItem.Key, out var existingItem)) { - var properties = typeof(T).GetProperties(); + var properties = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance); foreach (var property in properties) { - var newValue = property.GetValue(newDataItem); - if (newValue != null && property.CanWrite) + var newValue = property.GetValue(newDataItem.Value); + var existingValue = property.GetValue(existingItem.Value); + + // 덮어쓰기 조건 (참조 타입이거나, 값 타입이 기본값이 아닌 경우에만 덮어씀) + if (ShouldOverwriteProperty(newValue, existingValue, property)) { - property.SetValue(existingItem, newValue); + property.SetValue(existingItem.Value, newValue); } } } else { - existingDataDict[newDataItem.Idx] = newDataItem; + // 기존 데이터에 없으면 새로 추가 + existingDataDict[newDataItem.Key] = newDataItem; } } + // 기존 데이터 리스트를 다시 갱신 existingData.Clear(); existingData.AddRange(existingDataDict.Values); } + + /// + /// 속성 덮어쓰기 여부를 결정하는 일반적인 로직 + /// + private bool ShouldOverwriteProperty(object newValue, object existingValue, PropertyInfo property) + { + // 값이 없으면 덮어쓰지 않음 + if (newValue == null) return false; + + // 값 타입일 경우 기본값이 아닌지 확인 + if (property.PropertyType.IsValueType) + { + var defaultValue = Activator.CreateInstance(property.PropertyType); + return !newValue.Equals(defaultValue); // 기본값이 아니면 덮어씀 + } + + // 참조 타입인 경우 + return true; // 참조 타입은 항상 덮어씀 (null 체크는 상위에서 수행됨) + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Interface/IDataContainer.cs b/Assets/02.Scripts/Interface/IDataContainer.cs index a2c0df3b9..48d7a044a 100644 --- a/Assets/02.Scripts/Interface/IDataContainer.cs +++ b/Assets/02.Scripts/Interface/IDataContainer.cs @@ -4,7 +4,7 @@ namespace BlueWater.Interfaces { public interface IDataContainer { - List GetData(); - void SetData(List data); + List> GetSerializedDataList(); + void SetSerializedDataList(List> data); } } \ No newline at end of file diff --git a/Assets/02.Scripts/Item/DataSo.cs b/Assets/02.Scripts/Item/DataSo.cs index f15b696b4..4e560aa01 100644 --- a/Assets/02.Scripts/Item/DataSo.cs +++ b/Assets/02.Scripts/Item/DataSo.cs @@ -1,22 +1,93 @@ using System.Collections.Generic; using BlueWater.Interfaces; using UnityEngine; +using Random = UnityEngine.Random; namespace BlueWater.Items { public class DataSo : ScriptableObject, IDataContainer { - [field: SerializeField] - public List Datas { get; private set; } + [SerializeField] + private List> _serializedDataList = new(); - public List GetData() + private Dictionary _datas; + + private void OnEnable() { - return Datas; + InitializeDictionary(); + } + + /// + /// 에디터에서 값이 변경되었을 때 호출되는 함수 + /// + private void OnValidate() + { + InitializeDictionary(); } - public void SetData(List datas) + private void InitializeDictionary() { - Datas = datas; + _datas = new Dictionary(); + foreach (var kvp in _serializedDataList) + { + if (!_datas.ContainsKey(kvp.Key)) + { + _datas.Add(kvp.Key, kvp.Value); + } + } + } + + /// + /// 에디터에서 변환할 때 사용하는 함수 + /// + public List> GetSerializedDataList() + { + return _serializedDataList; + } + + /// + /// 에디터에서 변환할 때 사용하는 함수 + /// + public void SetSerializedDataList(List> datas) + { + _serializedDataList = datas; + } + + public Dictionary GetData() + { + return _datas; + } + + public void SetData(Dictionary datas) + { + _datas = datas; + } + + public T GetDataByIdx(string idx) + { + if (!_datas.TryGetValue(idx, out var data)) + { + Debug.LogError($"{idx}에 해당하는 값을 찾을 수 없습니다."); + return default; + } + + return data; + } + + public int GetDataCount() + { + return _datas.Count; + } + + /// + /// 데이터 전체에서 랜덤한 Key에 접근해 Value를 리턴해주는 함수 + /// + public T GetRandomValue() + { + var randomIndex = Random.Range(0, GetDataCount()); + var keys = new List(_datas.Keys); + var randomKey = keys[randomIndex]; + return _datas[randomKey]; } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Item/Item.cs b/Assets/02.Scripts/Item/Item.cs index d81d632e2..11c5de912 100644 --- a/Assets/02.Scripts/Item/Item.cs +++ b/Assets/02.Scripts/Item/Item.cs @@ -121,7 +121,7 @@ namespace BlueWater.Items public void Initialize(ItemSlot itemSlot) { ItemSlot = itemSlot; - ItemData = ItemManager.Instance.GetItemDataByIdx(ItemSlot.Idx); + ItemData = ItemManager.Instance.ItemDataSo.GetDataByIdx(ItemSlot.Idx); SpriteRenderer.sprite = ItemData.Sprite; } diff --git a/Assets/02.Scripts/Item/ItemDropTableSo.cs b/Assets/02.Scripts/Item/ItemDropTableSo.cs index 32447d511..c1270e637 100644 --- a/Assets/02.Scripts/Item/ItemDropTableSo.cs +++ b/Assets/02.Scripts/Item/ItemDropTableSo.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.IO; -using BlueWater.Items; using Newtonsoft.Json.Linq; using UnityEngine; @@ -10,10 +9,9 @@ using UnityEditor; namespace BlueWater.Items { - public class ItemDropTableSo : ScriptableObject + [CreateAssetMenu(fileName = "ItemDropTable", menuName = "ScriptableObjects/ItemDropTable")] + public class ItemDropTableSo : DataSo // DataSo를 상속 { - // public 필수 - public List ItemDropTables = new(); private const string ItemDropJsonPath = "Assets/Resources/Json/ItemDropTable.json"; private const string CharacterDataJsonPath = "Assets/Resources/Json/CharacterData.json"; private const string FilePath = "Assets/02.Scripts/ScriptableObject/Item/ItemDropTable.asset"; @@ -28,21 +26,33 @@ namespace BlueWater.Items var instance = CreateFromJson(itemDropJsonContent, characterDataJsonContent); AssetDatabase.CreateAsset(instance, FilePath); AssetDatabase.SaveAssets(); - Debug.Log("ItemDropTable ScriptableObject created successfully in ItemDropTableScriptableObject class."); + Debug.Log("ItemDropTable ScriptableObject created successfully."); } #endif private static ItemDropTableSo CreateFromJson(string itemDropJsonString, string characterDataJsonString) { - var itemDropTables = ParseJsonToCharacterDrops(itemDropJsonString, characterDataJsonString); - var instance = CreateInstance(); - instance.ItemDropTables = itemDropTables; - return instance; + var itemDropTableSo = CreateInstance(); + + var newItemDropTables = ParseJsonToCharacterDrops(itemDropJsonString, characterDataJsonString); + + // Dictionary로 변환하여 직렬화 가능한 리스트에 추가 + var serializedDataList = new List>(); + foreach (var kvp in newItemDropTables) + { + serializedDataList.Add(new SerializableKeyValuePair + { + Key = kvp.Key, + Value = kvp.Value + }); + } + itemDropTableSo.SetSerializedDataList(serializedDataList); + + return itemDropTableSo; } - private static List ParseJsonToCharacterDrops(string itemDropJsonString, string characterDataJsonString) + private static Dictionary ParseJsonToCharacterDrops(string itemDropJsonString, string characterDataJsonString) { - var newItemDropTables = new List(); var itemDropTables = new Dictionary(); var characterDataDictionary = ParseCharacterDataJson(characterDataJsonString); @@ -67,8 +77,7 @@ namespace BlueWater.Items itemDropTables[characterIdx].DropItems.Add(dropItem); } - newItemDropTables.AddRange(itemDropTables.Values); - return newItemDropTables; + return itemDropTables; } private static Dictionary ParseCharacterDataJson(string characterDataJsonString) diff --git a/Assets/02.Scripts/Item/ItemManager.cs b/Assets/02.Scripts/Item/ItemManager.cs index fcbd7ef4b..fdf60235b 100644 --- a/Assets/02.Scripts/Item/ItemManager.cs +++ b/Assets/02.Scripts/Item/ItemManager.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using Sirenix.OdinInspector; using UnityEngine; -using UnityEngine.Serialization; using Random = UnityEngine.Random; namespace BlueWater.Items @@ -13,25 +12,20 @@ namespace BlueWater.Items [SerializeField, Required] private Item _defaultItemPrefab; - [SerializeField, Required] - private ItemDataSo _itemDataSo; - private Dictionary _itemDatas; + [field: SerializeField, Required] + public ItemDataSo ItemDataSo { get; private set; } - [SerializeField, Required] - private ItemDropTableSo _itemDropTableSo; - private Dictionary _itemDropTables; + [field: SerializeField, Required] + public ItemDropTableSo ItemDropTableSo { get; private set; } - [SerializeField, Required] - private FoodDataSo _foodDataSo; - private Dictionary _foodDatas; + [field: SerializeField, Required] + public FoodDataSo FoodDataSo { get; private set; } - [SerializeField, Required] - private CocktailDataSo _cocktailDataSo; - private Dictionary _cocktailDatas; + [field: SerializeField, Required] + public CocktailDataSo CocktailDataSo { get; private set; } - [FormerlySerializedAs("_drinkDataSo")] [SerializeField, Required] - private LiquidDataSo liquidDataSo; - private Dictionary _liquidDatas; + [field: SerializeField, Required] + public LiquidDataSo LiquidDataSo { get; private set; } [field: SerializeField, Required] public ItemSlotDataSo ItemSlotDataSo { get; private set; } @@ -45,30 +39,9 @@ namespace BlueWater.Items private const int MaxAttempts = 1000; - protected override void OnAwake() - { - base.OnAwake(); - - Initialize(); - } - - private void Initialize() - { - _itemDatas = InitializeDictionary(_itemDataSo.Datas, data => data.Idx); - _itemDropTables = InitializeDictionary(_itemDropTableSo.ItemDropTables, table => table.CharacterData.CharacterIdx); - _foodDatas = InitializeDictionary(_foodDataSo.Datas, data => data.Idx); - _cocktailDatas = InitializeDictionary(_cocktailDataSo.Datas, data => data.Idx); - _liquidDatas = InitializeDictionary(liquidDataSo.Datas, data => data.Idx); - } - - private Dictionary InitializeDictionary(List dataList, Func keySelector) - { - return dataList.ToDictionary(keySelector); - } - public void ItemDropRandomPosition(string idx, Vector3 dropPosition, float randomDropRadius = float.PositiveInfinity) { - var itemDropTable = GetItemDropTableByIdx(idx); + var itemDropTable = ItemDropTableSo.GetDataByIdx(idx); if (itemDropTable == null) return; var droppedItemList = itemDropTable.GetDroppedItemList(); @@ -88,7 +61,7 @@ namespace BlueWater.Items droppedPositions.Add(newDropPosition); - var itemPrefab = _itemDatas[element.Idx].ItemPrefab; + var itemPrefab = ItemDataSo.GetDataByIdx(element.Idx).ItemPrefab; if (!itemPrefab) { itemPrefab = _defaultItemPrefab; @@ -106,35 +79,5 @@ namespace BlueWater.Items { return positions.Any(pos => Vector3.Distance(position, pos) > _minSeparationDistance); } - - public T GetDataByIdx(Dictionary dataDictionary, string idx) where T : class - { - if (dataDictionary.TryGetValue(idx, out var data)) - return data; - - Debug.LogError($"{idx}와 일치하는 아이템이 없습니다."); - return null; - } - - public ItemData GetItemDataByIdx(string idx) => GetDataByIdx(_itemDatas, idx); - - public ItemDropTable GetItemDropTableByIdx(string idx) - { - if (string.IsNullOrEmpty(idx)) - { - Debug.Log("ItemDropTable이 비어있습니다."); - return null; - } - - if (_itemDropTables.TryGetValue(idx, out var itemDropTable)) return itemDropTable; - - Debug.LogError($"{idx}와 일치하는 아이템이 없습니다."); - return null; - } - - public FoodData GetFoodDataByIdx(string idx) => GetDataByIdx(_foodDatas, idx); - public CocktailData GetCocktailDataByIdx(string idx) => GetDataByIdx(_cocktailDatas, idx); - public Dictionary GetCocktailDatas() => _cocktailDatas; - public LiquidData GetLiquidDataByIdx(string idx) => GetDataByIdx(_liquidDatas, idx); } } \ No newline at end of file diff --git a/Assets/02.Scripts/LiquidController.cs b/Assets/02.Scripts/LiquidController.cs index 4134e5988..7a18ce63c 100644 --- a/Assets/02.Scripts/LiquidController.cs +++ b/Assets/02.Scripts/LiquidController.cs @@ -310,7 +310,7 @@ namespace BlueWater } // ItemManager를 통해 모든 CocktailData 가져오기 - var cocktailDatas = ItemManager.Instance.GetCocktailDatas(); + var cocktailDatas = ItemManager.Instance.CocktailDataSo.GetData(); CocktailData matchingCocktail = null; // 모든 칵테일 데이터를 순회하면서 조건에 맞는 칵테일 찾기 @@ -362,7 +362,7 @@ namespace BlueWater // 조건에 만족하는 칵테일이 없음 if (matchingCocktail == null) { - matchingCocktail = ItemManager.Instance.GetCocktailDataByIdx("Cocktail000"); + matchingCocktail = ItemManager.Instance.CocktailDataSo.GetDataByIdx("Cocktail000"); _completeText.text = "실패"; } else diff --git a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs index 15f51c8d9..e901cc279 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs @@ -1,3 +1,4 @@ +using System; using BlueWater.Items; using UnityEngine; @@ -21,7 +22,11 @@ namespace BlueWater.Tycoons base.Awake(); _liquidController = FindAnyObjectByType(); - _liquidData = ItemManager.Instance.GetLiquidDataByIdx(_idx); + } + + private void Start() + { + _liquidData = ItemManager.Instance.LiquidDataSo.GetDataByIdx(_idx); _currentAmount = _liquidData.GetMaxAmount(); } diff --git a/Assets/02.Scripts/ScriptableObject/CardDataTable.asset b/Assets/02.Scripts/ScriptableObject/CardDataTable.asset index ecb2f585a..054e09f35 100644 --- a/Assets/02.Scripts/ScriptableObject/CardDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/CardDataTable.asset @@ -12,96 +12,132 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c2b2766be55cd5143abce97e8c22303b, type: 3} m_Name: CardDataTable m_EditorClassIdentifier: - k__BackingField: - - k__BackingField: AddAllLiquid - k__BackingField: LiquidAllHealImg - k__BackingField: "\uC804\uCCB4 \uC7AC\uB8CC 1000ml \uCD94\uAC00" - k__BackingField: 0 - k__BackingField: 10 - - k__BackingField: AddGarnish1 - k__BackingField: Garnish1Img - k__BackingField: "1\uBC88 \uAC00\uB2C8\uC26C\uB97C 4000ml \uCD94\uAC00" - k__BackingField: 0 - k__BackingField: 5 - - k__BackingField: AddGarnish2 - k__BackingField: Garnish2Img - k__BackingField: "2\uBC88 \uAC00\uB2C8\uC26C\uB97C 4000ml \uCD94\uAC00" - k__BackingField: 0 - k__BackingField: 5 - - k__BackingField: AddLiquidB - k__BackingField: LiquidBImg - k__BackingField: "B \uC220\uC744 4000ml \uCD94\uAC00" - k__BackingField: 0 - k__BackingField: 5 - - k__BackingField: AddLiquidC - k__BackingField: LiquidCImg - k__BackingField: "C \uC220\uC744 4000ml \uCD94\uAC00" - k__BackingField: 0 - k__BackingField: 5 - - k__BackingField: AddLiquidD - k__BackingField: LiquidDImg - k__BackingField: "D \uC220\uC744 4000ml \uCD94\uAC00" - k__BackingField: 0 - k__BackingField: 5 - - k__BackingField: AddLiquidE - k__BackingField: LiquidEImg - k__BackingField: "E \uC220\uC744 4000ml \uCD94\uAC00" - k__BackingField: 0 - k__BackingField: 5 - - k__BackingField: ChefNpc - k__BackingField: ChefNpcImg - k__BackingField: "\uBC14\uD150\uD130 \uC885\uC5C5\uC6D0 \uCD94\uAC00" - k__BackingField: 5 - k__BackingField: 5 - - k__BackingField: CleanerNpc - k__BackingField: CleanerNpcImg - k__BackingField: "\uCCAD\uC18C \uC885\uC5C5\uC6D0 \uCD94\uAC00" - k__BackingField: 5 - k__BackingField: 5 - - k__BackingField: CleanUp - k__BackingField: CleanUpImgImg - k__BackingField: "\uB808\uC2A4\uD1A0\uB791 \uD55C\uBC88\uC5D0 \uCCAD\uC18C" - k__BackingField: 0 - k__BackingField: 5 - - k__BackingField: ExpGetUp - k__BackingField: ExpGetUpImg - k__BackingField: "\uACBD\uD5D8\uCE58 \uD68D\uB4DD 5% \uC99D\uAC00" - k__BackingField: 10 - k__BackingField: 5 - - k__BackingField: GoldGetUp - k__BackingField: GoldGetUpImg - k__BackingField: "\uACE8\uB4DC \uD68D\uB4DD 5% \uC99D\uAC00" - k__BackingField: 10 - k__BackingField: 5 - - k__BackingField: GuageReset - k__BackingField: GuageResetImg - k__BackingField: "\uBAA8\uB4E0 \uC190\uB2D8\uB4E4\uC758 \uAE30\uB2E4\uB9BC - \uCD08\uAE30\uD654" - k__BackingField: 0 - k__BackingField: 5 - - k__BackingField: HeartAllHeal - k__BackingField: HeartAllHealImg - k__BackingField: "\uD558\uD2B8 \uC804\uCCB4 \uD68C\uBCF5" - k__BackingField: 0 - k__BackingField: 5 - - k__BackingField: HeartHeal - k__BackingField: HeartHealImg - k__BackingField: "\uD558\uD2B8 \uD558\uB098 \uD68C\uBCF5" - k__BackingField: 10 - k__BackingField: 10 - - k__BackingField: HeartPlus - k__BackingField: HeartPlusImg - k__BackingField: "\uD558\uD2B8 \uD558\uB098 \uCD94\uAC00" - k__BackingField: 10 - k__BackingField: 5 - - k__BackingField: ServerNpc - k__BackingField: ServerNpcImg - k__BackingField: "\uC11C\uBE59 \uC885\uC5C5\uC6D0 \uCD94\uAC00" - k__BackingField: 5 - k__BackingField: 5 - - k__BackingField: SpeedUp - k__BackingField: SpeedUpImg - k__BackingField: "\uD50C\uB808\uC774\uC5B4 \uC774\uB3D9 \uC18D\uB3C4 - 5% \uC99D\uAC00" - k__BackingField: 10 - k__BackingField: 5 + _serializedDataList: + - k__BackingField: HeartPlus + k__BackingField: + k__BackingField: HeartPlus + k__BackingField: HeartPlusImg + k__BackingField: "\uD558\uD2B8 \uD558\uB098 \uCD94\uAC00" + k__BackingField: 10 + k__BackingField: 5 + - k__BackingField: HeartHeal + k__BackingField: + k__BackingField: HeartHeal + k__BackingField: HeartHealImg + k__BackingField: "\uD558\uD2B8 \uD558\uB098 \uD68C\uBCF5" + k__BackingField: 10 + k__BackingField: 10 + - k__BackingField: HeartAllHeal + k__BackingField: + k__BackingField: HeartAllHeal + k__BackingField: HeartAllHealImg + k__BackingField: "\uD558\uD2B8 \uC804\uCCB4 \uD68C\uBCF5" + k__BackingField: 0 + k__BackingField: 5 + - k__BackingField: AddLiquidB + k__BackingField: + k__BackingField: AddLiquidB + k__BackingField: LiquidBImg + k__BackingField: "B \uC220\uC744 4000ml \uCD94\uAC00" + k__BackingField: 0 + k__BackingField: 5 + - k__BackingField: AddLiquidC + k__BackingField: + k__BackingField: AddLiquidC + k__BackingField: LiquidCImg + k__BackingField: "C \uC220\uC744 4000ml \uCD94\uAC00" + k__BackingField: 0 + k__BackingField: 5 + - k__BackingField: AddLiquidD + k__BackingField: + k__BackingField: AddLiquidD + k__BackingField: LiquidDImg + k__BackingField: "D \uC220\uC744 4000ml \uCD94\uAC00" + k__BackingField: 0 + k__BackingField: 5 + - k__BackingField: AddLiquidE + k__BackingField: + k__BackingField: AddLiquidE + k__BackingField: LiquidEImg + k__BackingField: "E \uC220\uC744 4000ml \uCD94\uAC00" + k__BackingField: 0 + k__BackingField: 5 + - k__BackingField: AddGarnish1 + k__BackingField: + k__BackingField: AddGarnish1 + k__BackingField: Garnish1Img + k__BackingField: "1\uBC88 \uAC00\uB2C8\uC26C\uB97C 4000ml \uCD94\uAC00" + k__BackingField: 0 + k__BackingField: 5 + - k__BackingField: AddGarnish2 + k__BackingField: + k__BackingField: AddGarnish2 + k__BackingField: Garnish2Img + k__BackingField: "2\uBC88 \uAC00\uB2C8\uC26C\uB97C 4000ml \uCD94\uAC00" + k__BackingField: 0 + k__BackingField: 5 + - k__BackingField: AddAllLiquid + k__BackingField: + k__BackingField: AddAllLiquid + k__BackingField: LiquidAllHealImg + k__BackingField: "\uC804\uCCB4 \uC7AC\uB8CC 1000ml \uCD94\uAC00" + k__BackingField: 0 + k__BackingField: 10 + - k__BackingField: ServerNpc + k__BackingField: + k__BackingField: ServerNpc + k__BackingField: ServerNpcImg + k__BackingField: "\uC11C\uBE59 \uC885\uC5C5\uC6D0 \uCD94\uAC00" + k__BackingField: 5 + k__BackingField: 5 + - k__BackingField: CleanerNpc + k__BackingField: + k__BackingField: CleanerNpc + k__BackingField: CleanerNpcImg + k__BackingField: "\uCCAD\uC18C \uC885\uC5C5\uC6D0 \uCD94\uAC00" + k__BackingField: 5 + k__BackingField: 5 + - k__BackingField: ChefNpc + k__BackingField: + k__BackingField: ChefNpc + k__BackingField: ChefNpcImg + k__BackingField: "\uBC14\uD150\uD130 \uC885\uC5C5\uC6D0 \uCD94\uAC00" + k__BackingField: 5 + k__BackingField: 5 + - k__BackingField: SpeedUp + k__BackingField: + k__BackingField: SpeedUp + k__BackingField: SpeedUpImg + k__BackingField: "\uD50C\uB808\uC774\uC5B4 \uC774\uB3D9 \uC18D\uB3C4 + 5% \uC99D\uAC00" + k__BackingField: 10 + k__BackingField: 5 + - k__BackingField: ExpGetUp + k__BackingField: + k__BackingField: ExpGetUp + k__BackingField: ExpGetUpImg + k__BackingField: "\uACBD\uD5D8\uCE58 \uD68D\uB4DD 5% \uC99D\uAC00" + k__BackingField: 10 + k__BackingField: 5 + - k__BackingField: GoldGetUp + k__BackingField: + k__BackingField: GoldGetUp + k__BackingField: GoldGetUpImg + k__BackingField: "\uACE8\uB4DC \uD68D\uB4DD 5% \uC99D\uAC00" + k__BackingField: 10 + k__BackingField: 5 + - k__BackingField: CleanUp + k__BackingField: + k__BackingField: CleanUp + k__BackingField: CleanUpImgImg + k__BackingField: "\uB808\uC2A4\uD1A0\uB791 \uD55C\uBC88\uC5D0 \uCCAD\uC18C" + k__BackingField: 0 + k__BackingField: 5 + - k__BackingField: GuageReset + k__BackingField: + k__BackingField: GuageReset + k__BackingField: GuageResetImg + k__BackingField: "\uBAA8\uB4E0 \uC190\uB2D8\uB4E4\uC758 \uAE30\uB2E4\uB9BC + \uCD08\uAE30\uD654" + k__BackingField: 0 + k__BackingField: 5 diff --git a/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset index 29d474dfb..65dd5cbc9 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset @@ -12,228 +12,260 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 03802f3276c69a348aaa2515377b47cc, type: 3} m_Name: CocktailDataTable m_EditorClassIdentifier: - k__BackingField: - - k__BackingField: Cocktail000 - k__BackingField: "\uC4F0\uB808\uAE30" - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: {fileID: 0} - - k__BackingField: Cocktail001 - k__BackingField: "\uCE75\uD14C\uC77CA" - k__BackingField: 0 - k__BackingField: LiquidA - k__BackingField: 400 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 06a07650d842ee94390ca2505955e94d, type: 3} - - k__BackingField: Cocktail002 - k__BackingField: "\uCE75\uD14C\uC77CB" - k__BackingField: 0 - k__BackingField: LiquidB - k__BackingField: 400 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 19df9fcd0ddf5754890f7ea9c127b905, type: 3} - - k__BackingField: Cocktail003 - k__BackingField: "\uCE75\uD14C\uC77CC" - k__BackingField: 0 - k__BackingField: LiquidC - k__BackingField: 400 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: a51b37c5e512c7e488e80f986f5f8aac, type: 3} - - k__BackingField: Cocktail004 - k__BackingField: "\uCE75\uD14C\uC77CD" - k__BackingField: 0 - k__BackingField: LiquidD - k__BackingField: 400 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: d74e702a3e490a54e8a159128222f175, type: 3} - - k__BackingField: Cocktail005 - k__BackingField: "\uCE75\uD14C\uC77CE" - k__BackingField: 0 - k__BackingField: LiquidE - k__BackingField: 400 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: bff0ff1345b7ae446b330a01e6ef7bd3, type: 3} - - k__BackingField: Cocktail006 - k__BackingField: "\uCE75\uD14C\uC77CAC" - k__BackingField: 5 - k__BackingField: LiquidA - k__BackingField: 200 - k__BackingField: LiquidC - k__BackingField: 200 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 006a36cba2a146247a1d25b9e246faaa, type: 3} - - k__BackingField: Cocktail007 - k__BackingField: "\uCE75\uD14C\uC77CBD" - k__BackingField: 5 - k__BackingField: LiquidB - k__BackingField: 200 - k__BackingField: LiquidD - k__BackingField: 200 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 31d7e535d499d5f43ab64731acc3eec3, type: 3} - - k__BackingField: Cocktail008 - k__BackingField: "\uCE75\uD14C\uC77CCD" - k__BackingField: 5 - k__BackingField: LiquidC - k__BackingField: 200 - k__BackingField: LiquidD - k__BackingField: 200 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 997d0aea13894a9428bf9d9f7fb66762, type: 3} - - k__BackingField: Cocktail009 - k__BackingField: "\uCE75\uD14C\uC77CABE" - k__BackingField: 10 - k__BackingField: LiquidA - k__BackingField: 100 - k__BackingField: LiquidB - k__BackingField: 100 - k__BackingField: LiquidE - k__BackingField: 200 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 3d04bfa220b9ebe40a4ae3f0a68c0911, type: 3} - - k__BackingField: Cocktail010 - k__BackingField: "\uCE75\uD14C\uC77CCDE" - k__BackingField: 10 - k__BackingField: LiquidC - k__BackingField: 100 - k__BackingField: LiquidD - k__BackingField: 100 - k__BackingField: LiquidE - k__BackingField: 200 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: {fileID: 21300000, guid: 09168d6395b3e9b41b195a2aa8ae0a82, type: 3} - - k__BackingField: Cocktail011 - k__BackingField: "\uCE75\uD14C\uC77CB1" - k__BackingField: 10 - k__BackingField: LiquidB - k__BackingField: 320 - k__BackingField: Garnish1 - k__BackingField: 80 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: {fileID: 0} - - k__BackingField: Cocktail012 - k__BackingField: "\uCE75\uD14C\uC77CD1" - k__BackingField: 10 - k__BackingField: LiquidD - k__BackingField: 320 - k__BackingField: Garnish1 - k__BackingField: 80 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: {fileID: 0} - - k__BackingField: Cocktail013 - k__BackingField: "\uCE75\uD14C\uC77CA2" - k__BackingField: 5 - k__BackingField: LiquidA - k__BackingField: 360 - k__BackingField: Garnish2 - k__BackingField: 40 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: {fileID: 0} - - k__BackingField: Cocktail014 - k__BackingField: "\uCE75\uD14C\uC77CC2" - k__BackingField: 5 - k__BackingField: LiquidC - k__BackingField: 360 - k__BackingField: Garnish2 - k__BackingField: 40 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: {fileID: 0} - - k__BackingField: Cocktail015 - k__BackingField: "\uCE75\uD14C\uC77CE2" - k__BackingField: 5 - k__BackingField: LiquidE - k__BackingField: 360 - k__BackingField: Garnish2 - k__BackingField: 40 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: {fileID: 0} + _serializedDataList: + - k__BackingField: Cocktail000 + k__BackingField: + k__BackingField: Cocktail000 + k__BackingField: "\uC4F0\uB808\uAE30" + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + - k__BackingField: Cocktail001 + k__BackingField: + k__BackingField: Cocktail001 + k__BackingField: "\uCE75\uD14C\uC77CA" + k__BackingField: 0 + k__BackingField: LiquidA + k__BackingField: 400 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 21300000, guid: 06a07650d842ee94390ca2505955e94d, type: 3} + - k__BackingField: Cocktail002 + k__BackingField: + k__BackingField: Cocktail002 + k__BackingField: "\uCE75\uD14C\uC77CB" + k__BackingField: 0 + k__BackingField: LiquidB + k__BackingField: 400 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 21300000, guid: 19df9fcd0ddf5754890f7ea9c127b905, type: 3} + - k__BackingField: Cocktail003 + k__BackingField: + k__BackingField: Cocktail003 + k__BackingField: "\uCE75\uD14C\uC77CC" + k__BackingField: 0 + k__BackingField: LiquidC + k__BackingField: 400 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 21300000, guid: a51b37c5e512c7e488e80f986f5f8aac, type: 3} + - k__BackingField: Cocktail004 + k__BackingField: + k__BackingField: Cocktail004 + k__BackingField: "\uCE75\uD14C\uC77CD" + k__BackingField: 0 + k__BackingField: LiquidD + k__BackingField: 400 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 21300000, guid: d74e702a3e490a54e8a159128222f175, type: 3} + - k__BackingField: Cocktail005 + k__BackingField: + k__BackingField: Cocktail005 + k__BackingField: "\uCE75\uD14C\uC77CE" + k__BackingField: 0 + k__BackingField: LiquidE + k__BackingField: 400 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 21300000, guid: bff0ff1345b7ae446b330a01e6ef7bd3, type: 3} + - k__BackingField: Cocktail006 + k__BackingField: + k__BackingField: Cocktail006 + k__BackingField: "\uCE75\uD14C\uC77CAC" + k__BackingField: 5 + k__BackingField: LiquidA + k__BackingField: 200 + k__BackingField: LiquidC + k__BackingField: 200 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 21300000, guid: 006a36cba2a146247a1d25b9e246faaa, type: 3} + - k__BackingField: Cocktail007 + k__BackingField: + k__BackingField: Cocktail007 + k__BackingField: "\uCE75\uD14C\uC77CBD" + k__BackingField: 5 + k__BackingField: LiquidB + k__BackingField: 200 + k__BackingField: LiquidD + k__BackingField: 200 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 21300000, guid: 31d7e535d499d5f43ab64731acc3eec3, type: 3} + - k__BackingField: Cocktail008 + k__BackingField: + k__BackingField: Cocktail008 + k__BackingField: "\uCE75\uD14C\uC77CCD" + k__BackingField: 5 + k__BackingField: LiquidC + k__BackingField: 200 + k__BackingField: LiquidD + k__BackingField: 200 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 21300000, guid: 997d0aea13894a9428bf9d9f7fb66762, type: 3} + - k__BackingField: Cocktail009 + k__BackingField: + k__BackingField: Cocktail009 + k__BackingField: "\uCE75\uD14C\uC77CABE" + k__BackingField: 10 + k__BackingField: LiquidA + k__BackingField: 100 + k__BackingField: LiquidB + k__BackingField: 100 + k__BackingField: LiquidE + k__BackingField: 200 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 21300000, guid: 3d04bfa220b9ebe40a4ae3f0a68c0911, type: 3} + - k__BackingField: Cocktail010 + k__BackingField: + k__BackingField: Cocktail010 + k__BackingField: "\uCE75\uD14C\uC77CCDE" + k__BackingField: 10 + k__BackingField: LiquidC + k__BackingField: 100 + k__BackingField: LiquidD + k__BackingField: 100 + k__BackingField: LiquidE + k__BackingField: 200 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 21300000, guid: 09168d6395b3e9b41b195a2aa8ae0a82, type: 3} + - k__BackingField: Cocktail011 + k__BackingField: + k__BackingField: Cocktail011 + k__BackingField: "\uCE75\uD14C\uC77CB1" + k__BackingField: 10 + k__BackingField: LiquidB + k__BackingField: 320 + k__BackingField: Garnish1 + k__BackingField: 80 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + - k__BackingField: Cocktail012 + k__BackingField: + k__BackingField: Cocktail012 + k__BackingField: "\uCE75\uD14C\uC77CD1" + k__BackingField: 10 + k__BackingField: LiquidD + k__BackingField: 320 + k__BackingField: Garnish1 + k__BackingField: 80 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + - k__BackingField: Cocktail013 + k__BackingField: + k__BackingField: Cocktail013 + k__BackingField: "\uCE75\uD14C\uC77CA2" + k__BackingField: 5 + k__BackingField: LiquidA + k__BackingField: 360 + k__BackingField: Garnish2 + k__BackingField: 40 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + - k__BackingField: Cocktail014 + k__BackingField: + k__BackingField: Cocktail014 + k__BackingField: "\uCE75\uD14C\uC77CC2" + k__BackingField: 5 + k__BackingField: LiquidC + k__BackingField: 360 + k__BackingField: Garnish2 + k__BackingField: 40 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + - k__BackingField: Cocktail015 + k__BackingField: + k__BackingField: Cocktail015 + k__BackingField: "\uCE75\uD14C\uC77CE2" + k__BackingField: 5 + k__BackingField: LiquidE + k__BackingField: 360 + k__BackingField: Garnish2 + k__BackingField: 40 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} diff --git a/Assets/02.Scripts/ScriptableObject/Item/FoodDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/FoodDataTable.asset index eb11d05b0..fa0167c30 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/FoodDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/FoodDataTable.asset @@ -12,100 +12,112 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e22dd2055785c2f4dadcf76fb593edf4, type: 3} m_Name: FoodDataTable m_EditorClassIdentifier: - k__BackingField: - - k__BackingField: 30001 - k__BackingField: "\uC2AC\uB77C\uC784 \uD478\uB529" - k__BackingField: 4 - k__BackingField: 4 - k__BackingField: 20 - k__BackingField: 10 - k__BackingField: 10108 - k__BackingField: 1 - k__BackingField: 10706 - k__BackingField: 1 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - - k__BackingField: 30002 - k__BackingField: "\uC5BC\uC74C\uB3C4\uCE58 \uD325\uBE59\uC218" - k__BackingField: 4 - k__BackingField: 4 - k__BackingField: 20 - k__BackingField: 10 - k__BackingField: 10109 - k__BackingField: 1 - k__BackingField: 10706 - k__BackingField: 1 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - - k__BackingField: 30003 - k__BackingField: "\uCF54\uBFD4\uC18C \uBFD4 \uD280\uAE40" - k__BackingField: 2 - k__BackingField: 4 - k__BackingField: 20 - k__BackingField: 10 - k__BackingField: 10106 - k__BackingField: 1 - k__BackingField: 10506 - k__BackingField: 1 - k__BackingField: 10704 - k__BackingField: 1 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - - k__BackingField: 30004 - k__BackingField: "\uCF54\uBFD4\uC18C \uB4B7\uB2E4\uB9AC \uACE0\uAE30" - k__BackingField: 3 - k__BackingField: 1 - k__BackingField: 40 - k__BackingField: 10 - k__BackingField: 10107 - k__BackingField: 1 - k__BackingField: 10507 - k__BackingField: 1 - k__BackingField: 10701 - k__BackingField: 1 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - - k__BackingField: 30005 - k__BackingField: "\uBC31\uC0C1\uC5B4 \uD1B5\uAD6C\uC774" - k__BackingField: 1 - k__BackingField: 1 - k__BackingField: 20 - k__BackingField: 10 - k__BackingField: 10201 - k__BackingField: 1 - k__BackingField: 10404 - k__BackingField: 1 - k__BackingField: 10508 - k__BackingField: 1 - k__BackingField: 10704 - k__BackingField: 1 - k__BackingField: - k__BackingField: 0 - - k__BackingField: 30006 - k__BackingField: "\uBC84\uD130 \uC870\uAC1C \uAD6C\uC774" - k__BackingField: 3 - k__BackingField: 4 - k__BackingField: 25 - k__BackingField: 10 - k__BackingField: 10603 - k__BackingField: 1 - k__BackingField: 10503 - k__BackingField: 1 - k__BackingField: 10705 - k__BackingField: 1 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 + _serializedDataList: + - k__BackingField: 30001 + k__BackingField: + k__BackingField: 30001 + k__BackingField: "\uC2AC\uB77C\uC784 \uD478\uB529" + k__BackingField: 4 + k__BackingField: 4 + k__BackingField: 20 + k__BackingField: 10 + k__BackingField: 10108 + k__BackingField: 1 + k__BackingField: 10706 + k__BackingField: 1 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + - k__BackingField: 30002 + k__BackingField: + k__BackingField: 30002 + k__BackingField: "\uC5BC\uC74C\uB3C4\uCE58 \uD325\uBE59\uC218" + k__BackingField: 4 + k__BackingField: 4 + k__BackingField: 20 + k__BackingField: 10 + k__BackingField: 10109 + k__BackingField: 1 + k__BackingField: 10706 + k__BackingField: 1 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + - k__BackingField: 30003 + k__BackingField: + k__BackingField: 30003 + k__BackingField: "\uCF54\uBFD4\uC18C \uBFD4 \uD280\uAE40" + k__BackingField: 2 + k__BackingField: 4 + k__BackingField: 20 + k__BackingField: 10 + k__BackingField: 10106 + k__BackingField: 1 + k__BackingField: 10506 + k__BackingField: 1 + k__BackingField: 10704 + k__BackingField: 1 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + - k__BackingField: 30004 + k__BackingField: + k__BackingField: 30004 + k__BackingField: "\uCF54\uBFD4\uC18C \uB4B7\uB2E4\uB9AC \uACE0\uAE30" + k__BackingField: 3 + k__BackingField: 1 + k__BackingField: 40 + k__BackingField: 10 + k__BackingField: 10107 + k__BackingField: 1 + k__BackingField: 10507 + k__BackingField: 1 + k__BackingField: 10701 + k__BackingField: 1 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + - k__BackingField: 30005 + k__BackingField: + k__BackingField: 30005 + k__BackingField: "\uBC31\uC0C1\uC5B4 \uD1B5\uAD6C\uC774" + k__BackingField: 1 + k__BackingField: 1 + k__BackingField: 20 + k__BackingField: 10 + k__BackingField: 10201 + k__BackingField: 1 + k__BackingField: 10404 + k__BackingField: 1 + k__BackingField: 10508 + k__BackingField: 1 + k__BackingField: 10704 + k__BackingField: 1 + k__BackingField: + k__BackingField: 0 + - k__BackingField: 30006 + k__BackingField: + k__BackingField: 30006 + k__BackingField: "\uBC84\uD130 \uC870\uAC1C \uAD6C\uC774" + k__BackingField: 3 + k__BackingField: 4 + k__BackingField: 25 + k__BackingField: 10 + k__BackingField: 10603 + k__BackingField: 1 + k__BackingField: 10503 + k__BackingField: 1 + k__BackingField: 10705 + k__BackingField: 1 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 diff --git a/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset index 67e01a9dd..0baaa77b9 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset @@ -12,604 +12,724 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f7fe40513dd0a794689cc8a52ddb2f87, type: 3} m_Name: ItemDataTable m_EditorClassIdentifier: - k__BackingField: - - k__BackingField: 10101 - k__BackingField: "\uD0B9\uD06C\uB7A9" - k__BackingField: 1 - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10102 - k__BackingField: "\uACF5\uB8E1 \uACE0\uAE30" - k__BackingField: 1 - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10103 - k__BackingField: "\uB7A8\uACE0\uAE30" - k__BackingField: 1 - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10104 - k__BackingField: "\uB2ED\uACE0\uAE30" - k__BackingField: 1 - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10105 - k__BackingField: "\uBC40\uACE0\uAE30" - k__BackingField: 1 - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10106 - k__BackingField: "\uCF54\uBFD4\uC18C \uBFD4" - k__BackingField: 1 - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10107 - k__BackingField: "\uCF54\uBFD4\uC18C \uB2E4\uB9AC\uC0B4" - k__BackingField: 1 - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10108 - k__BackingField: "\uC2AC\uB77C\uC784 \uCC0C\uAC70\uAE30" - k__BackingField: 1 - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10109 - k__BackingField: "\uC5BC\uC74C \uAC00\uC2DC" - k__BackingField: 1 - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10201 - k__BackingField: "\uBC31\uC0C1\uC5B4" - k__BackingField: 1 - k__BackingField: 2 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10202 - k__BackingField: "\uB2C8\uBAA8" - k__BackingField: 1 - k__BackingField: 2 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10203 - k__BackingField: "\uD574\uD30C\uB9AC" - k__BackingField: 1 - k__BackingField: 2 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10204 - k__BackingField: "\uAC00\uC624\uB9AC" - k__BackingField: 1 - k__BackingField: 2 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10205 - k__BackingField: "\uC6B0\uB7ED" - k__BackingField: 1 - k__BackingField: 2 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10301 - k__BackingField: "\uB370\uC2A4\uB3C4\uC5B4\uC758 \uC54C" - k__BackingField: 1 - k__BackingField: 3 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10302 - k__BackingField: "\uACF5\uB8E1\uC54C" - k__BackingField: 1 - k__BackingField: 3 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10401 - k__BackingField: "\uBA54\uB860" - k__BackingField: 1 - k__BackingField: 4 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10402 - k__BackingField: "\uD1A0\uB9C8\uD1A0" - k__BackingField: 1 - k__BackingField: 4 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10403 - k__BackingField: "\uC0AC\uACFC" - k__BackingField: 1 - k__BackingField: 4 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10404 - k__BackingField: "\uB808\uBAAC" - k__BackingField: 1 - k__BackingField: 4 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10501 - k__BackingField: "\uB9C8\uB298" - k__BackingField: 1 - k__BackingField: 5 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10502 - k__BackingField: "\uC591\uD30C" - k__BackingField: 1 - k__BackingField: 5 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10503 - k__BackingField: "\uB300\uD30C" - k__BackingField: 1 - k__BackingField: 5 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10504 - k__BackingField: "\uD30C\uC2AC\uB9AC" - k__BackingField: 1 - k__BackingField: 5 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10505 - k__BackingField: "\uB2E4\uC2DC\uB9C8" - k__BackingField: 1 - k__BackingField: 5 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10506 - k__BackingField: "\uD30C\uD504\uB9AC\uCE74" - k__BackingField: 1 - k__BackingField: 5 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10507 - k__BackingField: "\uBC30\uCD94" - k__BackingField: 1 - k__BackingField: 5 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10508 - k__BackingField: "\uBE0C\uB85C\uCF5C\uB9AC" - k__BackingField: 1 - k__BackingField: 5 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10509 - k__BackingField: "\uAE7B\uC78E" - k__BackingField: 1 - k__BackingField: 5 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10601 - k__BackingField: "\uC9C4\uC8FC \uC870\uAC1C" - k__BackingField: 1 - k__BackingField: 6 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10602 - k__BackingField: "\uBC14\uB2E4 \uC870\uAC1C" - k__BackingField: 1 - k__BackingField: 6 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10603 - k__BackingField: "\uAC70\uB300 \uC870\uAC1C" - k__BackingField: 1 - k__BackingField: 6 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10701 - k__BackingField: "\uC18C\uAE08" - k__BackingField: 1 - k__BackingField: 7 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10702 - k__BackingField: "\uACE0\uCDA7\uAC00\uB8E8" - k__BackingField: 1 - k__BackingField: 7 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10703 - k__BackingField: "\uD6C4\uCD94" - k__BackingField: 1 - k__BackingField: 7 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10704 - k__BackingField: "\uAC04\uC7A5" - k__BackingField: 1 - k__BackingField: 7 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10705 - k__BackingField: "\uBC84\uD130" - k__BackingField: 1 - k__BackingField: 7 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 10706 - k__BackingField: "\uC124\uD0D5" - k__BackingField: 1 - k__BackingField: 7 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 20001 - k__BackingField: "\uBCF4\uBB3C \uC0C1\uC790 (\uB3D9)" - k__BackingField: 2 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 500 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 20002 - k__BackingField: "\uBCF4\uBB3C \uC0C1\uC790 (\uC740)" - k__BackingField: 2 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 1000 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 20003 - k__BackingField: "\uBCF4\uBB3C \uC0C1\uC790 (\uAE08)" - k__BackingField: 2 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 2000 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 20004 - k__BackingField: "\uBBF8\uBBF9" - k__BackingField: 2 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 30001 - k__BackingField: "\uC2AC\uB77C\uC784 \uD478\uB529" - k__BackingField: 3 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 500 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 30002 - k__BackingField: "\uC5BC\uC74C\uB3C4\uCE58 \uD325\uBE59\uC218" - k__BackingField: 3 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 500 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 30003 - k__BackingField: "\uCF54\uBFD4\uC18C \uBFD4 \uD280\uAE40" - k__BackingField: 3 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 150 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 30004 - k__BackingField: "\uCF54\uBFD4\uC18C \uB4B7\uB2E4\uB9AC \uACE0\uAE30" - k__BackingField: 3 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 500 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 30005 - k__BackingField: "\uBC31\uC0C1\uC5B4 \uD1B5\uAD6C\uC774" - k__BackingField: 3 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 150 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 30006 - k__BackingField: "\uBC84\uD130 \uC870\uAC1C \uAD6C\uC774" - k__BackingField: 3 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 140 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 40001 - k__BackingField: "\uB9E5\uC8FC" - k__BackingField: 4 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 50001 - k__BackingField: "\uD558\uD2B8 \uBC18 \uAC1C" - k__BackingField: 5 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 50002 - k__BackingField: "\uD558\uD2B8 \uD55C \uAC1C" - k__BackingField: 5 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 60001 - k__BackingField: "\uC82C\uC2A4\uD1A4" - k__BackingField: 6 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 1000 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 60002 - k__BackingField: "\uD480\uC78E" - k__BackingField: 6 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 10 - k__BackingField: 1 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: 70001 - k__BackingField: "\uC7A5\uC791" - k__BackingField: 7 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: Ingredient00 - k__BackingField: "\uC800\uC8FC \uBC1B\uC740 \uBCF4\uB9AC" - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 50 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: Ingredient01 - k__BackingField: "\uC2EC\uC5F0\uC758 \uD574\uCD08" - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 50 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: Ingredient02 - k__BackingField: "\uB3C4\uAE68\uBE44 \uBD88" - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 50 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: Ingredient03 - k__BackingField: "\uC6A9\uC554 \uBCF4\uB9AC" - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 50 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: Ingredient04 - k__BackingField: "\uC601\uD63C\uC758 \uC548\uAC1C" - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 50 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} - - k__BackingField: Ingredient05 - k__BackingField: "\uC5BC\uC74C \uC2AC\uB77C\uC784\uC758 \uC601\uD63C" - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 50 - k__BackingField: 100 - k__BackingField: - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} + _serializedDataList: + - k__BackingField: 10101 + k__BackingField: + k__BackingField: 10101 + k__BackingField: "\uD0B9\uD06C\uB7A9" + k__BackingField: 1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10102 + k__BackingField: + k__BackingField: 10102 + k__BackingField: "\uACF5\uB8E1 \uACE0\uAE30" + k__BackingField: 1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10103 + k__BackingField: + k__BackingField: 10103 + k__BackingField: "\uB7A8\uACE0\uAE30" + k__BackingField: 1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10104 + k__BackingField: + k__BackingField: 10104 + k__BackingField: "\uB2ED\uACE0\uAE30" + k__BackingField: 1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10105 + k__BackingField: + k__BackingField: 10105 + k__BackingField: "\uBC40\uACE0\uAE30" + k__BackingField: 1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10106 + k__BackingField: + k__BackingField: 10106 + k__BackingField: "\uCF54\uBFD4\uC18C \uBFD4" + k__BackingField: 1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10107 + k__BackingField: + k__BackingField: 10107 + k__BackingField: "\uCF54\uBFD4\uC18C \uB2E4\uB9AC\uC0B4" + k__BackingField: 1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10108 + k__BackingField: + k__BackingField: 10108 + k__BackingField: "\uC2AC\uB77C\uC784 \uCC0C\uAC70\uAE30" + k__BackingField: 1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10109 + k__BackingField: + k__BackingField: 10109 + k__BackingField: "\uC5BC\uC74C \uAC00\uC2DC" + k__BackingField: 1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10201 + k__BackingField: + k__BackingField: 10201 + k__BackingField: "\uBC31\uC0C1\uC5B4" + k__BackingField: 1 + k__BackingField: 2 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10202 + k__BackingField: + k__BackingField: 10202 + k__BackingField: "\uB2C8\uBAA8" + k__BackingField: 1 + k__BackingField: 2 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10203 + k__BackingField: + k__BackingField: 10203 + k__BackingField: "\uD574\uD30C\uB9AC" + k__BackingField: 1 + k__BackingField: 2 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10204 + k__BackingField: + k__BackingField: 10204 + k__BackingField: "\uAC00\uC624\uB9AC" + k__BackingField: 1 + k__BackingField: 2 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10205 + k__BackingField: + k__BackingField: 10205 + k__BackingField: "\uC6B0\uB7ED" + k__BackingField: 1 + k__BackingField: 2 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10301 + k__BackingField: + k__BackingField: 10301 + k__BackingField: "\uB370\uC2A4\uB3C4\uC5B4\uC758 \uC54C" + k__BackingField: 1 + k__BackingField: 3 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10302 + k__BackingField: + k__BackingField: 10302 + k__BackingField: "\uACF5\uB8E1\uC54C" + k__BackingField: 1 + k__BackingField: 3 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10401 + k__BackingField: + k__BackingField: 10401 + k__BackingField: "\uBA54\uB860" + k__BackingField: 1 + k__BackingField: 4 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10402 + k__BackingField: + k__BackingField: 10402 + k__BackingField: "\uD1A0\uB9C8\uD1A0" + k__BackingField: 1 + k__BackingField: 4 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10403 + k__BackingField: + k__BackingField: 10403 + k__BackingField: "\uC0AC\uACFC" + k__BackingField: 1 + k__BackingField: 4 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10404 + k__BackingField: + k__BackingField: 10404 + k__BackingField: "\uB808\uBAAC" + k__BackingField: 1 + k__BackingField: 4 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10501 + k__BackingField: + k__BackingField: 10501 + k__BackingField: "\uB9C8\uB298" + k__BackingField: 1 + k__BackingField: 5 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10502 + k__BackingField: + k__BackingField: 10502 + k__BackingField: "\uC591\uD30C" + k__BackingField: 1 + k__BackingField: 5 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10503 + k__BackingField: + k__BackingField: 10503 + k__BackingField: "\uB300\uD30C" + k__BackingField: 1 + k__BackingField: 5 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10504 + k__BackingField: + k__BackingField: 10504 + k__BackingField: "\uD30C\uC2AC\uB9AC" + k__BackingField: 1 + k__BackingField: 5 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10505 + k__BackingField: + k__BackingField: 10505 + k__BackingField: "\uB2E4\uC2DC\uB9C8" + k__BackingField: 1 + k__BackingField: 5 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10506 + k__BackingField: + k__BackingField: 10506 + k__BackingField: "\uD30C\uD504\uB9AC\uCE74" + k__BackingField: 1 + k__BackingField: 5 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10507 + k__BackingField: + k__BackingField: 10507 + k__BackingField: "\uBC30\uCD94" + k__BackingField: 1 + k__BackingField: 5 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10508 + k__BackingField: + k__BackingField: 10508 + k__BackingField: "\uBE0C\uB85C\uCF5C\uB9AC" + k__BackingField: 1 + k__BackingField: 5 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10509 + k__BackingField: + k__BackingField: 10509 + k__BackingField: "\uAE7B\uC78E" + k__BackingField: 1 + k__BackingField: 5 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10601 + k__BackingField: + k__BackingField: 10601 + k__BackingField: "\uC9C4\uC8FC \uC870\uAC1C" + k__BackingField: 1 + k__BackingField: 6 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10602 + k__BackingField: + k__BackingField: 10602 + k__BackingField: "\uBC14\uB2E4 \uC870\uAC1C" + k__BackingField: 1 + k__BackingField: 6 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10603 + k__BackingField: + k__BackingField: 10603 + k__BackingField: "\uAC70\uB300 \uC870\uAC1C" + k__BackingField: 1 + k__BackingField: 6 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10701 + k__BackingField: + k__BackingField: 10701 + k__BackingField: "\uC18C\uAE08" + k__BackingField: 1 + k__BackingField: 7 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10702 + k__BackingField: + k__BackingField: 10702 + k__BackingField: "\uACE0\uCDA7\uAC00\uB8E8" + k__BackingField: 1 + k__BackingField: 7 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10703 + k__BackingField: + k__BackingField: 10703 + k__BackingField: "\uD6C4\uCD94" + k__BackingField: 1 + k__BackingField: 7 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10704 + k__BackingField: + k__BackingField: 10704 + k__BackingField: "\uAC04\uC7A5" + k__BackingField: 1 + k__BackingField: 7 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10705 + k__BackingField: + k__BackingField: 10705 + k__BackingField: "\uBC84\uD130" + k__BackingField: 1 + k__BackingField: 7 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 10706 + k__BackingField: + k__BackingField: 10706 + k__BackingField: "\uC124\uD0D5" + k__BackingField: 1 + k__BackingField: 7 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 20001 + k__BackingField: + k__BackingField: 20001 + k__BackingField: "\uBCF4\uBB3C \uC0C1\uC790 (\uB3D9)" + k__BackingField: 2 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 500 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 20002 + k__BackingField: + k__BackingField: 20002 + k__BackingField: "\uBCF4\uBB3C \uC0C1\uC790 (\uC740)" + k__BackingField: 2 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 1000 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 20003 + k__BackingField: + k__BackingField: 20003 + k__BackingField: "\uBCF4\uBB3C \uC0C1\uC790 (\uAE08)" + k__BackingField: 2 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 2000 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 20004 + k__BackingField: + k__BackingField: 20004 + k__BackingField: "\uBBF8\uBBF9" + k__BackingField: 2 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 30001 + k__BackingField: + k__BackingField: 30001 + k__BackingField: "\uC2AC\uB77C\uC784 \uD478\uB529" + k__BackingField: 3 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 500 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 30002 + k__BackingField: + k__BackingField: 30002 + k__BackingField: "\uC5BC\uC74C\uB3C4\uCE58 \uD325\uBE59\uC218" + k__BackingField: 3 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 500 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 30003 + k__BackingField: + k__BackingField: 30003 + k__BackingField: "\uCF54\uBFD4\uC18C \uBFD4 \uD280\uAE40" + k__BackingField: 3 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 150 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 30004 + k__BackingField: + k__BackingField: 30004 + k__BackingField: "\uCF54\uBFD4\uC18C \uB4B7\uB2E4\uB9AC \uACE0\uAE30" + k__BackingField: 3 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 500 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 30005 + k__BackingField: + k__BackingField: 30005 + k__BackingField: "\uBC31\uC0C1\uC5B4 \uD1B5\uAD6C\uC774" + k__BackingField: 3 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 150 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 30006 + k__BackingField: + k__BackingField: 30006 + k__BackingField: "\uBC84\uD130 \uC870\uAC1C \uAD6C\uC774" + k__BackingField: 3 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 140 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 40001 + k__BackingField: + k__BackingField: 40001 + k__BackingField: "\uB9E5\uC8FC" + k__BackingField: 4 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 50001 + k__BackingField: + k__BackingField: 50001 + k__BackingField: "\uD558\uD2B8 \uBC18 \uAC1C" + k__BackingField: 5 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 50002 + k__BackingField: + k__BackingField: 50002 + k__BackingField: "\uD558\uD2B8 \uD55C \uAC1C" + k__BackingField: 5 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 60001 + k__BackingField: + k__BackingField: 60001 + k__BackingField: "\uC82C\uC2A4\uD1A4" + k__BackingField: 6 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 1000 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 60002 + k__BackingField: + k__BackingField: 60002 + k__BackingField: "\uD480\uC78E" + k__BackingField: 6 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 10 + k__BackingField: 1 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: 70001 + k__BackingField: + k__BackingField: 70001 + k__BackingField: "\uC7A5\uC791" + k__BackingField: 7 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: Ingredient00 + k__BackingField: + k__BackingField: Ingredient00 + k__BackingField: "\uC800\uC8FC \uBC1B\uC740 \uBCF4\uB9AC" + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 50 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: Ingredient01 + k__BackingField: + k__BackingField: Ingredient01 + k__BackingField: "\uC2EC\uC5F0\uC758 \uD574\uCD08" + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 50 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: Ingredient02 + k__BackingField: + k__BackingField: Ingredient02 + k__BackingField: "\uB3C4\uAE68\uBE44 \uBD88" + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 50 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: Ingredient03 + k__BackingField: + k__BackingField: Ingredient03 + k__BackingField: "\uC6A9\uC554 \uBCF4\uB9AC" + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 50 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: Ingredient04 + k__BackingField: + k__BackingField: Ingredient04 + k__BackingField: "\uC601\uD63C\uC758 \uC548\uAC1C" + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 50 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} + - k__BackingField: Ingredient05 + k__BackingField: + k__BackingField: Ingredient05 + k__BackingField: "\uC5BC\uC74C \uC2AC\uB77C\uC784\uC758 \uC601\uD63C" + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 0 + k__BackingField: 50 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 0} + k__BackingField: {fileID: 0} diff --git a/Assets/02.Scripts/ScriptableObject/Item/ItemDropTable.asset b/Assets/02.Scripts/ScriptableObject/Item/ItemDropTable.asset index 146cbe869..b96a949f2 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/ItemDropTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/ItemDropTable.asset @@ -12,80 +12,90 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9b4027f974cd5234690df1b35ca492ac, type: 3} m_Name: ItemDropTable m_EditorClassIdentifier: - ItemDropTables: - - k__BackingField: - k__BackingField: 1 - k__BackingField: "\uD0C0\uC774\uD0C4 \uC2AC\uB77C\uC784" - k__BackingField: - - k__BackingField: 50002 - k__BackingField: 100 - k__BackingField: 1 - k__BackingField: 1 - - k__BackingField: 50002 - k__BackingField: 100 - k__BackingField: 1 - k__BackingField: 1 - - k__BackingField: 50001 - k__BackingField: 100 - k__BackingField: 1 - k__BackingField: 1 - - k__BackingField: 60001 - k__BackingField: 100 - k__BackingField: 1 - k__BackingField: 1 - - k__BackingField: - k__BackingField: 2 - k__BackingField: "\uCF54\uBFD4\uC18C" - k__BackingField: - - k__BackingField: 50002 - k__BackingField: 100 - k__BackingField: 1 - k__BackingField: 1 - - k__BackingField: 50002 - k__BackingField: 100 - k__BackingField: 1 - k__BackingField: 1 - - k__BackingField: 50001 - k__BackingField: 100 - k__BackingField: 1 - k__BackingField: 1 - - k__BackingField: - k__BackingField: 3 - k__BackingField: "\uBAA8\uB798 \uB450\uB354\uC9C0" - k__BackingField: - - k__BackingField: 50002 - k__BackingField: 100 - k__BackingField: 1 - k__BackingField: 1 - - k__BackingField: 50002 - k__BackingField: 100 - k__BackingField: 1 - k__BackingField: 1 - - k__BackingField: 50001 - k__BackingField: 100 - k__BackingField: 1 - k__BackingField: 1 - - k__BackingField: - k__BackingField: 4 - k__BackingField: "\uC220\uD1B5 \uC720\uB839" - k__BackingField: - - k__BackingField: 50002 - k__BackingField: 100 - k__BackingField: 1 - k__BackingField: 1 - - k__BackingField: 50002 - k__BackingField: 100 - k__BackingField: 1 - k__BackingField: 1 - - k__BackingField: 50001 - k__BackingField: 100 - k__BackingField: 1 - k__BackingField: 1 - - k__BackingField: - k__BackingField: 101 - k__BackingField: "\uD480" - k__BackingField: - - k__BackingField: 60002 - k__BackingField: 40 - k__BackingField: 1 - k__BackingField: 5 + _serializedDataList: + - k__BackingField: 1 + k__BackingField: + k__BackingField: + k__BackingField: 1 + k__BackingField: "\uD0C0\uC774\uD0C4 \uC2AC\uB77C\uC784" + k__BackingField: + - k__BackingField: 50002 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: 50002 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: 50001 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: 60001 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: 2 + k__BackingField: + k__BackingField: + k__BackingField: 2 + k__BackingField: "\uCF54\uBFD4\uC18C" + k__BackingField: + - k__BackingField: 50002 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: 50002 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: 50001 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: 3 + k__BackingField: + k__BackingField: + k__BackingField: 3 + k__BackingField: "\uBAA8\uB798 \uB450\uB354\uC9C0" + k__BackingField: + - k__BackingField: 50002 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: 50002 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: 50001 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: 4 + k__BackingField: + k__BackingField: + k__BackingField: 4 + k__BackingField: "\uC220\uD1B5 \uC720\uB839" + k__BackingField: + - k__BackingField: 50002 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: 50002 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: 50001 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 + - k__BackingField: 101 + k__BackingField: + k__BackingField: + k__BackingField: 101 + k__BackingField: "\uD480" + k__BackingField: + - k__BackingField: 60002 + k__BackingField: 40 + k__BackingField: 1 + k__BackingField: 5 diff --git a/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset index dd40ac3de..5cb35d4fb 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset @@ -12,39 +12,53 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1f91e197a0d142b40ae1ec8bd1300fb3, type: 3} m_Name: LiquidDataTable m_EditorClassIdentifier: - k__BackingField: - - k__BackingField: Garnish1 - k__BackingField: "\uAC00\uB098\uC26C1" - k__BackingField: 2000 - k__BackingField: {fileID: 0} - k__BackingField: {r: 0, g: 0, b: 0, a: 1} - - k__BackingField: Garnish2 - k__BackingField: "\uAC00\uB098\uC26C2" - k__BackingField: 2000 - k__BackingField: {fileID: 0} - k__BackingField: {r: 0, g: 0, b: 0, a: 1} - - k__BackingField: LiquidA - k__BackingField: "\uC220 \uC6D0\uC561A" - k__BackingField: 99999 - k__BackingField: {fileID: 0} - k__BackingField: {r: 1, g: 0, b: 0, a: 1} - - k__BackingField: LiquidB - k__BackingField: "\uC220 \uC6D0\uC561B" - k__BackingField: 2000 - k__BackingField: {fileID: 0} - k__BackingField: {r: 1, g: 0.5019608, b: 0, a: 1} - - k__BackingField: LiquidC - k__BackingField: "\uC220 \uC6D0\uC561C" - k__BackingField: 2000 - k__BackingField: {fileID: 0} - k__BackingField: {r: 1, g: 1, b: 0, a: 1} - - k__BackingField: LiquidD - k__BackingField: "\uC220 \uC6D0\uC561D" - k__BackingField: 2000 - k__BackingField: {fileID: 0} - k__BackingField: {r: 0, g: 1, b: 0, a: 1} - - k__BackingField: LiquidE - k__BackingField: "\uC220 \uC6D0\uC561E" - k__BackingField: 2000 - k__BackingField: {fileID: 0} - k__BackingField: {r: 0, g: 0, b: 1, a: 1} + _serializedDataList: + - k__BackingField: LiquidA + k__BackingField: + k__BackingField: LiquidA + k__BackingField: "\uC220 \uC6D0\uC561A" + k__BackingField: 99999 + k__BackingField: {fileID: 0} + k__BackingField: {r: 1, g: 0, b: 0, a: 1} + - k__BackingField: LiquidB + k__BackingField: + k__BackingField: LiquidB + k__BackingField: "\uC220 \uC6D0\uC561B" + k__BackingField: 2000 + k__BackingField: {fileID: 0} + k__BackingField: {r: 1, g: 0.5019608, b: 0, a: 1} + - k__BackingField: LiquidC + k__BackingField: + k__BackingField: LiquidC + k__BackingField: "\uC220 \uC6D0\uC561C" + k__BackingField: 2000 + k__BackingField: {fileID: 0} + k__BackingField: {r: 1, g: 1, b: 0, a: 1} + - k__BackingField: LiquidD + k__BackingField: + k__BackingField: LiquidD + k__BackingField: "\uC220 \uC6D0\uC561D" + k__BackingField: 2000 + k__BackingField: {fileID: 0} + k__BackingField: {r: 0, g: 1, b: 0, a: 1} + - k__BackingField: LiquidE + k__BackingField: + k__BackingField: LiquidE + k__BackingField: "\uC220 \uC6D0\uC561E" + k__BackingField: 2000 + k__BackingField: {fileID: 0} + k__BackingField: {r: 0, g: 0, b: 1, a: 1} + - k__BackingField: Garnish1 + k__BackingField: + k__BackingField: Garnish1 + k__BackingField: "\uAC00\uB098\uC26C1" + k__BackingField: 2000 + k__BackingField: {fileID: 0} + k__BackingField: {r: 0, g: 0, b: 0, a: 0} + - k__BackingField: Garnish2 + k__BackingField: + k__BackingField: Garnish2 + k__BackingField: "\uAC00\uB098\uC26C2" + k__BackingField: 2000 + k__BackingField: {fileID: 0} + k__BackingField: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset b/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset index 74af4ca02..60668ad80 100644 --- a/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/LevelDataTable.asset @@ -12,364 +12,444 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4291963c8b013de498435ab3a9250323, type: 3} m_Name: LevelDataTable m_EditorClassIdentifier: - k__BackingField: - - k__BackingField: 1 - k__BackingField: 15 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 200 - k__BackingField: 20 - k__BackingField: 20 - k__BackingField: 10 - k__BackingField: - - k__BackingField: 10 - k__BackingField: 13 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 1100 - k__BackingField: 16 - k__BackingField: 15 - k__BackingField: 10 - k__BackingField: Upgrade2 - - k__BackingField: 11 - k__BackingField: 11 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 1200 - k__BackingField: 15 - k__BackingField: 14 - k__BackingField: 8 - k__BackingField: - - k__BackingField: 12 - k__BackingField: 11 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 1300 - k__BackingField: 15 - k__BackingField: 13 - k__BackingField: 8 - k__BackingField: - - k__BackingField: 13 - k__BackingField: 11 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 1400 - k__BackingField: 15 - k__BackingField: 12 - k__BackingField: 8 - k__BackingField: - - k__BackingField: 14 - k__BackingField: 11 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 1500 - k__BackingField: 15 - k__BackingField: 11 - k__BackingField: 8 - k__BackingField: - - k__BackingField: 15 - k__BackingField: 11 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 1600 - k__BackingField: 15 - k__BackingField: 10 - k__BackingField: 8 - k__BackingField: Upgrade3 - - k__BackingField: 16 - k__BackingField: 9 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 1700 - k__BackingField: 15 - k__BackingField: 10 - k__BackingField: 8 - k__BackingField: - - k__BackingField: 17 - k__BackingField: 9 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 1800 - k__BackingField: 14 - k__BackingField: 10 - k__BackingField: 8 - k__BackingField: - - k__BackingField: 18 - k__BackingField: 9 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 1900 - k__BackingField: 13 - k__BackingField: 10 - k__BackingField: 8 - k__BackingField: - - k__BackingField: 19 - k__BackingField: 9 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 2000 - k__BackingField: 12 - k__BackingField: 10 - k__BackingField: 8 - k__BackingField: - - k__BackingField: 2 - k__BackingField: 15 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 300 - k__BackingField: 20 - k__BackingField: 19 - k__BackingField: 10 - k__BackingField: - - k__BackingField: 20 - k__BackingField: 9 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 2100 - k__BackingField: 11 - k__BackingField: 10 - k__BackingField: 8 - k__BackingField: Upgrade4 - - k__BackingField: 21 - k__BackingField: 7 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 2200 - k__BackingField: 10 - k__BackingField: 10 - k__BackingField: 6 - k__BackingField: - - k__BackingField: 22 - k__BackingField: 7 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 2300 - k__BackingField: 10 - k__BackingField: 9 - k__BackingField: 6 - k__BackingField: - - k__BackingField: 23 - k__BackingField: 7 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 2400 - k__BackingField: 10 - k__BackingField: 8 - k__BackingField: 6 - k__BackingField: - - k__BackingField: 24 - k__BackingField: 7 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 2500 - k__BackingField: 10 - k__BackingField: 7 - k__BackingField: 6 - k__BackingField: - - k__BackingField: 25 - k__BackingField: 7 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 2600 - k__BackingField: 10 - k__BackingField: 6 - k__BackingField: 6 - k__BackingField: Upgrade5 - - k__BackingField: 26 - k__BackingField: 5 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 2700 - k__BackingField: 10 - k__BackingField: 5 - k__BackingField: 6 - k__BackingField: - - k__BackingField: 27 - k__BackingField: 5 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 2800 - k__BackingField: 10 - k__BackingField: 5 - k__BackingField: 6 - k__BackingField: - - k__BackingField: 28 - k__BackingField: 5 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 2900 - k__BackingField: 10 - k__BackingField: 5 - k__BackingField: 6 - k__BackingField: - - k__BackingField: 29 - k__BackingField: 5 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 3000 - k__BackingField: 10 - k__BackingField: 5 - k__BackingField: 6 - k__BackingField: - - k__BackingField: 3 - k__BackingField: 15 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 400 - k__BackingField: 20 - k__BackingField: 18 - k__BackingField: 10 - k__BackingField: - - k__BackingField: 30 - k__BackingField: 5 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 3100 - k__BackingField: 10 - k__BackingField: 5 - k__BackingField: 6 - k__BackingField: Upgrade6 - - k__BackingField: 31 - k__BackingField: 5 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 3200 - k__BackingField: 10 - k__BackingField: 5 - k__BackingField: 6 - k__BackingField: - - k__BackingField: 32 - k__BackingField: 5 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 3300 - k__BackingField: 10 - k__BackingField: 5 - k__BackingField: 6 - k__BackingField: - - k__BackingField: 33 - k__BackingField: 5 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 3400 - k__BackingField: 10 - k__BackingField: 5 - k__BackingField: 6 - k__BackingField: - - k__BackingField: 34 - k__BackingField: 5 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 3500 - k__BackingField: 10 - k__BackingField: 5 - k__BackingField: 6 - k__BackingField: - - k__BackingField: 35 - k__BackingField: 5 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 3600 - k__BackingField: 10 - k__BackingField: 5 - k__BackingField: 6 - k__BackingField: - - k__BackingField: 36 - k__BackingField: 5 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 3700 - k__BackingField: 10 - k__BackingField: 5 - k__BackingField: 6 - k__BackingField: - - k__BackingField: 37 - k__BackingField: 5 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 3800 - k__BackingField: 10 - k__BackingField: 5 - k__BackingField: 6 - k__BackingField: - - k__BackingField: 38 - k__BackingField: 5 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 3900 - k__BackingField: 10 - k__BackingField: 5 - k__BackingField: 6 - k__BackingField: - - k__BackingField: 39 - k__BackingField: 5 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 4000 - k__BackingField: 10 - k__BackingField: 5 - k__BackingField: 6 - k__BackingField: - - k__BackingField: 4 - k__BackingField: 15 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 500 - k__BackingField: 20 - k__BackingField: 17 - k__BackingField: 10 - k__BackingField: - - k__BackingField: 40 - k__BackingField: 5 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 4100 - k__BackingField: 10 - k__BackingField: 5 - k__BackingField: 6 - k__BackingField: - - k__BackingField: 5 - k__BackingField: 15 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 600 - k__BackingField: 20 - k__BackingField: 16 - k__BackingField: 10 - k__BackingField: Upgrade1 - - k__BackingField: 6 - k__BackingField: 13 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 700 - k__BackingField: 20 - k__BackingField: 15 - k__BackingField: 10 - k__BackingField: - - k__BackingField: 7 - k__BackingField: 13 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 800 - k__BackingField: 19 - k__BackingField: 15 - k__BackingField: 10 - k__BackingField: - - k__BackingField: 8 - k__BackingField: 13 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 900 - k__BackingField: 18 - k__BackingField: 15 - k__BackingField: 10 - k__BackingField: - - k__BackingField: 9 - k__BackingField: 13 - k__BackingField: 100 - k__BackingField: 100 - k__BackingField: 1000 - k__BackingField: 17 - k__BackingField: 15 - k__BackingField: 10 - k__BackingField: + _serializedDataList: + - k__BackingField: 1 + k__BackingField: + k__BackingField: 1 + k__BackingField: 15 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 200 + k__BackingField: 20 + k__BackingField: 20 + k__BackingField: 10 + k__BackingField: + - k__BackingField: 2 + k__BackingField: + k__BackingField: 2 + k__BackingField: 15 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 300 + k__BackingField: 20 + k__BackingField: 19 + k__BackingField: 10 + k__BackingField: + - k__BackingField: 3 + k__BackingField: + k__BackingField: 3 + k__BackingField: 15 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 400 + k__BackingField: 20 + k__BackingField: 18 + k__BackingField: 10 + k__BackingField: + - k__BackingField: 4 + k__BackingField: + k__BackingField: 4 + k__BackingField: 15 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 500 + k__BackingField: 20 + k__BackingField: 17 + k__BackingField: 10 + k__BackingField: + - k__BackingField: 5 + k__BackingField: + k__BackingField: 5 + k__BackingField: 15 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 600 + k__BackingField: 20 + k__BackingField: 16 + k__BackingField: 10 + k__BackingField: Upgrade1 + - k__BackingField: 6 + k__BackingField: + k__BackingField: 6 + k__BackingField: 13 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 700 + k__BackingField: 20 + k__BackingField: 15 + k__BackingField: 10 + k__BackingField: + - k__BackingField: 7 + k__BackingField: + k__BackingField: 7 + k__BackingField: 13 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 800 + k__BackingField: 19 + k__BackingField: 15 + k__BackingField: 10 + k__BackingField: + - k__BackingField: 8 + k__BackingField: + k__BackingField: 8 + k__BackingField: 13 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 900 + k__BackingField: 18 + k__BackingField: 15 + k__BackingField: 10 + k__BackingField: + - k__BackingField: 9 + k__BackingField: + k__BackingField: 9 + k__BackingField: 13 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 1000 + k__BackingField: 17 + k__BackingField: 15 + k__BackingField: 10 + k__BackingField: + - k__BackingField: 10 + k__BackingField: + k__BackingField: 10 + k__BackingField: 13 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 1100 + k__BackingField: 16 + k__BackingField: 15 + k__BackingField: 10 + k__BackingField: Upgrade2 + - k__BackingField: 11 + k__BackingField: + k__BackingField: 11 + k__BackingField: 11 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 1200 + k__BackingField: 15 + k__BackingField: 14 + k__BackingField: 8 + k__BackingField: + - k__BackingField: 12 + k__BackingField: + k__BackingField: 12 + k__BackingField: 11 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 1300 + k__BackingField: 15 + k__BackingField: 13 + k__BackingField: 8 + k__BackingField: + - k__BackingField: 13 + k__BackingField: + k__BackingField: 13 + k__BackingField: 11 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 1400 + k__BackingField: 15 + k__BackingField: 12 + k__BackingField: 8 + k__BackingField: + - k__BackingField: 14 + k__BackingField: + k__BackingField: 14 + k__BackingField: 11 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 1500 + k__BackingField: 15 + k__BackingField: 11 + k__BackingField: 8 + k__BackingField: + - k__BackingField: 15 + k__BackingField: + k__BackingField: 15 + k__BackingField: 11 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 1600 + k__BackingField: 15 + k__BackingField: 10 + k__BackingField: 8 + k__BackingField: Upgrade3 + - k__BackingField: 16 + k__BackingField: + k__BackingField: 16 + k__BackingField: 9 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 1700 + k__BackingField: 15 + k__BackingField: 10 + k__BackingField: 8 + k__BackingField: + - k__BackingField: 17 + k__BackingField: + k__BackingField: 17 + k__BackingField: 9 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 1800 + k__BackingField: 14 + k__BackingField: 10 + k__BackingField: 8 + k__BackingField: + - k__BackingField: 18 + k__BackingField: + k__BackingField: 18 + k__BackingField: 9 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 1900 + k__BackingField: 13 + k__BackingField: 10 + k__BackingField: 8 + k__BackingField: + - k__BackingField: 19 + k__BackingField: + k__BackingField: 19 + k__BackingField: 9 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 2000 + k__BackingField: 12 + k__BackingField: 10 + k__BackingField: 8 + k__BackingField: + - k__BackingField: 20 + k__BackingField: + k__BackingField: 20 + k__BackingField: 9 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 2100 + k__BackingField: 11 + k__BackingField: 10 + k__BackingField: 8 + k__BackingField: Upgrade4 + - k__BackingField: 21 + k__BackingField: + k__BackingField: 21 + k__BackingField: 7 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 2200 + k__BackingField: 10 + k__BackingField: 10 + k__BackingField: 6 + k__BackingField: + - k__BackingField: 22 + k__BackingField: + k__BackingField: 22 + k__BackingField: 7 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 2300 + k__BackingField: 10 + k__BackingField: 9 + k__BackingField: 6 + k__BackingField: + - k__BackingField: 23 + k__BackingField: + k__BackingField: 23 + k__BackingField: 7 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 2400 + k__BackingField: 10 + k__BackingField: 8 + k__BackingField: 6 + k__BackingField: + - k__BackingField: 24 + k__BackingField: + k__BackingField: 24 + k__BackingField: 7 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 2500 + k__BackingField: 10 + k__BackingField: 7 + k__BackingField: 6 + k__BackingField: + - k__BackingField: 25 + k__BackingField: + k__BackingField: 25 + k__BackingField: 7 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 2600 + k__BackingField: 10 + k__BackingField: 6 + k__BackingField: 6 + k__BackingField: Upgrade5 + - k__BackingField: 26 + k__BackingField: + k__BackingField: 26 + k__BackingField: 5 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 2700 + k__BackingField: 10 + k__BackingField: 5 + k__BackingField: 6 + k__BackingField: + - k__BackingField: 27 + k__BackingField: + k__BackingField: 27 + k__BackingField: 5 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 2800 + k__BackingField: 10 + k__BackingField: 5 + k__BackingField: 6 + k__BackingField: + - k__BackingField: 28 + k__BackingField: + k__BackingField: 28 + k__BackingField: 5 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 2900 + k__BackingField: 10 + k__BackingField: 5 + k__BackingField: 6 + k__BackingField: + - k__BackingField: 29 + k__BackingField: + k__BackingField: 29 + k__BackingField: 5 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 3000 + k__BackingField: 10 + k__BackingField: 5 + k__BackingField: 6 + k__BackingField: + - k__BackingField: 30 + k__BackingField: + k__BackingField: 30 + k__BackingField: 5 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 3100 + k__BackingField: 10 + k__BackingField: 5 + k__BackingField: 6 + k__BackingField: Upgrade6 + - k__BackingField: 31 + k__BackingField: + k__BackingField: 31 + k__BackingField: 5 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 3200 + k__BackingField: 10 + k__BackingField: 5 + k__BackingField: 6 + k__BackingField: + - k__BackingField: 32 + k__BackingField: + k__BackingField: 32 + k__BackingField: 5 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 3300 + k__BackingField: 10 + k__BackingField: 5 + k__BackingField: 6 + k__BackingField: + - k__BackingField: 33 + k__BackingField: + k__BackingField: 33 + k__BackingField: 5 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 3400 + k__BackingField: 10 + k__BackingField: 5 + k__BackingField: 6 + k__BackingField: + - k__BackingField: 34 + k__BackingField: + k__BackingField: 34 + k__BackingField: 5 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 3500 + k__BackingField: 10 + k__BackingField: 5 + k__BackingField: 6 + k__BackingField: + - k__BackingField: 35 + k__BackingField: + k__BackingField: 35 + k__BackingField: 5 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 3600 + k__BackingField: 10 + k__BackingField: 5 + k__BackingField: 6 + k__BackingField: + - k__BackingField: 36 + k__BackingField: + k__BackingField: 36 + k__BackingField: 5 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 3700 + k__BackingField: 10 + k__BackingField: 5 + k__BackingField: 6 + k__BackingField: + - k__BackingField: 37 + k__BackingField: + k__BackingField: 37 + k__BackingField: 5 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 3800 + k__BackingField: 10 + k__BackingField: 5 + k__BackingField: 6 + k__BackingField: + - k__BackingField: 38 + k__BackingField: + k__BackingField: 38 + k__BackingField: 5 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 3900 + k__BackingField: 10 + k__BackingField: 5 + k__BackingField: 6 + k__BackingField: + - k__BackingField: 39 + k__BackingField: + k__BackingField: 39 + k__BackingField: 5 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 4000 + k__BackingField: 10 + k__BackingField: 5 + k__BackingField: 6 + k__BackingField: + - k__BackingField: 40 + k__BackingField: + k__BackingField: 40 + k__BackingField: 5 + k__BackingField: 100 + k__BackingField: 100 + k__BackingField: 4100 + k__BackingField: 10 + k__BackingField: 5 + k__BackingField: 6 + k__BackingField: diff --git a/Assets/02.Scripts/ScriptableObject/Npc/CustomerDataTable.asset b/Assets/02.Scripts/ScriptableObject/Npc/CustomerDataTable.asset index a5bd2c776..d3a8a3af7 100644 --- a/Assets/02.Scripts/ScriptableObject/Npc/CustomerDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Npc/CustomerDataTable.asset @@ -12,88 +12,102 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7da6888bb8af7de45985429156f60ee0, type: 3} m_Name: CustomerDataTable m_EditorClassIdentifier: - k__BackingField: - - k__BackingField: 10001 - k__BackingField: "\uC774\uB3D9\uC18D\uB3C4\uAC00 \uD3C9\uBC94\uD558\uACE0 - \uAE09\uD55C Ai1" - k__BackingField: 3 - k__BackingField: 5 - k__BackingField: 5 - k__BackingField: 5 - k__BackingField: 3 - k__BackingField: 2 - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 50 - - k__BackingField: 10002 - k__BackingField: "\uC774\uB3D9\uC18D\uB3C4\uAC00 \uD3C9\uBC94\uD558\uACE0 - \uAE09\uD55C Ai2" - k__BackingField: 3 - k__BackingField: 5 - k__BackingField: 5 - k__BackingField: 5 - k__BackingField: 3 - k__BackingField: 1 - k__BackingField: 2 - k__BackingField: 0 - k__BackingField: 50 - - k__BackingField: 10003 - k__BackingField: "\uC774\uB3D9\uC18D\uB3C4\uAC00 \uB290\uB9AC\uACE0 \uB290\uAE0B\uD55C - Ai1" - k__BackingField: 1 - k__BackingField: 15 - k__BackingField: 15 - k__BackingField: 15 - k__BackingField: 3 - k__BackingField: 1 - k__BackingField: 2 - k__BackingField: 0 - k__BackingField: 50 - - k__BackingField: 10004 - k__BackingField: "\uC774\uB3D9\uC18D\uB3C4\uAC00 \uBE60\uB974\uACE0 \uD3C9\uBC94\uD55C - Ai1" - k__BackingField: 4 - k__BackingField: 10 - k__BackingField: 10 - k__BackingField: 10 - k__BackingField: 3 - k__BackingField: 1 - k__BackingField: 2 - k__BackingField: 0 - k__BackingField: 50 - - k__BackingField: 10005 - k__BackingField: "\uC774\uB3D9\uC18D\uB3C4\uAC00 \uBE60\uB974\uACE0 \uD3C9\uBC94\uD55C - Ai2" - k__BackingField: 4 - k__BackingField: 10 - k__BackingField: 10 - k__BackingField: 10 - k__BackingField: 3 - k__BackingField: 2 - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 50 - - k__BackingField: 10006 - k__BackingField: "\uC774\uB3D9\uC18D\uB3C4\uAC00 \uBE60\uB974\uACE0 \uB290\uAE0B\uD55C - Ai1" - k__BackingField: 4 - k__BackingField: 10 - k__BackingField: 15 - k__BackingField: 15 - k__BackingField: 3 - k__BackingField: 1 - k__BackingField: 2 - k__BackingField: 0 - k__BackingField: 50 - - k__BackingField: 10007 - k__BackingField: "\uC774\uB3D9\uC18D\uB3C4\uAC00 \uBE60\uB974\uACE0 \uB290\uAE0B\uD55C - Ai2" - k__BackingField: 4 - k__BackingField: 10 - k__BackingField: 15 - k__BackingField: 15 - k__BackingField: 3 - k__BackingField: 2 - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 50 + _serializedDataList: + - k__BackingField: 10001 + k__BackingField: + k__BackingField: 10001 + k__BackingField: "\uC774\uB3D9\uC18D\uB3C4\uAC00 \uD3C9\uBC94\uD558\uACE0 + \uAE09\uD55C Ai1" + k__BackingField: 3 + k__BackingField: 5 + k__BackingField: 5 + k__BackingField: 5 + k__BackingField: 3 + k__BackingField: 2 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 50 + - k__BackingField: 10002 + k__BackingField: + k__BackingField: 10002 + k__BackingField: "\uC774\uB3D9\uC18D\uB3C4\uAC00 \uD3C9\uBC94\uD558\uACE0 + \uAE09\uD55C Ai2" + k__BackingField: 3 + k__BackingField: 5 + k__BackingField: 5 + k__BackingField: 5 + k__BackingField: 3 + k__BackingField: 1 + k__BackingField: 2 + k__BackingField: 0 + k__BackingField: 50 + - k__BackingField: 10003 + k__BackingField: + k__BackingField: 10003 + k__BackingField: "\uC774\uB3D9\uC18D\uB3C4\uAC00 \uB290\uB9AC\uACE0 \uB290\uAE0B\uD55C + Ai1" + k__BackingField: 1 + k__BackingField: 15 + k__BackingField: 15 + k__BackingField: 15 + k__BackingField: 3 + k__BackingField: 1 + k__BackingField: 2 + k__BackingField: 0 + k__BackingField: 50 + - k__BackingField: 10004 + k__BackingField: + k__BackingField: 10004 + k__BackingField: "\uC774\uB3D9\uC18D\uB3C4\uAC00 \uBE60\uB974\uACE0 \uD3C9\uBC94\uD55C + Ai1" + k__BackingField: 4 + k__BackingField: 10 + k__BackingField: 10 + k__BackingField: 10 + k__BackingField: 3 + k__BackingField: 1 + k__BackingField: 2 + k__BackingField: 0 + k__BackingField: 50 + - k__BackingField: 10005 + k__BackingField: + k__BackingField: 10005 + k__BackingField: "\uC774\uB3D9\uC18D\uB3C4\uAC00 \uBE60\uB974\uACE0 \uD3C9\uBC94\uD55C + Ai2" + k__BackingField: 4 + k__BackingField: 10 + k__BackingField: 10 + k__BackingField: 10 + k__BackingField: 3 + k__BackingField: 2 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 50 + - k__BackingField: 10006 + k__BackingField: + k__BackingField: 10006 + k__BackingField: "\uC774\uB3D9\uC18D\uB3C4\uAC00 \uBE60\uB974\uACE0 \uB290\uAE0B\uD55C + Ai1" + k__BackingField: 4 + k__BackingField: 10 + k__BackingField: 15 + k__BackingField: 15 + k__BackingField: 3 + k__BackingField: 1 + k__BackingField: 2 + k__BackingField: 0 + k__BackingField: 50 + - k__BackingField: 10007 + k__BackingField: + k__BackingField: 10007 + k__BackingField: "\uC774\uB3D9\uC18D\uB3C4\uAC00 \uBE60\uB974\uACE0 \uB290\uAE0B\uD55C + Ai2" + k__BackingField: 4 + k__BackingField: 10 + k__BackingField: 15 + k__BackingField: 15 + k__BackingField: 3 + k__BackingField: 2 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 50 diff --git a/Assets/02.Scripts/SerializableKeyValuePair.cs b/Assets/02.Scripts/SerializableKeyValuePair.cs new file mode 100644 index 000000000..5e5b91ada --- /dev/null +++ b/Assets/02.Scripts/SerializableKeyValuePair.cs @@ -0,0 +1,15 @@ +using System; +using UnityEngine; + +namespace BlueWater +{ + [Serializable] + public class SerializableKeyValuePair + { + [field: SerializeField] + public string Key { get; set; } + + [field: SerializeField] + public T Value { get; set; } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/SerializableKeyValuePair.cs.meta b/Assets/02.Scripts/SerializableKeyValuePair.cs.meta new file mode 100644 index 000000000..0584490dd --- /dev/null +++ b/Assets/02.Scripts/SerializableKeyValuePair.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f1adfc341b1acb244853b09f1935b1a9 \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/CustomerManager.cs b/Assets/02.Scripts/Tycoon/CustomerManager.cs index ba06b63bc..b7450f928 100644 --- a/Assets/02.Scripts/Tycoon/CustomerManager.cs +++ b/Assets/02.Scripts/Tycoon/CustomerManager.cs @@ -13,9 +13,8 @@ namespace BlueWater.Tycoons public class CustomerManager : Singleton { [Title("손님 데이터")] - [SerializeField, Required] - private CustomerDataSo _customerDataSo; - private Dictionary _customerDatas; + [field: SerializeField, Required] + public CustomerDataSo CustomerDataSo { get; private set; } [SerializeField, Required] private Customer _customerPrefab; @@ -38,15 +37,6 @@ namespace BlueWater.Tycoons public Action OnInstantiateCustomer; - protected override void OnAwake() - { - _customerDatas = new Dictionary(_customerDataSo.Datas.Count); - foreach (var element in _customerDataSo.Datas) - { - _customerDatas.TryAdd(element.Idx, element); - } - } - private void Start() { _customerTableController = TycoonManager.Instance.CustomerTableController; @@ -118,15 +108,14 @@ namespace BlueWater.Tycoons public CustomerData GetRandomCustomerData() { - var customerDataCount = _customerDatas.Count; + var customerDataCount = CustomerDataSo.GetDataCount(); if (customerDataCount == 0) { - Debug.LogError($"{_customerDatas}의 값이 비어있습니다."); + Debug.LogError($"{CustomerDataSo}의 값이 비어있습니다."); return null; } - - var randomIndex = Random.Range(0, customerDataCount); - return _customerDatas.ElementAt(randomIndex).Value; + + return CustomerDataSo.GetRandomValue(); } public List GetCurrentCustomers() => InstanceCustomers; diff --git a/Assets/02.Scripts/Tycoon/TycoonData.cs b/Assets/02.Scripts/Tycoon/TycoonData.cs index e0edb6111..f99756623 100644 --- a/Assets/02.Scripts/Tycoon/TycoonData.cs +++ b/Assets/02.Scripts/Tycoon/TycoonData.cs @@ -23,7 +23,7 @@ namespace BlueWater.Tycoons { if (FoodRecipes.Contains(idx)) return; - var foodData = ItemManager.Instance.GetFoodDataByIdx(idx); + var foodData = ItemManager.Instance.FoodDataSo.GetDataByIdx(idx); if (foodData == null) return; FoodRecipes.Add(idx); @@ -34,7 +34,7 @@ namespace BlueWater.Tycoons { if (DrinkRecipes.Contains(idx)) return; - var drinkData = ItemManager.Instance.GetLiquidDataByIdx(idx); + var drinkData = ItemManager.Instance.LiquidDataSo.GetDataByIdx(idx); if (drinkData == null) return; DrinkRecipes.Add(idx); diff --git a/Assets/02.Scripts/Tycoon/TycoonManager.cs b/Assets/02.Scripts/Tycoon/TycoonManager.cs index b0e5fa2ce..93cb31f50 100644 --- a/Assets/02.Scripts/Tycoon/TycoonManager.cs +++ b/Assets/02.Scripts/Tycoon/TycoonManager.cs @@ -50,13 +50,11 @@ namespace BlueWater.Tycoons [SerializeField] private string _dailyBgm; - [SerializeField, Required] - private LevelDataSo _levelDataSo; - private Dictionary _levelDatas; + [field: SerializeField, Required] + public LevelDataSo LevelDataSo { get; private set; } - [SerializeField, Required] - private CardDataSo _cardDataSo; - private Dictionary _cardDatas; + [field: SerializeField, Required] + public CardDataSo CardDataSo { get; private set; } public Action OnTycoonOpenedEvent; public Action OnTycoonClosedEvent; @@ -66,8 +64,6 @@ namespace BlueWater.Tycoons protected override void OnAwake() { InitializeComponents(); - _levelDatas = InitializeDictionary(_levelDataSo.Datas, data => data.Idx); - _cardDatas = InitializeDictionary(_cardDataSo.Datas, data => data.Idx); } private void Start() @@ -104,9 +100,5 @@ namespace BlueWater.Tycoons { return dataDictionary.Count; } - - public LevelData GetLevelDataByIdx(string idx) => GetDataByIdx(_levelDatas, idx); - public CardData GetCardDataByIdx(string idx) => GetDataByIdx(_cardDatas, idx); - } } \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Combat/CombatItemInventoryUi.cs b/Assets/02.Scripts/Ui/Combat/CombatItemInventoryUi.cs index cc10d2e05..4e48721e6 100644 --- a/Assets/02.Scripts/Ui/Combat/CombatItemInventoryUi.cs +++ b/Assets/02.Scripts/Ui/Combat/CombatItemInventoryUi.cs @@ -229,12 +229,12 @@ namespace BlueWater.Uis break; case CombatInventorySortingType.Name: _itemSlotUiList.Sort((x, y) => - string.Compare(ItemManager.Instance.GetItemDataByIdx(x.ItemSlot.Idx).Name, - ItemManager.Instance.GetItemDataByIdx(y.ItemSlot.Idx).Name, StringComparison.Ordinal)); + string.Compare(ItemManager.Instance.ItemDataSo.GetDataByIdx(x.ItemSlot.Idx).Name, + ItemManager.Instance.ItemDataSo.GetDataByIdx(y.ItemSlot.Idx).Name, StringComparison.Ordinal)); break; case CombatInventorySortingType.Category: _itemSlotUiList.Sort((x, y) => - ItemManager.Instance.GetItemDataByIdx(x.ItemSlot.Idx).Type.CompareTo(ItemManager.Instance.GetItemDataByIdx(y.ItemSlot.Idx).Type)); + ItemManager.Instance.ItemDataSo.GetDataByIdx(x.ItemSlot.Idx).Type.CompareTo(ItemManager.Instance.ItemDataSo.GetDataByIdx(y.ItemSlot.Idx).Type)); break; case CombatInventorySortingType.Count: _itemSlotUiList.Sort((x, y) => y.ItemSlot.Quantity.CompareTo(x.ItemSlot.Quantity)); diff --git a/Assets/02.Scripts/Ui/Combat/DiscardPopupUi.cs b/Assets/02.Scripts/Ui/Combat/DiscardPopupUi.cs index 495e14348..7535b8148 100644 --- a/Assets/02.Scripts/Ui/Combat/DiscardPopupUi.cs +++ b/Assets/02.Scripts/Ui/Combat/DiscardPopupUi.cs @@ -50,7 +50,7 @@ namespace BlueWater.Uis _removeType = RemoveType.Single; _selectedList.Clear(); _selectedList.Add(selectedSlot); - _contentText.text = ItemManager.Instance.GetItemDataByIdx(selectedSlot.ItemSlot.Idx).Name + "을(를) 버리시겠습니까?"; + _contentText.text = ItemManager.Instance.ItemDataSo.GetDataByIdx(selectedSlot.ItemSlot.Idx).Name + "을(를) 버리시겠습니까?"; _currentCount = 1; _countText.text = _currentCount.ToString(); diff --git a/Assets/02.Scripts/Ui/Combat/ItemSlotUi.cs b/Assets/02.Scripts/Ui/Combat/ItemSlotUi.cs index 86e929ce8..6f10702ca 100644 --- a/Assets/02.Scripts/Ui/Combat/ItemSlotUi.cs +++ b/Assets/02.Scripts/Ui/Combat/ItemSlotUi.cs @@ -47,7 +47,7 @@ namespace BlueWater.Uis public void UpdateData(ItemSlot itemSlot) { - var item = ItemManager.Instance.GetItemDataByIdx(itemSlot.Idx); + var item = ItemManager.Instance.ItemDataSo.GetDataByIdx(itemSlot.Idx); _image.sprite = item.Sprite; _nameText.text = item.Name; _weightText.text = item.Weight * ItemSlot.Quantity + "kg"; diff --git a/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs b/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs index 609cc29e2..aad9c81cb 100644 --- a/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs @@ -100,7 +100,7 @@ namespace BlueWater.Uis public void OrderItem(string itemIdx, int waitTime, int hurryTime) { - _orderItemData = ItemManager.Instance.GetItemDataByIdx(itemIdx); + _orderItemData = ItemManager.Instance.ItemDataSo.GetDataByIdx(itemIdx); _isOrdered = true; _isWaitTimeOver = false; _isItemReceived = false; diff --git a/Assets/02.Scripts/Ui/Tycoon/BrewingIngredientSlotUi.cs b/Assets/02.Scripts/Ui/Tycoon/BrewingIngredientSlotUi.cs index a77b00890..cf2146d0b 100644 --- a/Assets/02.Scripts/Ui/Tycoon/BrewingIngredientSlotUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/BrewingIngredientSlotUi.cs @@ -35,7 +35,7 @@ namespace BlueWater.Uis { _ingredientIdx = ingredientIdx; _needQuantity = quantity; - var ingredientItemData = ItemManager.Instance.GetItemDataByIdx(_ingredientIdx); + var ingredientItemData = ItemManager.Instance.ItemDataSo.GetDataByIdx(_ingredientIdx); _image.sprite = ingredientItemData.Sprite; _inventoryQuantity = DataManager.Instance.Inventory.GetItemByIdx(_ingredientIdx).Quantity; SetQuantity(); diff --git a/Assets/02.Scripts/Ui/Tycoon/CookUi.cs b/Assets/02.Scripts/Ui/Tycoon/CookUi.cs index e288e471d..a1f089221 100644 --- a/Assets/02.Scripts/Ui/Tycoon/CookUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/CookUi.cs @@ -115,7 +115,7 @@ namespace BlueWater.Uis foreach (var element in _dataManager.TycoonData.FoodRecipes) { var newItemSlot = Instantiate(_finishedFoodSlotUi, _finishedFoodSlotLocation).GetComponent(); - var foodData = _itemManager.GetFoodDataByIdx(element); + var foodData = _itemManager.FoodDataSo.GetDataByIdx(element); newItemSlot.SetFoodData(foodData); _finishedFoodSlotUis.Add(newItemSlot); newItemSlot.AddButtonClickListener(() => SelectFinishedFood(foodData)); @@ -124,7 +124,7 @@ namespace BlueWater.Uis private void AddFoodRecipe(string idx) { - var foodData = _itemManager.GetFoodDataByIdx(idx); + var foodData = _itemManager.FoodDataSo.GetDataByIdx(idx); var newItemSlot = Instantiate(_finishedFoodSlotUi, _finishedFoodSlotLocation).GetComponent(); newItemSlot.SetFoodData(foodData); _finishedFoodSlotUis.Add(newItemSlot); @@ -156,7 +156,7 @@ namespace BlueWater.Uis else { _selectedFoodData = foodData; - _selectedFoodImage.sprite = _itemManager.GetItemDataByIdx(_selectedFoodData.Idx).Sprite; + _selectedFoodImage.sprite = _itemManager.ItemDataSo.GetDataByIdx(_selectedFoodData.Idx).Sprite; _selectedFoodName.text = _selectedFoodData.Name; _selectedFoodTasteText.text = _selectedFoodData.TasteToString(); _selectedFoodImage.enabled = true; @@ -252,13 +252,13 @@ namespace BlueWater.Uis return; case FoodSortingType.PriceUp: _finishedFoodSlotUis.Sort((x, y) => - _itemManager.GetItemDataByIdx(x.FoodData.Idx).Price. - CompareTo(_itemManager.GetItemDataByIdx(y.FoodData.Idx).Price)); + _itemManager.ItemDataSo.GetDataByIdx(x.FoodData.Idx).Price. + CompareTo(_itemManager.ItemDataSo.GetDataByIdx(y.FoodData.Idx).Price)); break; case FoodSortingType.PriceDown: _finishedFoodSlotUis.Sort((x, y) => - _itemManager.GetItemDataByIdx(y.FoodData.Idx).Price. - CompareTo(_itemManager.GetItemDataByIdx(x.FoodData.Idx).Price)); + _itemManager.ItemDataSo.GetDataByIdx(y.FoodData.Idx).Price. + CompareTo(_itemManager.ItemDataSo.GetDataByIdx(x.FoodData.Idx).Price)); break; case FoodSortingType.CookwareTypeUp: _finishedFoodSlotUis.Sort((x, y) => diff --git a/Assets/02.Scripts/Ui/Tycoon/IngredientItemSlotUi.cs b/Assets/02.Scripts/Ui/Tycoon/IngredientItemSlotUi.cs index cda1e0d20..8a28dc50f 100644 --- a/Assets/02.Scripts/Ui/Tycoon/IngredientItemSlotUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/IngredientItemSlotUi.cs @@ -27,7 +27,7 @@ namespace BlueWater.Uis } else { - SetItemImage(ItemManager.GetItemDataByIdx(ItemSlot.Idx).Sprite); + SetItemImage(ItemManager.ItemDataSo.GetDataByIdx(ItemSlot.Idx).Sprite); var myIngredientQuantity = DataManager.Instance.Inventory.GetItemByIdx(itemSlot.Idx)?.Quantity ?? 0; var needQuantity = ItemSlot.Quantity; QuantityText.text = $"{myIngredientQuantity}/{needQuantity}"; diff --git a/Assets/02.Scripts/Ui/Tycoon/InventoryUi.cs b/Assets/02.Scripts/Ui/Tycoon/InventoryUi.cs index ebbc62c59..58dc6224d 100644 --- a/Assets/02.Scripts/Ui/Tycoon/InventoryUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/InventoryUi.cs @@ -134,7 +134,7 @@ namespace BlueWater.Uis case InventoryFilterSortingType.Ingredient: foreach (var element in _tycoonItemSlotUis) { - if (_itemManager.GetItemDataByIdx(element.ItemSlot.Idx).Type == ItemType.FoodIngredient) + if (_itemManager.ItemDataSo.GetDataByIdx(element.ItemSlot.Idx).Type == ItemType.FoodIngredient) { element.ShowUi(); } @@ -166,43 +166,43 @@ namespace BlueWater.Uis break; case InventorySortingType.PriceUp: _tycoonItemSlotUis.Sort((x, y) => - _itemManager.GetItemDataByIdx(x.ItemSlot.Idx).Price. - CompareTo(_itemManager.GetItemDataByIdx(y.ItemSlot.Idx).Price)); + _itemManager.ItemDataSo.GetDataByIdx(x.ItemSlot.Idx).Price. + CompareTo(_itemManager.ItemDataSo.GetDataByIdx(y.ItemSlot.Idx).Price)); break; case InventorySortingType.PriceDown: _tycoonItemSlotUis.Sort((x, y) => - _itemManager.GetItemDataByIdx(y.ItemSlot.Idx).Price. - CompareTo(_itemManager.GetItemDataByIdx(x.ItemSlot.Idx).Price)); + _itemManager.ItemDataSo.GetDataByIdx(y.ItemSlot.Idx).Price. + CompareTo(_itemManager.ItemDataSo.GetDataByIdx(x.ItemSlot.Idx).Price)); break; case InventorySortingType.TypeUp: _tycoonItemSlotUis.Sort((x, y) => - _itemManager.GetItemDataByIdx(x.ItemSlot.Idx).Type. - CompareTo(_itemManager.GetItemDataByIdx(y.ItemSlot.Idx).Type)); + _itemManager.ItemDataSo.GetDataByIdx(x.ItemSlot.Idx).Type. + CompareTo(_itemManager.ItemDataSo.GetDataByIdx(y.ItemSlot.Idx).Type)); break; case InventorySortingType.TypeDown: _tycoonItemSlotUis.Sort((x, y) => - _itemManager.GetItemDataByIdx(y.ItemSlot.Idx).Type. - CompareTo(_itemManager.GetItemDataByIdx(x.ItemSlot.Idx).Type)); + _itemManager.ItemDataSo.GetDataByIdx(y.ItemSlot.Idx).Type. + CompareTo(_itemManager.ItemDataSo.GetDataByIdx(x.ItemSlot.Idx).Type)); break; case InventorySortingType.IngredientTypeUp: _tycoonItemSlotUis.Sort((x, y) => - _itemManager.GetItemDataByIdx(x.ItemSlot.Idx).IngredientType. - CompareTo(_itemManager.GetItemDataByIdx(y.ItemSlot.Idx).IngredientType)); + _itemManager.ItemDataSo.GetDataByIdx(x.ItemSlot.Idx).IngredientType. + CompareTo(_itemManager.ItemDataSo.GetDataByIdx(y.ItemSlot.Idx).IngredientType)); break; case InventorySortingType.IngredientTypeDown: _tycoonItemSlotUis.Sort((x, y) => - _itemManager.GetItemDataByIdx(y.ItemSlot.Idx).IngredientType. - CompareTo(_itemManager.GetItemDataByIdx(x.ItemSlot.Idx).IngredientType)); + _itemManager.ItemDataSo.GetDataByIdx(y.ItemSlot.Idx).IngredientType. + CompareTo(_itemManager.ItemDataSo.GetDataByIdx(x.ItemSlot.Idx).IngredientType)); break; case InventorySortingType.NameUp: _tycoonItemSlotUis.Sort((x, y) => - string.Compare(_itemManager.GetItemDataByIdx(x.ItemSlot.Idx).Name, - _itemManager.GetItemDataByIdx(y.ItemSlot.Idx).Name, StringComparison.Ordinal)); + string.Compare(_itemManager.ItemDataSo.GetDataByIdx(x.ItemSlot.Idx).Name, + _itemManager.ItemDataSo.GetDataByIdx(y.ItemSlot.Idx).Name, StringComparison.Ordinal)); break; case InventorySortingType.NameDown: _tycoonItemSlotUis.Sort((x, y) => - string.Compare(_itemManager.GetItemDataByIdx(y.ItemSlot.Idx).Name, - _itemManager.GetItemDataByIdx(x.ItemSlot.Idx).Name, StringComparison.Ordinal)); + string.Compare(_itemManager.ItemDataSo.GetDataByIdx(y.ItemSlot.Idx).Name, + _itemManager.ItemDataSo.GetDataByIdx(x.ItemSlot.Idx).Name, StringComparison.Ordinal)); break; case InventorySortingType.AcquisitionTimeUp: _tycoonItemSlotUis.Sort((x, y) => diff --git a/Assets/02.Scripts/Ui/Tycoon/LiquidRecipeSlotUi.cs b/Assets/02.Scripts/Ui/Tycoon/LiquidRecipeSlotUi.cs index 615875f87..974097fee 100644 --- a/Assets/02.Scripts/Ui/Tycoon/LiquidRecipeSlotUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/LiquidRecipeSlotUi.cs @@ -25,7 +25,7 @@ namespace BlueWater.Uis public void Initialize(string idx) { - liquidData = ItemManager.Instance.GetLiquidDataByIdx(idx); + liquidData = ItemManager.Instance.LiquidDataSo.GetDataByIdx(idx); _image.sprite = liquidData.Sprite; } diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs index e88a92e9a..bf9a3cf07 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs @@ -95,11 +95,27 @@ public class TycoonCard : MonoBehaviour, IPointerEnterHandler, IPointerExitHandl currentRotationCoroutine = StartCoroutine(RotateOverTime()); - var a = TycoonManager.Instance.GetCardDataByIdx(_cardData); + var cardData = TycoonManager.Instance.CardDataSo.GetDataByIdx(_cardData); // Resources.Load() } + + void Start() + { + _cardData_IDX = TycoonManager.Instance.CardDataSo.GetDataByIdx(_cardData); + + Transform nameTransform = transform.Find("Name"); + Transform infoTransform = transform.Find("Infomation"); + + TextMeshProUGUI nametextComponent = nameTransform.GetComponent(); + nametextComponent.text = _cardData_IDX.Img; + + TextMeshProUGUI infotextComponent = infoTransform.GetComponent(); + infotextComponent.text = _cardData_IDX.ScriptText; + + } + // 마우스가 이미지 위에 올라갔을 때 호출 public void OnPointerEnter(PointerEventData eventData) { @@ -215,7 +231,7 @@ public class TycoonCard : MonoBehaviour, IPointerEnterHandler, IPointerExitHandl rectTransform.localRotation = Quaternion.identity; endRotationCoroutine = null; } - + private IEnumerator RotateOverTime() { RectTransform rectTransform = this.GetComponent(); diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonItemSlotUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonItemSlotUi.cs index 9bbbd6bb4..84dd495f3 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonItemSlotUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonItemSlotUi.cs @@ -189,7 +189,7 @@ namespace BlueWater.Uis } else { - SetItemImage(ItemManager.GetItemDataByIdx(ItemSlot.Idx).Sprite); + SetItemImage(ItemManager.ItemDataSo.GetDataByIdx(ItemSlot.Idx).Sprite); QuantityText.text = ItemSlot.Quantity.ToString(); } } @@ -219,7 +219,7 @@ namespace BlueWater.Uis } else { - SetItemImage(ItemManager.GetItemDataByIdx(FoodData.Idx).Sprite); + SetItemImage(ItemManager.ItemDataSo.GetDataByIdx(FoodData.Idx).Sprite); if (IsUsingBackgroundColor) { UseBackgroundColor(); diff --git a/Assets/05.Prefabs/Managers/ItemManager.prefab b/Assets/05.Prefabs/Managers/ItemManager.prefab index 8cfc1b23e..ed111a9e5 100644 --- a/Assets/05.Prefabs/Managers/ItemManager.prefab +++ b/Assets/05.Prefabs/Managers/ItemManager.prefab @@ -46,11 +46,11 @@ MonoBehaviour: m_EditorClassIdentifier: _persistent: 1 _defaultItemPrefab: {fileID: 1370112280380943697, guid: 28a379482be867746aad889c0f1c3c79, type: 3} - _itemDataSo: {fileID: 11400000, guid: d7011c71193e95743aa868ca1bea6010, type: 2} - _itemDropTableSo: {fileID: 11400000, guid: 9e1384a77106eb845ad86d6834ba9a52, type: 2} - _foodDataSo: {fileID: 11400000, guid: 7b282dfe68d23cd48a8f437ae2cd7dde, type: 2} - _cocktailDataSo: {fileID: 11400000, guid: b28d3497d1f428046bc82469f2056bac, type: 2} - liquidDataSo: {fileID: 11400000, guid: d912288eee347ea4b98718ff38ef5d78, type: 2} + k__BackingField: {fileID: 11400000, guid: d7011c71193e95743aa868ca1bea6010, type: 2} + k__BackingField: {fileID: 11400000, guid: 9e1384a77106eb845ad86d6834ba9a52, type: 2} + k__BackingField: {fileID: 11400000, guid: 7b282dfe68d23cd48a8f437ae2cd7dde, type: 2} + k__BackingField: {fileID: 11400000, guid: b28d3497d1f428046bc82469f2056bac, type: 2} + k__BackingField: {fileID: 11400000, guid: d912288eee347ea4b98718ff38ef5d78, type: 2} k__BackingField: {fileID: 11400000, guid: 1e74e5d3760c6a74c820233d292733c1, type: 2} _randomDropRadius: 3 _minSeparationDistance: 1.5