From ba5d3ffb59bc0b1e000c41ebdfe8405c92751566 Mon Sep 17 00:00:00 2001 From: NTG Date: Thu, 28 Aug 2025 12:49:47 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B5=AC=EA=B8=80=20=EC=8B=9C=ED=8A=B8=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95=20(=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=EB=AA=85=20=EB=B3=80=EA=B2=BD)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/GameData/{DataSo.cs => DataAsset.cs} | 2 +- .../{DataSo.cs.meta => DataAsset.cs.meta} | 0 .../Game/GameState/InventoryItemData.cs | 2 +- .../Game/GameState/InventoryManager.cs | 8 ++--- .../Game/GameState/InventoryTestDataSo.cs | 6 ++-- .../Game/GameState/TestInventoryEditorTool.cs | 4 +-- .../GameUi/Utils/Binding/BindingContext.cs | 2 +- .../AutoCreated/{So.meta => Assets.meta} | 0 .../Assets/CookwareDataAsset.asset | 3 ++ .../CookwareDataAsset.asset.meta} | 0 .../Assets/CustomerDataAsset.asset | 3 ++ .../CustomerDataAsset.asset.meta} | 0 .../Assets/CustomerPoolDataAsset.asset | 3 ++ .../CustomerPoolDataAsset.asset.meta} | 0 .../AutoCreated/Assets/DrinkDataAsset.asset | 3 ++ .../DrinkDataAsset.asset.meta} | 0 .../Assets/EnvironmentDataAsset.asset | 3 ++ .../EnvironmentDataAsset.asset.meta} | 0 .../AutoCreated/Assets/FoodDataAsset.asset | 3 ++ .../FoodDataAsset.asset.meta} | 0 .../Assets/IngredientDataAsset.asset | 3 ++ .../IngredientDataAsset.asset.meta} | 0 .../AutoCreated/Assets/ItemDataAsset.asset | 3 ++ .../ItemDataAsset.asset.meta} | 0 .../AutoCreated/Assets/LevelDataAsset.asset | 3 ++ .../LevelDataAsset.asset.meta} | 0 .../AutoCreated/Assets/RecipeDataAsset.asset | 3 ++ .../RecipeDataAsset.asset.meta} | 0 .../AutoCreated/Assets/TasteDataAsset.asset | 3 ++ .../TasteDataAsset.asset.meta} | 0 .../AutoCreated/Classes/CookwareDataAsset.cs | 23 +++++++++++++ ...taSo.cs.meta => CookwareDataAsset.cs.meta} | 0 .../{CookwareData.cs => CookwareDataEntry.cs} | 2 +- ...Data.cs.meta => CookwareDataEntry.cs.meta} | 0 .../AutoCreated/Classes/CookwareDataSo.cs | 23 ------------- ...CustomerDataSo.cs => CustomerDataAsset.cs} | 4 +-- ...taSo.cs.meta => CustomerDataAsset.cs.meta} | 0 .../{CustomerData.cs => CustomerDataEntry.cs} | 2 +- ...Data.cs.meta => CustomerDataEntry.cs.meta} | 0 ...PoolDataSo.cs => CustomerPoolDataAsset.cs} | 4 +-- ....cs.meta => CustomerPoolDataAsset.cs.meta} | 0 ...erPoolData.cs => CustomerPoolDataEntry.cs} | 2 +- ....cs.meta => CustomerPoolDataEntry.cs.meta} | 0 .../AutoCreated/Classes/DrinkDataAsset.cs | 9 +++++ ...kDataSo.cs.meta => DrinkDataAsset.cs.meta} | 0 .../{FoodData.cs => DrinkDataEntry.cs} | 2 +- ...inkData.cs.meta => DrinkDataEntry.cs.meta} | 0 .../AutoCreated/Classes/DrinkDataSo.cs | 9 ----- .../Classes/EnvironmentDataAsset.cs | 9 +++++ ...o.cs.meta => EnvironmentDataAsset.cs.meta} | 0 ...ronmentData.cs => EnvironmentDataEntry.cs} | 2 +- ...a.cs.meta => EnvironmentDataEntry.cs.meta} | 0 .../AutoCreated/Classes/EnvironmentDataSo.cs | 9 ----- .../AutoCreated/Classes/FoodDataAsset.cs | 9 +++++ ...odDataSo.cs.meta => FoodDataAsset.cs.meta} | 0 .../{DrinkData.cs => FoodDataEntry.cs} | 2 +- ...FoodData.cs.meta => FoodDataEntry.cs.meta} | 0 .../AutoCreated/Classes/FoodDataSo.cs | 9 ----- .../Classes/IngredientDataAsset.cs | 8 +++++ ...So.cs.meta => IngredientDataAsset.cs.meta} | 0 ...gredientData.cs => IngredientDataEntry.cs} | 2 +- ...ta.cs.meta => IngredientDataEntry.cs.meta} | 0 .../AutoCreated/Classes/IngredientDataSo.cs | 8 ----- .../AutoCreated/Classes/ItemDataAsset.cs | 9 +++++ ...emDataSo.cs.meta => ItemDataAsset.cs.meta} | 0 .../Classes/{ItemData.cs => ItemDataEntry.cs} | 2 +- ...ItemData.cs.meta => ItemDataEntry.cs.meta} | 0 .../AutoCreated/Classes/ItemDataSo.cs | 9 ----- .../AutoCreated/Classes/LevelDataAsset.cs | 8 +++++ ...lDataSo.cs.meta => LevelDataAsset.cs.meta} | 0 .../{LevelData.cs => LevelDataEntry.cs} | 2 +- ...velData.cs.meta => LevelDataEntry.cs.meta} | 0 .../AutoCreated/Classes/LevelDataSo.cs | 8 ----- .../AutoCreated/Classes/RecipeDataAsset.cs | 9 +++++ ...DataSo.cs.meta => RecipeDataAsset.cs.meta} | 0 .../{RecipeData.cs => RecipeDataEntry.cs} | 2 +- ...peData.cs.meta => RecipeDataEntry.cs.meta} | 0 .../AutoCreated/Classes/RecipeDataSo.cs | 9 ----- .../AutoCreated/Classes/TasteDataAsset.cs | 9 +++++ ...eDataSo.cs.meta => TasteDataAsset.cs.meta} | 0 .../{TasteData.cs => TasteDataEntry.cs} | 2 +- ...steData.cs.meta => TasteDataEntry.cs.meta} | 0 .../AutoCreated/Classes/TasteDataSo.cs | 9 ----- .../AutoCreated/So/CookwareDataSo.asset | 3 -- .../AutoCreated/So/CustomerDataSo.asset | 3 -- .../AutoCreated/So/CustomerPoolDataSo.asset | 3 -- .../AutoCreated/So/DrinkDataSo.asset | 3 -- .../AutoCreated/So/EnvironmentDataSo.asset | 3 -- .../AutoCreated/So/FoodDataSo.asset | 3 -- .../AutoCreated/So/IngredientDataSo.asset | 3 -- .../AutoCreated/So/ItemDataSo.asset | 3 -- .../AutoCreated/So/LevelDataSo.asset | 3 -- .../AutoCreated/So/RecipeDataSo.asset | 3 -- .../AutoCreated/So/TasteDataSo.asset | 3 -- .../CodeGeneration/CSharpCodeGenerator.cs | 10 +++--- .../Core/Settings/GoogleSheetSettingsSo.cs | 6 ++-- .../AI/Customer/CustomerAiComponent.cs | 14 ++++---- .../Customer/CustomerBlackboardComponent.cs | 4 +-- .../Character/Interfaces/ICustomerAi.cs | 2 +- .../Interfaces/ICustomerBlackboard.cs | 2 +- .../Npc/Customer/CustomerCharacter.cs | 10 +++--- .../Conrtollers/EnvironmentController.cs | 2 +- .../Run/Customer/CustomerFactory.cs | 6 ++-- .../Controller/Conrtollers/RunController.cs | 28 +++++++-------- .../Tasks/CreateRestaurantEnvironment.cs | 2 +- .../Environment/RestaurantEnvironment.cs | 26 +++++++------- .../FlowStates/RestaurantManagementState.cs | 22 ++++++------ .../Restaurant/Ui/CookUi/CookViewModel.cs | 12 +++---- .../ExtensionsUi/CraftingHelper.cs | 6 ++-- .../ExtensionsUi/DrinkDataExtensions.cs | 32 ++++++++--------- .../ExtensionsUi/FoodDataExtensions.cs | 32 ++++++++--------- .../RestaurantManagementUi/ItemDetailView.cs | 6 ++-- .../ItemUi/ItemModel.cs | 34 +++++++++---------- .../ItemUi/ItemViewModelFactory.cs | 8 ++--- .../RestaurantManagementViewModel.cs | 10 +++--- .../TasteHashTagSlotUi.cs | 4 +-- Assets/_DDD/_Scripts/Utilities/Constants.cs | 20 +++++------ 117 files changed, 302 insertions(+), 302 deletions(-) rename Assets/_DDD/_Scripts/Game/GameData/{DataSo.cs => DataAsset.cs} (97%) rename Assets/_DDD/_Scripts/Game/GameData/{DataSo.cs.meta => DataAsset.cs.meta} (100%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/{So.meta => Assets.meta} (100%) create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/CookwareDataAsset.asset rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/{So/CookwareDataSo.asset.meta => Assets/CookwareDataAsset.asset.meta} (100%) create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/CustomerDataAsset.asset rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/{So/CustomerDataSo.asset.meta => Assets/CustomerDataAsset.asset.meta} (100%) create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/CustomerPoolDataAsset.asset rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/{So/CustomerPoolDataSo.asset.meta => Assets/CustomerPoolDataAsset.asset.meta} (100%) create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/DrinkDataAsset.asset rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/{So/DrinkDataSo.asset.meta => Assets/DrinkDataAsset.asset.meta} (100%) create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/EnvironmentDataAsset.asset rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/{So/EnvironmentDataSo.asset.meta => Assets/EnvironmentDataAsset.asset.meta} (100%) create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/FoodDataAsset.asset rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/{So/FoodDataSo.asset.meta => Assets/FoodDataAsset.asset.meta} (100%) create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/IngredientDataAsset.asset rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/{So/IngredientDataSo.asset.meta => Assets/IngredientDataAsset.asset.meta} (100%) create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/ItemDataAsset.asset rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/{So/ItemDataSo.asset.meta => Assets/ItemDataAsset.asset.meta} (100%) create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/LevelDataAsset.asset rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/{So/LevelDataSo.asset.meta => Assets/LevelDataAsset.asset.meta} (100%) create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/RecipeDataAsset.asset rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/{So/RecipeDataSo.asset.meta => Assets/RecipeDataAsset.asset.meta} (100%) create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/TasteDataAsset.asset rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/{So/TasteDataSo.asset.meta => Assets/TasteDataAsset.asset.meta} (100%) create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareDataAsset.cs rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{CookwareDataSo.cs.meta => CookwareDataAsset.cs.meta} (100%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{CookwareData.cs => CookwareDataEntry.cs} (93%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{CookwareData.cs.meta => CookwareDataEntry.cs.meta} (100%) delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareDataSo.cs rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{CustomerDataSo.cs => CustomerDataAsset.cs} (68%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{CustomerDataSo.cs.meta => CustomerDataAsset.cs.meta} (100%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{CustomerData.cs => CustomerDataEntry.cs} (95%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{CustomerData.cs.meta => CustomerDataEntry.cs.meta} (100%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{CustomerPoolDataSo.cs => CustomerPoolDataAsset.cs} (66%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{CustomerPoolDataSo.cs.meta => CustomerPoolDataAsset.cs.meta} (100%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{CustomerPoolData.cs => CustomerPoolDataEntry.cs} (93%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{CustomerPoolData.cs.meta => CustomerPoolDataEntry.cs.meta} (100%) create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkDataAsset.cs rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{DrinkDataSo.cs.meta => DrinkDataAsset.cs.meta} (100%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{FoodData.cs => DrinkDataEntry.cs} (98%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{DrinkData.cs.meta => DrinkDataEntry.cs.meta} (100%) delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkDataSo.cs create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentDataAsset.cs rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{EnvironmentDataSo.cs.meta => EnvironmentDataAsset.cs.meta} (100%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{EnvironmentData.cs => EnvironmentDataEntry.cs} (96%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{EnvironmentData.cs.meta => EnvironmentDataEntry.cs.meta} (100%) delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentDataSo.cs create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataAsset.cs rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{FoodDataSo.cs.meta => FoodDataAsset.cs.meta} (100%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{DrinkData.cs => FoodDataEntry.cs} (98%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{FoodData.cs.meta => FoodDataEntry.cs.meta} (100%) delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataSo.cs create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientDataAsset.cs rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{IngredientDataSo.cs.meta => IngredientDataAsset.cs.meta} (100%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{IngredientData.cs => IngredientDataEntry.cs} (85%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{IngredientData.cs.meta => IngredientDataEntry.cs.meta} (100%) delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientDataSo.cs create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataAsset.cs rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{ItemDataSo.cs.meta => ItemDataAsset.cs.meta} (100%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{ItemData.cs => ItemDataEntry.cs} (93%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{ItemData.cs.meta => ItemDataEntry.cs.meta} (100%) delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataSo.cs create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelDataAsset.cs rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{LevelDataSo.cs.meta => LevelDataAsset.cs.meta} (100%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{LevelData.cs => LevelDataEntry.cs} (97%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{LevelData.cs.meta => LevelDataEntry.cs.meta} (100%) delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelDataSo.cs create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeDataAsset.cs rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{RecipeDataSo.cs.meta => RecipeDataAsset.cs.meta} (100%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{RecipeData.cs => RecipeDataEntry.cs} (93%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{RecipeData.cs.meta => RecipeDataEntry.cs.meta} (100%) delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeDataSo.cs create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteDataAsset.cs rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{TasteDataSo.cs.meta => TasteDataAsset.cs.meta} (100%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{TasteData.cs => TasteDataEntry.cs} (95%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/{TasteData.cs.meta => TasteDataEntry.cs.meta} (100%) delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteDataSo.cs delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/CookwareDataSo.asset delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/CustomerDataSo.asset delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/CustomerPoolDataSo.asset delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/DrinkDataSo.asset delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/EnvironmentDataSo.asset delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/FoodDataSo.asset delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/IngredientDataSo.asset delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/ItemDataSo.asset delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/LevelDataSo.asset delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/RecipeDataSo.asset delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/TasteDataSo.asset diff --git a/Assets/_DDD/_Scripts/Game/GameData/DataSo.cs b/Assets/_DDD/_Scripts/Game/GameData/DataAsset.cs similarity index 97% rename from Assets/_DDD/_Scripts/Game/GameData/DataSo.cs rename to Assets/_DDD/_Scripts/Game/GameData/DataAsset.cs index bff309916..e49c3135f 100644 --- a/Assets/_DDD/_Scripts/Game/GameData/DataSo.cs +++ b/Assets/_DDD/_Scripts/Game/GameData/DataAsset.cs @@ -6,7 +6,7 @@ namespace DDD { - public class DataSo : ScriptableObject where T : IId + public class DataAsset : ScriptableObject where T : IId { [FormerlySerializedAs("Datas")] [SerializeField] protected List _datas = new(); diff --git a/Assets/_DDD/_Scripts/Game/GameData/DataSo.cs.meta b/Assets/_DDD/_Scripts/Game/GameData/DataAsset.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Game/GameData/DataSo.cs.meta rename to Assets/_DDD/_Scripts/Game/GameData/DataAsset.cs.meta diff --git a/Assets/_DDD/_Scripts/Game/GameState/InventoryItemData.cs b/Assets/_DDD/_Scripts/Game/GameState/InventoryItemData.cs index 584f5c162..812fe42a7 100644 --- a/Assets/_DDD/_Scripts/Game/GameState/InventoryItemData.cs +++ b/Assets/_DDD/_Scripts/Game/GameState/InventoryItemData.cs @@ -18,6 +18,6 @@ public InventoryItemData(string id, int quantity) Quantity = quantity; } - public ItemData ItemData => InventoryManager.Instance.GetItemDataByIdOrNull(Id); + public ItemDataEntry ItemDataEntry => InventoryManager.Instance.GetItemDataByIdOrNull(Id); } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Game/GameState/InventoryManager.cs b/Assets/_DDD/_Scripts/Game/GameState/InventoryManager.cs index 3a8662186..e1c3916ac 100644 --- a/Assets/_DDD/_Scripts/Game/GameState/InventoryManager.cs +++ b/Assets/_DDD/_Scripts/Game/GameState/InventoryManager.cs @@ -19,7 +19,7 @@ public class InventoryManager : Singleton, IManager { [Title("아이템 전체 목록")] [ShowInInspector, ReadOnly] - private Dictionary _allItemDataLookup; + private Dictionary _allItemDataLookup; [Title("아이템 보유 목록")] [ShowInInspector, ReadOnly] @@ -48,7 +48,7 @@ public void PostInit() private void InitializeItemData() { - var itemDataSo = DataManager.Instance.GetDataSo(); + var itemDataSo = DataManager.Instance.GetDataSo(); Debug.Assert(itemDataSo != null, "itemDataSo != null"); _allItemDataLookup = itemDataSo.GetDataList() @@ -129,12 +129,12 @@ public bool RemoveItem(string id, int quantity = 1) return true; } - public IReadOnlyDictionary AllItemDataLookup => _allItemDataLookup; + public IReadOnlyDictionary AllItemDataLookup => _allItemDataLookup; public IReadOnlyDictionary InventoryItems => _inventoryItemDatas; public bool ContainInventoryItem(string id) => _inventoryItemDatas.ContainsKey(id); public bool TryGetInventoryItemData(string id, out InventoryItemData inventoryItemData) => _inventoryItemDatas.TryGetValue(id, out inventoryItemData); public int GetItemCount(string id) => _inventoryItemDatas.TryGetValue(id, out var itemData) ? itemData.Quantity : 0; - public ItemData GetItemDataByIdOrNull(string id) + public ItemDataEntry GetItemDataByIdOrNull(string id) { _allItemDataLookup.TryGetValue(id, out var itemData); return itemData; diff --git a/Assets/_DDD/_Scripts/Game/GameState/InventoryTestDataSo.cs b/Assets/_DDD/_Scripts/Game/GameState/InventoryTestDataSo.cs index 2b6f69b17..32f98620c 100644 --- a/Assets/_DDD/_Scripts/Game/GameState/InventoryTestDataSo.cs +++ b/Assets/_DDD/_Scripts/Game/GameState/InventoryTestDataSo.cs @@ -28,14 +28,14 @@ private IEnumerable GetAllItemIds() .Select(d => d.Id); } - private ItemDataSo LoadItemDataSo() + private ItemDataAsset LoadItemDataSo() { // 경로는 프로젝트에 맞게 조정 필요 - string[] guids = AssetDatabase.FindAssets("t:ItemDataSo"); + string[] guids = AssetDatabase.FindAssets("t:ItemDataAsset"); if (guids.Length == 0) return null; string path = AssetDatabase.GUIDToAssetPath(guids[0]); - return AssetDatabase.LoadAssetAtPath(path); + return AssetDatabase.LoadAssetAtPath(path); } } diff --git a/Assets/_DDD/_Scripts/Game/GameState/TestInventoryEditorTool.cs b/Assets/_DDD/_Scripts/Game/GameState/TestInventoryEditorTool.cs index c251a1b48..f66837dbf 100644 --- a/Assets/_DDD/_Scripts/Game/GameState/TestInventoryEditorTool.cs +++ b/Assets/_DDD/_Scripts/Game/GameState/TestInventoryEditorTool.cs @@ -47,10 +47,10 @@ private void RemoveItem() private IEnumerable GetItemIds() { - if (!Application.isPlaying || DataManager.Instance?.GetDataSo() == null) + if (!Application.isPlaying || DataManager.Instance?.GetDataSo() == null) return Enumerable.Empty(); - return DataManager.Instance.GetDataSo().GetDataList() + return DataManager.Instance.GetDataSo().GetDataList() .Select(data => data.Id) .Where(id => !string.IsNullOrEmpty(id)); } diff --git a/Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding/BindingContext.cs b/Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding/BindingContext.cs index fb4faf61f..18533567b 100644 --- a/Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding/BindingContext.cs +++ b/Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding/BindingContext.cs @@ -104,7 +104,7 @@ private object GetPropertyValue(string propertyPath) { if (_dataContext == null) return null; - // 중첩 속성 지원 (예: "ItemData.Name") + // 중첩 속성 지원 (예: "ItemDataEntry.Name") var properties = propertyPath.Split('.'); object current = _dataContext; diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/CookwareDataAsset.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/CookwareDataAsset.asset new file mode 100644 index 000000000..aa9b3e191 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/CookwareDataAsset.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f7460f0acbac80d6e106b5a3b7ca458e14578783b5c277b7914a1417e3abc38 +size 1016 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/CookwareDataSo.asset.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/CookwareDataAsset.asset.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/CookwareDataSo.asset.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/CookwareDataAsset.asset.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/CustomerDataAsset.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/CustomerDataAsset.asset new file mode 100644 index 000000000..0b68d0f68 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/CustomerDataAsset.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fde6cef5464a2fd6832c0e2fad7c585618bb8bdf64fcc4b45f225aee7dd0ef35 +size 955 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/CustomerDataSo.asset.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/CustomerDataAsset.asset.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/CustomerDataSo.asset.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/CustomerDataAsset.asset.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/CustomerPoolDataAsset.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/CustomerPoolDataAsset.asset new file mode 100644 index 000000000..1062e5434 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/CustomerPoolDataAsset.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38e7e9974ded3d328cb0d7b8983b2f5427c053e3cde91963458c9e7bef9c657f +size 1319 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/CustomerPoolDataSo.asset.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/CustomerPoolDataAsset.asset.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/CustomerPoolDataSo.asset.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/CustomerPoolDataAsset.asset.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/DrinkDataAsset.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/DrinkDataAsset.asset new file mode 100644 index 000000000..b42f24ce9 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/DrinkDataAsset.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a52213a4b087efeafaecf64a08506ec7a7dc47261de27f851cb35f620d91991 +size 2215 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/DrinkDataSo.asset.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/DrinkDataAsset.asset.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/DrinkDataSo.asset.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/DrinkDataAsset.asset.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/EnvironmentDataAsset.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/EnvironmentDataAsset.asset new file mode 100644 index 000000000..fb6ab7893 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/EnvironmentDataAsset.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9966134fed81dd3e3f7175f430cc1bc3051f33c8e3f624ea6250b13382080d3 +size 1537 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/EnvironmentDataSo.asset.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/EnvironmentDataAsset.asset.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/EnvironmentDataSo.asset.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/EnvironmentDataAsset.asset.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/FoodDataAsset.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/FoodDataAsset.asset new file mode 100644 index 000000000..a9119cd48 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/FoodDataAsset.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c3e15e5cd97d76c812871adb467ca146e526d1705477e293b77683bdddf2cb6 +size 9435 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/FoodDataSo.asset.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/FoodDataAsset.asset.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/FoodDataSo.asset.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/FoodDataAsset.asset.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/IngredientDataAsset.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/IngredientDataAsset.asset new file mode 100644 index 000000000..c4cb34349 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/IngredientDataAsset.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42a66890241adfb9d9f0a90caee3db1557bf8c579641a24bbe90ac8b3282d35d +size 1453 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/IngredientDataSo.asset.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/IngredientDataAsset.asset.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/IngredientDataSo.asset.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/IngredientDataAsset.asset.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/ItemDataAsset.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/ItemDataAsset.asset new file mode 100644 index 000000000..e5079a144 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/ItemDataAsset.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad48880bc0769b0eed9efa2f55b970751e472b20408e69914ad2e596fc67b1d9 +size 5509 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/ItemDataSo.asset.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/ItemDataAsset.asset.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/ItemDataSo.asset.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/ItemDataAsset.asset.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/LevelDataAsset.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/LevelDataAsset.asset new file mode 100644 index 000000000..7f0bcf560 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/LevelDataAsset.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5bd03372474b6d1e65c81112442a0e711ab17cfdaead841de59ec1690a8ec60a +size 2128 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/LevelDataSo.asset.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/LevelDataAsset.asset.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/LevelDataSo.asset.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/LevelDataAsset.asset.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/RecipeDataAsset.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/RecipeDataAsset.asset new file mode 100644 index 000000000..f03e22201 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/RecipeDataAsset.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21a37b6a7ab2bf63c99ee6dc0f623bb93ff8d14d48530fe35e9c1cdb3b2a2c28 +size 2726 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/RecipeDataSo.asset.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/RecipeDataAsset.asset.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/RecipeDataSo.asset.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/RecipeDataAsset.asset.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/TasteDataAsset.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/TasteDataAsset.asset new file mode 100644 index 000000000..259151841 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/TasteDataAsset.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad937bc3f4ebd929d825e7cea0815065459e05457a790e3fea23743ad33111a3 +size 1320 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/TasteDataSo.asset.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/TasteDataAsset.asset.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/TasteDataSo.asset.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Assets/TasteDataAsset.asset.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareDataAsset.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareDataAsset.cs new file mode 100644 index 000000000..aeae02f52 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareDataAsset.cs @@ -0,0 +1,23 @@ +// File: CookwareDataAsset.cs +using System.Collections.Generic; +using System.Linq; +using UnityEngine; + +namespace DDD +{ + [CreateAssetMenu(fileName = "CookwareDataAsset", menuName = "GoogleSheet/CookwareDataAsset")] + public class CookwareDataAsset : DataAsset + { + public bool TryGetValueByCookwareType(CookwareType cookwareType, out CookwareDataEntry cookwareDataEntry) + { + if (_datas == null) + { + cookwareDataEntry = null; + return false; + } + + cookwareDataEntry = _datas.FirstOrDefault(data => data != null && data.CookwareType == cookwareType); + return cookwareDataEntry != null; + } + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareDataSo.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareDataAsset.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareDataSo.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareDataAsset.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareData.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareDataEntry.cs similarity index 93% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareData.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareDataEntry.cs index d3e784c00..52afff5e3 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareData.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareDataEntry.cs @@ -18,7 +18,7 @@ public enum CookwareType } [Serializable] - public class CookwareData : IId + public class CookwareDataEntry : IId { /// 식별ID [Tooltip("식별ID")] diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareData.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareDataEntry.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareData.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareDataEntry.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareDataSo.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareDataSo.cs deleted file mode 100644 index 44f684862..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CookwareDataSo.cs +++ /dev/null @@ -1,23 +0,0 @@ -// File: CookwareDataSo.cs -using System.Collections.Generic; -using System.Linq; -using UnityEngine; - -namespace DDD -{ - [CreateAssetMenu(fileName = "CookwareDataSo", menuName = "GoogleSheet/CookwareDataSo")] - public class CookwareDataSo : DataSo - { - public bool TryGetValueByCookwareType(CookwareType cookwareType, out CookwareData cookwareData) - { - if (_datas == null) - { - cookwareData = null; - return false; - } - - cookwareData = _datas.FirstOrDefault(data => data != null && data.CookwareType == cookwareType); - return cookwareData != null; - } - } -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerDataSo.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerDataAsset.cs similarity index 68% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerDataSo.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerDataAsset.cs index ae0f0fb50..5fdf7b797 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerDataSo.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerDataAsset.cs @@ -3,8 +3,8 @@ namespace DDD { - [CreateAssetMenu(fileName = "CustomerDataSo", menuName = "GoogleSheet/CustomerDataSo")] - public class CustomerDataSo : DataSo + [CreateAssetMenu(fileName = "CustomerDataAsset", menuName = "GoogleSheet/CustomerDataAsset")] + public class CustomerDataAsset : DataAsset { protected override void Initialize() { diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerDataSo.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerDataAsset.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerDataSo.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerDataAsset.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerData.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerDataEntry.cs similarity index 95% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerData.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerDataEntry.cs index a79054176..0a4d39d8e 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerData.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerDataEntry.cs @@ -15,7 +15,7 @@ public enum CustomerType } [Serializable] - public class CustomerData : IId + public class CustomerDataEntry : IId { /// 식별번호 [Tooltip("식별번호")] diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerData.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerDataEntry.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerData.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerDataEntry.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerPoolDataSo.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerPoolDataAsset.cs similarity index 66% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerPoolDataSo.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerPoolDataAsset.cs index 076134084..c5bf87263 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerPoolDataSo.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerPoolDataAsset.cs @@ -3,8 +3,8 @@ namespace DDD { - [CreateAssetMenu(fileName = "CustomerPoolDataSo", menuName = "GoogleSheet/CustomerPoolDataSo")] - public class CustomerPoolDataSo : DataSo + [CreateAssetMenu(fileName = "CustomerPoolDataAsset", menuName = "GoogleSheet/CustomerPoolDataAsset")] + public class CustomerPoolDataAsset : DataAsset { protected override void Initialize() { diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerPoolDataSo.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerPoolDataAsset.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerPoolDataSo.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerPoolDataAsset.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerPoolData.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerPoolDataEntry.cs similarity index 93% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerPoolData.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerPoolDataEntry.cs index 4ef4e3531..7340799c1 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerPoolData.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerPoolDataEntry.cs @@ -7,7 +7,7 @@ namespace DDD { [Serializable] - public class CustomerPoolData : IId + public class CustomerPoolDataEntry : IId { /// 식별번호 [Tooltip("식별번호")] diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerPoolData.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerPoolDataEntry.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerPoolData.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/CustomerPoolDataEntry.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkDataAsset.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkDataAsset.cs new file mode 100644 index 000000000..ee717ac6b --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkDataAsset.cs @@ -0,0 +1,9 @@ +// File: DrinkDataAsset.cs +using System.Collections.Generic; +using UnityEngine; + +namespace DDD +{ + [CreateAssetMenu(fileName = "DrinkDataAsset", menuName = "GoogleSheet/DrinkDataAsset")] + public class DrinkDataAsset : DataAsset { } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkDataSo.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkDataAsset.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkDataSo.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkDataAsset.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodData.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkDataEntry.cs similarity index 98% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodData.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkDataEntry.cs index a8f5aecef..0c06242bc 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodData.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkDataEntry.cs @@ -5,7 +5,7 @@ namespace DDD { [Serializable] - public class FoodData : IId + public class DrinkDataEntry : IId { /// 식별ID [Tooltip("식별ID")] diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkData.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkDataEntry.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkData.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkDataEntry.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkDataSo.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkDataSo.cs deleted file mode 100644 index 5e175481c..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkDataSo.cs +++ /dev/null @@ -1,9 +0,0 @@ -// File: DrinkDataSo.cs -using System.Collections.Generic; -using UnityEngine; - -namespace DDD -{ - [CreateAssetMenu(fileName = "DrinkDataSo", menuName = "GoogleSheet/DrinkDataSo")] - public class DrinkDataSo : DataSo { } -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentDataAsset.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentDataAsset.cs new file mode 100644 index 000000000..18811836a --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentDataAsset.cs @@ -0,0 +1,9 @@ +// File: EnvironmentDataAsset.cs +using System.Collections.Generic; +using UnityEngine; + +namespace DDD +{ + [CreateAssetMenu(fileName = "EnvironmentDataAsset", menuName = "GoogleSheet/EnvironmentDataAsset")] + public class EnvironmentDataAsset : DataAsset { } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentDataSo.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentDataAsset.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentDataSo.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentDataAsset.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentData.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentDataEntry.cs similarity index 96% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentData.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentDataEntry.cs index 7bcae5499..ed32a019a 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentData.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentDataEntry.cs @@ -12,7 +12,7 @@ public enum RendererType } [Serializable] - public class EnvironmentData : IId + public class EnvironmentDataEntry : IId { /// 식별번호 [Tooltip("식별번호")] diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentData.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentDataEntry.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentData.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentDataEntry.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentDataSo.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentDataSo.cs deleted file mode 100644 index aa5d3207e..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentDataSo.cs +++ /dev/null @@ -1,9 +0,0 @@ -// File: EnvironmentDataSo.cs -using System.Collections.Generic; -using UnityEngine; - -namespace DDD -{ - [CreateAssetMenu(fileName = "EnvironmentDataSo", menuName = "GoogleSheet/EnvironmentDataSo")] - public class EnvironmentDataSo : DataSo { } -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataAsset.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataAsset.cs new file mode 100644 index 000000000..a6b3a54aa --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataAsset.cs @@ -0,0 +1,9 @@ +// File: FoodDataAsset.cs +using System.Collections.Generic; +using UnityEngine; + +namespace DDD +{ + [CreateAssetMenu(fileName = "FoodDataAsset", menuName = "GoogleSheet/FoodDataAsset")] + public class FoodDataAsset : DataAsset { } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataSo.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataAsset.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataSo.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataAsset.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkData.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataEntry.cs similarity index 98% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkData.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataEntry.cs index ce18e5dce..48cc24417 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/DrinkData.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataEntry.cs @@ -5,7 +5,7 @@ namespace DDD { [Serializable] - public class DrinkData : IId + public class FoodDataEntry : IId { /// 식별ID [Tooltip("식별ID")] diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodData.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataEntry.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodData.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataEntry.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataSo.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataSo.cs deleted file mode 100644 index 3178bd192..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/FoodDataSo.cs +++ /dev/null @@ -1,9 +0,0 @@ -// File: FoodDataSo.cs -using System.Collections.Generic; -using UnityEngine; - -namespace DDD -{ - [CreateAssetMenu(fileName = "FoodDataSo", menuName = "GoogleSheet/FoodDataSo")] - public class FoodDataSo : DataSo { } -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientDataAsset.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientDataAsset.cs new file mode 100644 index 000000000..37884cbee --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientDataAsset.cs @@ -0,0 +1,8 @@ +// +using UnityEngine; + +namespace DDD +{ + [CreateAssetMenu(fileName = "IngredientDataAsset", menuName = "GoogleSheet/IngredientDataAsset")] + public class IngredientDataAsset : DataAsset { } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientDataSo.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientDataAsset.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientDataSo.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientDataAsset.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientData.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientDataEntry.cs similarity index 85% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientData.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientDataEntry.cs index ea776715a..90546185b 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientData.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientDataEntry.cs @@ -5,7 +5,7 @@ namespace DDD { [Serializable] - public class IngredientData : IId + public class IngredientDataEntry : IId { /// 식별ID [Tooltip("식별ID")] diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientData.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientDataEntry.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientData.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientDataEntry.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientDataSo.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientDataSo.cs deleted file mode 100644 index dda2cd047..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/IngredientDataSo.cs +++ /dev/null @@ -1,8 +0,0 @@ -// -using UnityEngine; - -namespace DDD -{ - [CreateAssetMenu(fileName = "IngredientDataSo", menuName = "GoogleSheet/IngredientDataSo")] - public class IngredientDataSo : DataSo { } -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataAsset.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataAsset.cs new file mode 100644 index 000000000..aab668034 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataAsset.cs @@ -0,0 +1,9 @@ +// File: ItemDataAsset.cs +using System.Collections.Generic; +using UnityEngine; + +namespace DDD +{ + [CreateAssetMenu(fileName = "ItemDataAsset", menuName = "GoogleSheet/ItemDataAsset")] + public class ItemDataAsset : DataAsset { } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataSo.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataAsset.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataSo.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataAsset.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemData.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataEntry.cs similarity index 93% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemData.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataEntry.cs index d4b5ba409..0681a2d51 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemData.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataEntry.cs @@ -15,7 +15,7 @@ public enum ItemType } [Serializable] - public class ItemData : IId + public class ItemDataEntry : IId { /// 식별번호 [Tooltip("식별번호")] diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemData.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataEntry.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemData.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataEntry.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataSo.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataSo.cs deleted file mode 100644 index c4183a6a6..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/ItemDataSo.cs +++ /dev/null @@ -1,9 +0,0 @@ -// File: ItemDataSo.cs -using System.Collections.Generic; -using UnityEngine; - -namespace DDD -{ - [CreateAssetMenu(fileName = "ItemDataSo", menuName = "GoogleSheet/ItemDataSo")] - public class ItemDataSo : DataSo { } -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelDataAsset.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelDataAsset.cs new file mode 100644 index 000000000..cd57091b7 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelDataAsset.cs @@ -0,0 +1,8 @@ +// +using UnityEngine; + +namespace DDD +{ + [CreateAssetMenu(fileName = "LevelDataAsset", menuName = "GoogleSheet/LevelDataAsset")] + public class LevelDataAsset : DataAsset { } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelDataSo.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelDataAsset.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelDataSo.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelDataAsset.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelData.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelDataEntry.cs similarity index 97% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelData.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelDataEntry.cs index ab2cbf1fa..4a9793af4 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelData.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelDataEntry.cs @@ -12,7 +12,7 @@ public enum SpawnType } [Serializable] - public class LevelData : IId + public class LevelDataEntry : IId { /// 식별번호 [Tooltip("식별번호")] diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelData.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelDataEntry.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelData.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelDataEntry.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelDataSo.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelDataSo.cs deleted file mode 100644 index 6f175d75d..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/LevelDataSo.cs +++ /dev/null @@ -1,8 +0,0 @@ -// -using UnityEngine; - -namespace DDD -{ - [CreateAssetMenu(fileName = "LevelDataSo", menuName = "GoogleSheet/LevelDataSo")] - public class LevelDataSo : DataSo { } -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeDataAsset.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeDataAsset.cs new file mode 100644 index 000000000..26ced1dbf --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeDataAsset.cs @@ -0,0 +1,9 @@ +// File: RecipeDataAsset.cs +using System.Collections.Generic; +using UnityEngine; + +namespace DDD +{ + [CreateAssetMenu(fileName = "RecipeDataAsset", menuName = "GoogleSheet/RecipeDataAsset")] + public class RecipeDataAsset : DataAsset { } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeDataSo.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeDataAsset.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeDataSo.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeDataAsset.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeData.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeDataEntry.cs similarity index 93% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeData.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeDataEntry.cs index a38afbd14..43ed11ea3 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeData.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeDataEntry.cs @@ -12,7 +12,7 @@ public enum RecipeType } [Serializable] - public class RecipeData : IId + public class RecipeDataEntry : IId { /// 식별ID [Tooltip("식별ID")] diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeData.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeDataEntry.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeData.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeDataEntry.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeDataSo.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeDataSo.cs deleted file mode 100644 index d82950b45..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/RecipeDataSo.cs +++ /dev/null @@ -1,9 +0,0 @@ -// File: RecipeDataSo.cs -using System.Collections.Generic; -using UnityEngine; - -namespace DDD -{ - [CreateAssetMenu(fileName = "RecipeDataSo", menuName = "GoogleSheet/RecipeDataSo")] - public class RecipeDataSo : DataSo { } -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteDataAsset.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteDataAsset.cs new file mode 100644 index 000000000..077402fd0 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteDataAsset.cs @@ -0,0 +1,9 @@ +// File: TasteDataAsset.cs +using System.Collections.Generic; +using UnityEngine; + +namespace DDD +{ + [CreateAssetMenu(fileName = "TasteDataAsset", menuName = "GoogleSheet/TasteDataAsset")] + public class TasteDataAsset : DataAsset { } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteDataSo.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteDataAsset.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteDataSo.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteDataAsset.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteData.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteDataEntry.cs similarity index 95% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteData.cs rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteDataEntry.cs index 835cfe2e3..eb7b845fd 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteData.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteDataEntry.cs @@ -28,7 +28,7 @@ public enum TasteType } [Serializable] - public class TasteData : IId + public class TasteDataEntry : IId { /// 식별ID [Tooltip("식별ID")] diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteData.cs.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteDataEntry.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteData.cs.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteDataEntry.cs.meta diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteDataSo.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteDataSo.cs deleted file mode 100644 index 538f8533d..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/TasteDataSo.cs +++ /dev/null @@ -1,9 +0,0 @@ -// File: TasteDataSo.cs -using System.Collections.Generic; -using UnityEngine; - -namespace DDD -{ - [CreateAssetMenu(fileName = "TasteDataSo", menuName = "GoogleSheet/TasteDataSo")] - public class TasteDataSo : DataSo { } -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/CookwareDataSo.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/CookwareDataSo.asset deleted file mode 100644 index e78767be5..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/CookwareDataSo.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:38b93c1a21f0361c1e0bb154afdc0a0d9103225195b9f0cedd26e74de126eb3f -size 1013 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/CustomerDataSo.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/CustomerDataSo.asset deleted file mode 100644 index 4f596e43f..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/CustomerDataSo.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:600b73b988d57a63d502145ba01feb5323df6b87ca7af17b795f220d5644019d -size 952 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/CustomerPoolDataSo.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/CustomerPoolDataSo.asset deleted file mode 100644 index 2a1e06063..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/CustomerPoolDataSo.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:744e0087510d2c2d522b5f894d684df478acfae5456ec547157af0c662c018f5 -size 1316 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/DrinkDataSo.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/DrinkDataSo.asset deleted file mode 100644 index 0373fbe90..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/DrinkDataSo.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3dfdc5570d516edbb7436c74cd98e4c4722fd4691afab34ba094b93a041dc2f9 -size 2212 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/EnvironmentDataSo.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/EnvironmentDataSo.asset deleted file mode 100644 index 98082d99f..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/EnvironmentDataSo.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12badc6747a2bc25c321281b29f30d2397cd92a81d87cabed61151c0fb1a65bb -size 1534 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/FoodDataSo.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/FoodDataSo.asset deleted file mode 100644 index 31da407d7..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/FoodDataSo.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12ddf4f70c6d37a1fb65c09de7281602c7d70f99255e3fe5d7aa198f6b829810 -size 9432 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/IngredientDataSo.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/IngredientDataSo.asset deleted file mode 100644 index a916baa64..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/IngredientDataSo.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32cb5468e3b617ba50526c12255e072cfa8d658c73800a32a4ac852a37307f51 -size 1450 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/ItemDataSo.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/ItemDataSo.asset deleted file mode 100644 index 0cb1025ce..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/ItemDataSo.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e75e05c2ca952b82d8b3204ebcd86ac4459c4d4a06b311a4ee99ebb8a39605e -size 5506 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/LevelDataSo.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/LevelDataSo.asset deleted file mode 100644 index 7db412a21..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/LevelDataSo.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:563078d8747c408ee7fd6442914fe4c071effe4ed8fcd1782cd9ddfbffb3890b -size 2125 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/RecipeDataSo.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/RecipeDataSo.asset deleted file mode 100644 index 1739578ea..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/RecipeDataSo.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cfb22ca245534fdd789d910626dd295eb2eb7abdbedfcb62c8927bdec52a8e79 -size 2723 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/TasteDataSo.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/TasteDataSo.asset deleted file mode 100644 index afe417bbc..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/TasteDataSo.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d408dbe2e5bfcf05f5cb6c69620258d694b22a6924be0c1b90343908907b47f0 -size 1317 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/Implementations/CodeGeneration/CSharpCodeGenerator.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/Implementations/CodeGeneration/CSharpCodeGenerator.cs index cbb43e4f0..4fbace293 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/Implementations/CodeGeneration/CSharpCodeGenerator.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/Implementations/CodeGeneration/CSharpCodeGenerator.cs @@ -83,8 +83,8 @@ public CodeGenerationResult Generate(string fullJson, IReadOnlyCollection {{ }} + [CreateAssetMenu(fileName = ""{safe}Asset"", menuName = ""GoogleSheet/{safe}Asset"")] + public class {safe}Asset : DataAsset<{safe}> {{ }} }}"; } @@ -193,7 +193,7 @@ private string GenerateDataClass(string rootNamespace, string className, JArray sb.AppendLine($"namespace {rootNamespace}"); sb.AppendLine("{"); sb.AppendLine(" [Serializable]"); - sb.AppendLine($" public class {safeClass} : IId"); + sb.AppendLine($" public class {safeClass}Entry : IId"); sb.AppendLine(" {"); foreach (var prop in sampleRow.Properties()) diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/Settings/GoogleSheetSettingsSo.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/Settings/GoogleSheetSettingsSo.cs index 1a48c8dcc..9abb38765 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/Settings/GoogleSheetSettingsSo.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/Settings/GoogleSheetSettingsSo.cs @@ -21,7 +21,7 @@ public class GoogleSheetSettingsSo : ScriptableObject [Header("출력 경로(모두 AssetPath, 한 곳만 바꾸면 연동)")] [SerializeField] private string _generateAssetBasePath = "Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated"; [SerializeField] private string _classesFolderName = "Classes"; - [SerializeField] private string _soFolderName = "So"; + [SerializeField] private string _assetFolderName = "Assets"; [SerializeField] private string _logsFolderName = "Logs"; [SerializeField] private string _backupsFolderName = "BackUps"; [SerializeField] private string _enumTypesFileName = "EnumTypes.cs"; @@ -30,7 +30,7 @@ public class GoogleSheetSettingsSo : ScriptableObject public string GenerateAssetBasePath => _generateAssetBasePath; public string ClassesFolderAssetPath => CombineAsset(_generateAssetBasePath, _classesFolderName); - public string SoFolderAssetPath => CombineAsset(_generateAssetBasePath, _soFolderName); + public string SoFolderAssetPath => CombineAsset(_generateAssetBasePath, _assetFolderName); public string LogsFolderAssetPath => CombineAsset(_generateAssetBasePath, _logsFolderName); public string BackupsFolderAssetPath => CombineAsset(_generateAssetBasePath, _backupsFolderName); public string EnumTypesAssetPath => CombineAsset(_generateAssetBasePath, _enumTypesFileName); @@ -74,7 +74,7 @@ private void OnValidate() { _generateAssetBasePath = NormalizeAssetPath(_generateAssetBasePath); _classesFolderName = (_classesFolderName ?? "Classes").Replace("/", "").Replace("\\", ""); - _soFolderName = (_soFolderName ?? "So").Replace("/", "").Replace("\\", ""); + _assetFolderName = (_assetFolderName ?? "So").Replace("/", "").Replace("\\", ""); _logsFolderName = (_logsFolderName ?? "Logs").Replace("/", "").Replace("\\", ""); _backupsFolderName = (_backupsFolderName ?? "BackUps").Replace("/", "").Replace("\\", ""); _enumTypesFileName = string.IsNullOrWhiteSpace(_enumTypesFileName) ? "EnumTypes.cs" : _enumTypesFileName; diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerAiComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerAiComponent.cs index 89593be6d..aa9cfeb93 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerAiComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerAiComponent.cs @@ -20,11 +20,11 @@ private void Awake() _blackboardComponent = GetComponent(); } - public async Task InitializeAi(CustomerData inCustomerData) + public async Task InitializeAi(CustomerDataEntry inCustomerDataEntry) { try { - await InitializeAiInternal(inCustomerData); + await InitializeAiInternal(inCustomerDataEntry); } catch (Exception e) { @@ -34,21 +34,21 @@ public async Task InitializeAi(CustomerData inCustomerData) } } - private async Task InitializeAiInternal(CustomerData inCustomerData) + private async Task InitializeAiInternal(CustomerDataEntry inCustomerDataEntry) { var customerState = RestaurantState.Instance.CustomerState; - var subtree = customerState.GetLoadedSubtree(inCustomerData.CustomerType); + var subtree = customerState.GetLoadedSubtree(inCustomerDataEntry.CustomerType); if (subtree == null) { Debug.LogError( - $"[CustomerCharacter] No preloaded subtree found for CustomerType: {inCustomerData.CustomerType}. Make sure CustomerBehaviorData is loaded."); - subtree = await customerState.GetOrLoadSubtree(inCustomerData.CustomerType); + $"[CustomerCharacter] No preloaded subtree found for CustomerType: {inCustomerDataEntry.CustomerType}. Make sure CustomerBehaviorData is loaded."); + subtree = await customerState.GetOrLoadSubtree(inCustomerDataEntry.CustomerType); } _behaviorTree.Subgraph = subtree; _blackboardComponent.InitializeWithBehaviorTree(subtree); - _blackboardComponent.SetCustomerData(inCustomerData); + _blackboardComponent.SetCustomerData(inCustomerDataEntry); // TODO : 1. Subtree - Action, Condition // TODO : 2. Blackboard _behaviorTree.StartBehavior(); diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerBlackboardComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerBlackboardComponent.cs index d23f14605..408f35def 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerBlackboardComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerBlackboardComponent.cs @@ -17,10 +17,10 @@ public void InitializeWithBehaviorTree(Subtree subtree) } } - public void SetCustomerData(CustomerData inCustomerData) + public void SetCustomerData(CustomerDataEntry inCustomerDataEntry) { if (_subtree == null) return; - _subtree.SetVariableValue(nameof(RestaurantCustomerBlackboardKey.CustomerData), inCustomerData); + _subtree.SetVariableValue(nameof(RestaurantCustomerBlackboardKey.CustomerData), inCustomerDataEntry); } public void SetCurrentInteractionTarget(GameObject targetGameObject) diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerAi.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerAi.cs index 6fc7ad64f..8672b0e08 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerAi.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerAi.cs @@ -4,6 +4,6 @@ namespace DDD { public interface ICustomerAi { - Task InitializeAi(CustomerData inCustomerData); + Task InitializeAi(CustomerDataEntry inCustomerDataEntry); } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerBlackboard.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerBlackboard.cs index 3f811c8a3..bec4db845 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerBlackboard.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerBlackboard.cs @@ -11,7 +11,7 @@ public enum RestaurantCustomerBlackboardKey public interface ICustomerBlackboard { - void SetCustomerData(CustomerData inCustomerData); + void SetCustomerData(CustomerDataEntry inCustomerDataEntry); void SetCurrentInteractionTarget(GameObject targetGameObject); GameObject GetCurrentInteractionTarget(); } diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/Npc/Customer/CustomerCharacter.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/Customer/CustomerCharacter.cs index 6dc164fa9..24c04c2e0 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Character/Npc/Customer/CustomerCharacter.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/Customer/CustomerCharacter.cs @@ -8,7 +8,7 @@ namespace DDD.Restaurant [RequireComponent(typeof(CustomerAiComponent))] public class CustomerCharacter : NpcCharacter, ICustomerInitializer { - private CustomerData _customerData; + private CustomerDataEntry _customerDataEntry; protected ICustomerAi _customerAi; protected override void Awake() @@ -17,13 +17,13 @@ protected override void Awake() _customerAi = GetComponent(); } - public void Initialize(CustomerData customerData) + public void Initialize(CustomerDataEntry customerDataEntry) { - _customerData = customerData; - _customerAi.InitializeAi(_customerData); + _customerDataEntry = customerDataEntry; + _customerAi.InitializeAi(_customerDataEntry); // 스킨 설정 - _spineController.SetSkin(_customerData.SpineSkinKey); + _spineController.SetSkin(_customerDataEntry.SpineSkinKey); } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/EnvironmentController.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/EnvironmentController.cs index 32c5be4f2..bd52b1ee1 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/EnvironmentController.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/EnvironmentController.cs @@ -31,7 +31,7 @@ public override Task OnExitCurrentFlow(GameFlowState exitingFlowState) private void GenerateDummyEnvironmentProps() { // Make dummy placement data - foreach (EnvironmentData prop in DataManager.Instance.GetDataSo().GetDataList()) + foreach (EnvironmentDataEntry prop in DataManager.Instance.GetDataSo().GetDataList()) { for (int i = 0; i < 10; i++) { diff --git a/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/CustomerFactory.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/CustomerFactory.cs index a19fc2565..fadd08e19 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/CustomerFactory.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/CustomerFactory.cs @@ -14,12 +14,12 @@ public interface ICustomerFactory public interface ICustomerInitializer { - void Initialize(CustomerData customerData); + void Initialize(CustomerDataEntry customerDataEntry); } public struct CustomerSpawnArgs { - public CustomerData CustomerData; + public CustomerDataEntry CustomerDataEntry; public Vector3 Position; public Quaternion Rotation; public Transform Parent; @@ -41,7 +41,7 @@ public async Task CreateAsync(CustomerSpawnArgs args) if (newCustomer.TryGetComponent(out ICustomerInitializer initializer)) { - initializer.Initialize(args.CustomerData); + initializer.Initialize(args.CustomerDataEntry); } return newCustomer; } diff --git a/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/RunController.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/RunController.cs index 20074746e..03db4ea75 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/RunController.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/RunController.cs @@ -14,9 +14,9 @@ public class RunController : FlowController private CancellationTokenSource _cts; // Runtime dependencies used by the execution logic - private LevelDataSo _levelDataSo; - private CustomerDataSo _customerDataSo; - private CustomerPoolDataSo _customerPoolDataSo; + private LevelDataAsset _levelDataAsset; + private CustomerDataAsset _customerDataAsset; + private CustomerPoolDataAsset _customerPoolDataAsset; private ICustomerFactory _iCustomerFactory; private ISpawnPointProvider _spawnPointProvider; @@ -71,21 +71,21 @@ public override Task OnExitCurrentFlow(GameFlowState exitingFlowState) private async Task StartSpawnLoopAsync(CancellationToken token) { var currentGameLevel = GameState.Instance.LevelState.Level; - _levelDataSo ??= DataManager.Instance.GetDataSo(); - _customerDataSo ??= DataManager.Instance.GetDataSo(); - _customerPoolDataSo ??= DataManager.Instance.GetDataSo(); + _levelDataAsset ??= DataManager.Instance.GetDataSo(); + _customerDataAsset ??= DataManager.Instance.GetDataSo(); + _customerPoolDataAsset ??= DataManager.Instance.GetDataSo(); - var currentLevelData = _levelDataSo.GetDataList().FirstOrDefault(data => data.Level == currentGameLevel); + var currentLevelData = _levelDataAsset.GetDataList().FirstOrDefault(data => data.Level == currentGameLevel); Debug.Assert(currentLevelData != null, "currentLevelData is null"); if (currentLevelData == null) return; // 안전 가드 - var normalPool = _customerPoolDataSo.GetDataById(currentLevelData.CustomerPool); - var specialPool = _customerPoolDataSo.GetDataById(currentLevelData.SpecialCustomerPool); + var normalPool = _customerPoolDataAsset.GetDataById(currentLevelData.CustomerPool); + var specialPool = _customerPoolDataAsset.GetDataById(currentLevelData.SpecialCustomerPool); await RunSpawnLoopAsync(currentLevelData, normalPool, specialPool, token); } - private async Task RunSpawnLoopAsync(LevelData levelData, CustomerPoolData normalPool, CustomerPoolData specialPool, CancellationToken token) + private async Task RunSpawnLoopAsync(LevelDataEntry levelDataEntry, CustomerPoolDataEntry normalPool, CustomerPoolDataEntry specialPool, CancellationToken token) { var runData = RestaurantData.Instance? RestaurantData.Instance.RunData : null; float firstDelay = Mathf.Max(0f, runData? runData.FirstSpawnDelaySeconds : 5f); @@ -94,7 +94,7 @@ private async Task RunSpawnLoopAsync(LevelData levelData, CustomerPoolData norma await Awaitable.WaitForSecondsAsync(firstDelay, token); } - var scheduleBuilder = CreateBuilder(levelData.SpawnType); + var scheduleBuilder = CreateBuilder(levelDataEntry.SpawnType); int randomSeed = Environment.TickCount; SpawnSchedule MakeSchedule() => scheduleBuilder.Build(new SpawnScheduleBuildArgs @@ -107,7 +107,7 @@ SpawnSchedule MakeSchedule() => scheduleBuilder.Build(new SpawnScheduleBuildArgs }); _spawnSchedule = MakeSchedule(); - float wait = Mathf.Max(0.1f, levelData.CustomerRespawnTime); + float wait = Mathf.Max(0.1f, levelDataEntry.CustomerRespawnTime); while (token.IsCancellationRequested == false) { @@ -118,13 +118,13 @@ SpawnSchedule MakeSchedule() => scheduleBuilder.Build(new SpawnScheduleBuildArgs if (_spawnSchedule.TryDequeue(out var customerId) == false) break; - if (_customerDataSo.TryGetDataById(customerId, out var customerData)) + if (_customerDataAsset.TryGetDataById(customerId, out var customerData)) { var rotation = Quaternion.identity; await _iCustomerFactory.CreateAsync(new CustomerSpawnArgs { - CustomerData = customerData, + CustomerDataEntry = customerData, Position = _restaurantRunStateSo.SpawnPoint, Rotation = rotation, Parent = null diff --git a/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks/CreateRestaurantEnvironment.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks/CreateRestaurantEnvironment.cs index d63885208..a0812a08a 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks/CreateRestaurantEnvironment.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks/CreateRestaurantEnvironment.cs @@ -13,7 +13,7 @@ public override Task ReadyFlowTask() public override Task RunFlowTask() { - // TODO : Base prefab from EnvironmentDataSo + // TODO : Base prefab from EnvironmentDataAsset var props = RestaurantState.Instance.EnvironmentState.Props; foreach (var prop in props) diff --git a/Assets/_DDD/_Scripts/Restaurant/Environment/RestaurantEnvironment.cs b/Assets/_DDD/_Scripts/Restaurant/Environment/RestaurantEnvironment.cs index a15895274..6b1ae5890 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Environment/RestaurantEnvironment.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Environment/RestaurantEnvironment.cs @@ -16,47 +16,47 @@ public class RestaurantEnvironment : MonoBehaviour public void Initialize(RestaurantPropLocation location) { - EnvironmentData environmentData = DataManager.Instance.GetDataSo().GetDataById(location.Id); + EnvironmentDataEntry environmentDataEntry = DataManager.Instance.GetDataSo().GetDataById(location.Id); _collider = GetComponent(); _rootObject = transform.Find(CommonConstants.RootObject); _visualLook = _rootObject.Find(CommonConstants.VisualLook); - if (environmentData == null) + if (environmentDataEntry == null) { - Debug.Assert(false, "environmentData is null"); + Debug.Assert(false, "environmentDataEntry is null"); } - if (environmentData.RendererType == RendererType.Sprite) + if (environmentDataEntry.RendererType == RendererType.Sprite) { var spriteRenderer = _visualLook.AddComponent(); _renderer = spriteRenderer; - spriteRenderer.sprite = DataManager.Instance.GetSprite(environmentData.SpriteKey); + spriteRenderer.sprite = DataManager.Instance.GetSprite(environmentDataEntry.SpriteKey); spriteRenderer.sortingOrder = 5; //Material material = await AssetManager.LoadAssetAsync(DataConstants.BasePropSpriteMaterial); //spriteRenderer.material = new Material(material); } - else if (environmentData.RendererType == RendererType.Spine) + else if (environmentDataEntry.RendererType == RendererType.Spine) { var skeletonAnimation = _visualLook.AddComponent(); - //var skeletonDataAsset = await AssetManager.LoadAssetAsync(environmentData.SkeletonDataName); + //var skeletonDataAsset = await AssetManager.LoadAssetAsync(environmentDataEntry.SkeletonDataName); //skeletonAnimation.skeletonDataAsset = skeletonDataAsset; var spineController = transform.AddComponent(); - spineController.SetSkin(environmentData.SkinName); - spineController.PlayAnimation(environmentData.DefaultAnimationName, true); + spineController.SetSkin(environmentDataEntry.SkinName); + spineController.PlayAnimation(environmentDataEntry.DefaultAnimationName, true); _renderer = _visualLook.GetComponent(); } - _collider.isTrigger = environmentData.IsTrigger == 1; + _collider.isTrigger = environmentDataEntry.IsTrigger == 1; transform.position = new Vector3(location.Position.x, 0f, location.Position.y); - transform.localScale = Vector3.one * environmentData.Size; + transform.localScale = Vector3.one * environmentDataEntry.Size; // Interaction initialize - if (environmentData.InteractionType != InteractionType.None) + if (environmentDataEntry.InteractionType != InteractionType.None) { var interactionComponent = transform.AddComponent(); - interactionComponent.InitializeInteraction(environmentData.InteractionType); + interactionComponent.InitializeInteraction(environmentDataEntry.InteractionType); } } } diff --git a/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantManagementState.cs b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantManagementState.cs index 1c5befdf7..189ebb88d 100644 --- a/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantManagementState.cs +++ b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantManagementState.cs @@ -79,7 +79,7 @@ public bool TryAddTodayMenu(ItemModel model) if (model.ItemType != ItemType.Recipe) return false; - if (DataManager.Instance.GetDataSo().TryGetDataById(recipeId, out RecipeData recipeData) == false) return false; + if (DataManager.Instance.GetDataSo().TryGetDataById(recipeId, out RecipeDataEntry recipeData) == false) return false; bool added = false; @@ -87,7 +87,7 @@ public bool TryAddTodayMenu(ItemModel model) { if (_todayFoodRecipeIds.Count >= GetRestaurantManagementData().MaxFoodCount || _todayFoodRecipeIds.ContainsKey(recipeId)) return false; - var foodData = DataManager.Instance.GetDataSo().GetDataById(recipeData.RecipeResult); + var foodData = DataManager.Instance.GetDataSo().GetDataById(recipeData.RecipeResult); var craftableCount = foodData.GetCraftableCount(); foodData.ConsumeAllCraftableIngredients(); @@ -98,7 +98,7 @@ public bool TryAddTodayMenu(ItemModel model) { if (_todayDrinkRecipeIds.Count >= GetRestaurantManagementData().MaxDrinkCount || _todayDrinkRecipeIds.ContainsKey(recipeId)) return false; - var drinkData = DataManager.Instance.GetDataSo().GetDataById(recipeData.RecipeResult); + var drinkData = DataManager.Instance.GetDataSo().GetDataById(recipeData.RecipeResult); var craftableCount = drinkData.GetCraftableCount(); drinkData.ConsumeAllCraftableIngredients(); @@ -128,7 +128,7 @@ public bool TryRemoveTodayMenu(ItemModel model) string recipeId = model.Id; var removedEvt = RestaurantEvents.TodayMenuRemovedEvent; - if (DataManager.Instance.GetDataSo().TryGetDataById(recipeId, out RecipeData recipeData) == false) return false; + if (DataManager.Instance.GetDataSo().TryGetDataById(recipeId, out RecipeDataEntry recipeData) == false) return false; bool removed = false; int refundCount = 0; @@ -142,7 +142,7 @@ public bool TryRemoveTodayMenu(ItemModel model) if (removed) { - var foodData = DataManager.Instance.GetDataSo().GetDataById(recipeData.RecipeResult); + var foodData = DataManager.Instance.GetDataSo().GetDataById(recipeData.RecipeResult); foodData.RefundIngredients(refundCount); } } @@ -156,7 +156,7 @@ public bool TryRemoveTodayMenu(ItemModel model) if (removed) { - var drinkData = DataManager.Instance.GetDataSo().GetDataById(recipeData.RecipeResult); + var drinkData = DataManager.Instance.GetDataSo().GetDataById(recipeData.RecipeResult); drinkData.RefundIngredients(refundCount); } } @@ -183,7 +183,7 @@ public bool TryAddTodayCookware(ItemModel model) { var cookwareId = model.Id; - if (model.HasItem == false || DataManager.Instance.GetDataSo().ContainsData(cookwareId) == false) return false; + if (model.HasItem == false || DataManager.Instance.GetDataSo().ContainsData(cookwareId) == false) return false; if (_cookwareToRecipeIds.Count >= GetRestaurantManagementData().MaxCookwareCount || _cookwareToRecipeIds.ContainsKey(cookwareId)) return false; @@ -212,7 +212,7 @@ public bool TryRemoveTodayCookware(ItemModel model) { var cookwareId = model.Id; - if (DataManager.Instance.GetDataSo().ContainsData(cookwareId) == false) return false; + if (DataManager.Instance.GetDataSo().ContainsData(cookwareId) == false) return false; if (_cookwareToRecipeIds.Remove(cookwareId) == false) return false; @@ -228,14 +228,14 @@ public bool TryRemoveTodayCookware(ItemModel model) private string GetRequiredCookwareKey(string recipeId) { - if (DataManager.Instance.GetDataSo().TryGetDataById(recipeId, out var recipeData) == false) return null; + if (DataManager.Instance.GetDataSo().TryGetDataById(recipeId, out var recipeData) == false) return null; var resultKey = recipeData.RecipeResult; return recipeData.RecipeType switch { - RecipeType.FoodRecipe => DataManager.Instance.GetDataSo().GetDataById(resultKey).CookwareKey, - RecipeType.DrinkRecipe => DataManager.Instance.GetDataSo().GetDataById(resultKey).CookwareKey, + RecipeType.FoodRecipe => DataManager.Instance.GetDataSo().GetDataById(resultKey).CookwareKey, + RecipeType.DrinkRecipe => DataManager.Instance.GetDataSo().GetDataById(resultKey).CookwareKey, _ => null }; } diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookViewModel.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookViewModel.cs index ae41c6dd6..d4b6e08ee 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookViewModel.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookViewModel.cs @@ -13,12 +13,12 @@ public class SelectedCookSnapshot public Sprite CookIcon { get; } public string CookPrice { get; } public IReadOnlyList IngredientEntries { get; } - public IReadOnlyList Tastes { get; } + public IReadOnlyList Tastes { get; } public Material TasteMaterial { get; } public SelectedCookSnapshot(LocalizedString name, LocalizedString description, Sprite cookIcon, string cookPrice, IReadOnlyList ingredientEntries, - IReadOnlyList tastes, Material tasteMaterial) + IReadOnlyList tastes, Material tasteMaterial) { Name = name; Description = description; @@ -35,7 +35,7 @@ public SelectedCookSnapshot(LocalizedString name, cookIcon: null, cookPrice: null, ingredientEntries: null, - tastes: System.Array.Empty(), + tastes: System.Array.Empty(), tasteMaterial: null); } @@ -89,7 +89,7 @@ public void SetCookwareType(CookwareType cookwareType) if (_currentCookwareType == cookwareType) return; _currentCookwareType = cookwareType; - var cookwareDatas = DataManager.Instance.GetDataSo().GetDataList(); + var cookwareDatas = DataManager.Instance.GetDataSo().GetDataList(); var cookwareKey = cookwareDatas.Find(data => data.CookwareType == cookwareType).Id; CookwareIcon = DataManager.Instance.GetIcon(cookwareKey); CookwareName = LocalizationManager.Instance.GetLocalizedName(cookwareKey); @@ -119,7 +119,7 @@ public void CreateAddedCookItemSlot(Transform parent) var cookwareId = cookwareToRecipe.Key; var recipeIds = cookwareToRecipe.Value; - if (DataManager.Instance.GetDataSo().TryGetDataById(cookwareId, out var cookwareData) && + if (DataManager.Instance.GetDataSo().TryGetDataById(cookwareId, out var cookwareData) && cookwareData.CookwareType == _currentCookwareType) { foreach (var recipeId in recipeIds) @@ -174,7 +174,7 @@ public void CreateIngredientInventoryItemSlot(Transform parent) // } // else // { - // if (DataManager.Instance.GetDataSo().TryGetDataById(model.Id, out var cookwareData)) + // if (DataManager.Instance.GetDataSo().TryGetDataById(model.Id, out var cookwareData)) // { // interactor.Initialize(TodayMenuEventType.Add, new TodayCookwareInteractorStrategy()); // } diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs index ac018625f..6275ee513 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs @@ -29,15 +29,15 @@ public static List ExtractIngredients(params string[] values) return list; } - public static List ResolveTasteDatas(string[] tasteKeys, TasteDataSo tasteSo) + public static List ResolveTasteDatas(string[] tasteKeys, TasteDataAsset tasteAsset) { - var result = new List(); + var result = new List(); foreach (var key in tasteKeys) { if (string.IsNullOrWhiteSpace(key)) continue; - if (tasteSo.TryGetDataById(key, out var taste)) + if (tasteAsset.TryGetDataById(key, out var taste)) { result.Add(taste); } diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs index 95ec90f6c..da00d7b3a 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs @@ -4,34 +4,34 @@ namespace DDD { public static class DrinkDataExtensions { - public static List GetIngredients(this DrinkData data) + public static List GetIngredients(this DrinkDataEntry dataEntry) => CraftingHelper.ExtractIngredients( - data.IngredientKey1, data.IngredientAmount1, - data.IngredientKey2, data.IngredientAmount2, - data.IngredientKey3, data.IngredientAmount3, - data.IngredientKey4, data.IngredientAmount4 + dataEntry.IngredientKey1, dataEntry.IngredientAmount1, + dataEntry.IngredientKey2, dataEntry.IngredientAmount2, + dataEntry.IngredientKey3, dataEntry.IngredientAmount3, + dataEntry.IngredientKey4, dataEntry.IngredientAmount4 ); - public static List GetTasteDatas(this DrinkData data) + public static List GetTasteDatas(this DrinkDataEntry dataEntry) => CraftingHelper.ResolveTasteDatas( - new[] { data.TasteKey1, data.TasteKey2, data.TasteKey3, data.TasteKey4, data.TasteKey5, data.TasteKey6 }, - DataManager.Instance.GetDataSo() + new[] { dataEntry.TasteKey1, dataEntry.TasteKey2, dataEntry.TasteKey3, dataEntry.TasteKey4, dataEntry.TasteKey5, dataEntry.TasteKey6 }, + DataManager.Instance.GetDataSo() ); - public static int GetCraftableCount(this DrinkData data) - => CraftingHelper.GetCraftableCount(data.GetIngredients()); + public static int GetCraftableCount(this DrinkDataEntry dataEntry) + => CraftingHelper.GetCraftableCount(dataEntry.GetIngredients()); - public static bool TryConsumeIngredients(this DrinkData data, int count = 1) - => CraftingHelper.TryConsumeIngredients(data.GetIngredients(), count); + public static bool TryConsumeIngredients(this DrinkDataEntry dataEntry, int count = 1) + => CraftingHelper.TryConsumeIngredients(dataEntry.GetIngredients(), count); - public static int ConsumeAllCraftableIngredients(this DrinkData data) + public static int ConsumeAllCraftableIngredients(this DrinkDataEntry dataEntry) { - var ingredients = data.GetIngredients(); + var ingredients = dataEntry.GetIngredients(); int count = CraftingHelper.GetCraftableCount(ingredients); return CraftingHelper.ConsumeAll(ingredients, count); } - public static void RefundIngredients(this DrinkData data, int count = 1) - => CraftingHelper.RefundIngredients(data.GetIngredients(), count); + public static void RefundIngredients(this DrinkDataEntry dataEntry, int count = 1) + => CraftingHelper.RefundIngredients(dataEntry.GetIngredients(), count); } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs index ddbf6f0e0..491d6923c 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs @@ -4,33 +4,33 @@ namespace DDD { public static class FoodDataExtensions { - public static List GetIngredients(this FoodData data) => CraftingHelper.ExtractIngredients( - data.IngredientKey1, data.IngredientAmount1, - data.IngredientKey2, data.IngredientAmount2, - data.IngredientKey3, data.IngredientAmount3, - data.IngredientKey4, data.IngredientAmount4 + public static List GetIngredients(this FoodDataEntry dataEntry) => CraftingHelper.ExtractIngredients( + dataEntry.IngredientKey1, dataEntry.IngredientAmount1, + dataEntry.IngredientKey2, dataEntry.IngredientAmount2, + dataEntry.IngredientKey3, dataEntry.IngredientAmount3, + dataEntry.IngredientKey4, dataEntry.IngredientAmount4 ); - public static List GetTasteDatas(this FoodData data) + public static List GetTasteDatas(this FoodDataEntry dataEntry) => CraftingHelper.ResolveTasteDatas( - new[] { data.TasteKey1, data.TasteKey2, data.TasteKey3, data.TasteKey4, data.TasteKey5, data.TasteKey6 }, - DataManager.Instance.GetDataSo() + new[] { dataEntry.TasteKey1, dataEntry.TasteKey2, dataEntry.TasteKey3, dataEntry.TasteKey4, dataEntry.TasteKey5, dataEntry.TasteKey6 }, + DataManager.Instance.GetDataSo() ); - public static int GetCraftableCount(this FoodData data) - => CraftingHelper.GetCraftableCount(data.GetIngredients()); + public static int GetCraftableCount(this FoodDataEntry dataEntry) + => CraftingHelper.GetCraftableCount(dataEntry.GetIngredients()); - public static bool TryConsumeIngredients(this FoodData data, int count = 1) - => CraftingHelper.TryConsumeIngredients(data.GetIngredients(), count); + public static bool TryConsumeIngredients(this FoodDataEntry dataEntry, int count = 1) + => CraftingHelper.TryConsumeIngredients(dataEntry.GetIngredients(), count); - public static int ConsumeAllCraftableIngredients(this FoodData data) + public static int ConsumeAllCraftableIngredients(this FoodDataEntry dataEntry) { - var ingredients = data.GetIngredients(); + var ingredients = dataEntry.GetIngredients(); int count = CraftingHelper.GetCraftableCount(ingredients); return CraftingHelper.ConsumeAll(ingredients, count); } - public static void RefundIngredients(this FoodData data, int count = 1) - => CraftingHelper.RefundIngredients(data.GetIngredients(), count); + public static void RefundIngredients(this FoodDataEntry dataEntry, int count = 1) + => CraftingHelper.RefundIngredients(dataEntry.GetIngredients(), count); } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemDetailView.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemDetailView.cs index 8c4cf708e..4320bfa2a 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemDetailView.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemDetailView.cs @@ -16,7 +16,7 @@ public sealed class ItemDetailSnapshot public Sprite CookwareSprite { get; } public LocalizedString Name { get; } public LocalizedString Description { get; } - public IReadOnlyList Tastes { get; } + public IReadOnlyList Tastes { get; } public Material TasteMaterial { get; } public ItemDetailSnapshot( @@ -26,7 +26,7 @@ public ItemDetailSnapshot( Sprite cookwareSprite, LocalizedString name, LocalizedString description, - IReadOnlyList tastes, + IReadOnlyList tastes, Material tasteMaterial) { BackgroundSprite = backgroundSprite; @@ -46,7 +46,7 @@ public ItemDetailSnapshot( cookwareSprite: null, name: null, description: null, - tastes: System.Array.Empty(), + tastes: System.Array.Empty(), tasteMaterial: null); } diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemModel.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemModel.cs index 4db0f3964..90f2892a7 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemModel.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemModel.cs @@ -27,18 +27,18 @@ public ItemModel(string id, ItemType itemType) public bool HasItem => Count > 0; public string DisplayName => LocalizationManager.Instance.GetName(Id); - public RecipeType RecipeType => ItemType == ItemType.Recipe ? DataManager.Instance.GetDataSo().GetDataById(Id).RecipeType : RecipeType.None; + public RecipeType RecipeType => ItemType == ItemType.Recipe ? DataManager.Instance.GetDataSo().GetDataById(Id).RecipeType : RecipeType.None; public Sprite ItemSprite { get { if (ItemType == ItemType.Recipe) { - DataManager.Instance.GetDataSo().TryGetDataById(Id, out var recipe); + DataManager.Instance.GetDataSo().TryGetDataById(Id, out var recipe); return DataManager.Instance.GetSprite(recipe.RecipeResult); } - if (DataManager.Instance.GetDataSo().ContainsData(Id)) + if (DataManager.Instance.GetDataSo().ContainsData(Id)) { return DataManager.Instance.GetIcon(Id); } @@ -52,7 +52,7 @@ public string GetRecipeResultKey { if (ItemType != ItemType.Recipe) return null; - return DataManager.Instance.GetDataSo().GetDataById(Id).RecipeResult; + return DataManager.Instance.GetDataSo().GetDataById(Id).RecipeResult; } } @@ -65,8 +65,8 @@ public string GetCookwareKey return RecipeType switch { - RecipeType.FoodRecipe => DataManager.Instance.GetDataSo().GetDataById(resultKey).CookwareKey, - RecipeType.DrinkRecipe => DataManager.Instance.GetDataSo().GetDataById(resultKey).CookwareKey, + RecipeType.FoodRecipe => DataManager.Instance.GetDataSo().GetDataById(resultKey).CookwareKey, + RecipeType.DrinkRecipe => DataManager.Instance.GetDataSo().GetDataById(resultKey).CookwareKey, _ => null }; } @@ -81,8 +81,8 @@ public int GetPrice return RecipeType switch { - RecipeType.FoodRecipe => DataManager.Instance.GetDataSo().GetDataById(resultKey).Price, - RecipeType.DrinkRecipe => DataManager.Instance.GetDataSo().GetDataById(resultKey).Price, + RecipeType.FoodRecipe => DataManager.Instance.GetDataSo().GetDataById(resultKey).Price, + RecipeType.DrinkRecipe => DataManager.Instance.GetDataSo().GetDataById(resultKey).Price, _ => -1 }; } @@ -98,11 +98,11 @@ public Sprite GetCookwareIcon string cookwareKey = null; if (RecipeType == RecipeType.FoodRecipe) { - cookwareKey = DataManager.Instance.GetDataSo().GetDataById(resultKey).CookwareKey; + cookwareKey = DataManager.Instance.GetDataSo().GetDataById(resultKey).CookwareKey; } else if (RecipeType == RecipeType.DrinkRecipe) { - cookwareKey = DataManager.Instance.GetDataSo().GetDataById(resultKey).CookwareKey; + cookwareKey = DataManager.Instance.GetDataSo().GetDataById(resultKey).CookwareKey; } return DataManager.Instance.GetIcon(cookwareKey); } @@ -117,25 +117,25 @@ public List GetIngredients switch (RecipeType) { case RecipeType.FoodRecipe: - return DataManager.Instance.GetDataSo().GetDataById(GetRecipeResultKey).GetIngredients(); + return DataManager.Instance.GetDataSo().GetDataById(GetRecipeResultKey).GetIngredients(); case RecipeType.DrinkRecipe: - return DataManager.Instance.GetDataSo().GetDataById(GetRecipeResultKey).GetIngredients(); + return DataManager.Instance.GetDataSo().GetDataById(GetRecipeResultKey).GetIngredients(); } return null; } } - public List GetTasteDatas + public List GetTasteDatas { get { switch (RecipeType) { case RecipeType.FoodRecipe: - return DataManager.Instance.GetDataSo().GetDataById(GetRecipeResultKey).GetTasteDatas(); + return DataManager.Instance.GetDataSo().GetDataById(GetRecipeResultKey).GetTasteDatas(); case RecipeType.DrinkRecipe: - return DataManager.Instance.GetDataSo().GetDataById(GetRecipeResultKey).GetTasteDatas(); + return DataManager.Instance.GetDataSo().GetDataById(GetRecipeResultKey).GetTasteDatas(); } return null; @@ -153,12 +153,12 @@ public void UpdateCount() if (RecipeType == RecipeType.FoodRecipe) { - var foodData = DataManager.Instance.GetDataSo().GetDataById(resultKey); + var foodData = DataManager.Instance.GetDataSo().GetDataById(resultKey); craftableCount = foodData.GetCraftableCount(); } else if (RecipeType == RecipeType.DrinkRecipe) { - var drinkData = DataManager.Instance.GetDataSo().GetDataById(resultKey); + var drinkData = DataManager.Instance.GetDataSo().GetDataById(resultKey); craftableCount = drinkData.GetCraftableCount(); } diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs index 621d8c10a..4b9be19ca 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs @@ -33,16 +33,16 @@ public static List CreateRestaurantManagementInventoryItem() private static int CalculateCraftableCount(string recipeId) { - if (!DataManager.Instance.GetDataSo().TryGetDataById(recipeId, out var recipe)) return 0; + if (!DataManager.Instance.GetDataSo().TryGetDataById(recipeId, out var recipe)) return 0; string recipeResult = recipe.RecipeResult; return recipe.RecipeType switch { - RecipeType.FoodRecipe => DataManager.Instance.GetDataSo().TryGetDataById(recipeResult, out var food) + RecipeType.FoodRecipe => DataManager.Instance.GetDataSo().TryGetDataById(recipeResult, out var food) ? food.GetCraftableCount() : 0, - RecipeType.DrinkRecipe => DataManager.Instance.GetDataSo().TryGetDataById(recipeResult, out var drink) + RecipeType.DrinkRecipe => DataManager.Instance.GetDataSo().TryGetDataById(recipeResult, out var drink) ? drink.GetCraftableCount() : 0, _ => 0 @@ -51,7 +51,7 @@ private static int CalculateCraftableCount(string recipeId) public static ItemModel CreateByItemId(string itemId) { - var itemSo = DataManager.Instance.GetDataSo(); + var itemSo = DataManager.Instance.GetDataSo(); if (!itemSo.TryGetDataById(itemId, out var itemData)) return null; if (InventoryManager.Instance.GetItemDataByIdOrNull(itemId) == null) return null; diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementViewModel.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementViewModel.cs index 4675bc003..3ada7d5d4 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementViewModel.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementViewModel.cs @@ -252,7 +252,7 @@ public void CreateInventoryItemSlot(Transform parent) } else { - if (DataManager.Instance.GetDataSo().TryGetDataById(model.Id, out var cookwareData)) + if (DataManager.Instance.GetDataSo().TryGetDataById(model.Id, out var cookwareData)) { interactor.Initialize(TodayMenuEventType.Add, new TodayCookwareInteractorStrategy()); } @@ -334,18 +334,18 @@ private bool MatchesCategory(ItemModel model, InventoryCategoryType category) case InventoryCategoryType.Food: if (model.ItemType != ItemType.Recipe) return false; - return DataManager.Instance.GetDataSo() + return DataManager.Instance.GetDataSo() .TryGetDataById(model.Id, out var foodRecipe) && foodRecipe.RecipeType == RecipeType.FoodRecipe; case InventoryCategoryType.Drink: if (model.ItemType != ItemType.Recipe) return false; - return DataManager.Instance.GetDataSo() + return DataManager.Instance.GetDataSo() .TryGetDataById(model.Id, out var drinkRecipe) && drinkRecipe.RecipeType == RecipeType.DrinkRecipe; case InventoryCategoryType.Ingredient: return model.ItemType == ItemType.Ingredient; case InventoryCategoryType.Cookware: - return DataManager.Instance.GetDataSo() + return DataManager.Instance.GetDataSo() .TryGetDataById(model.Id, out var cookwareData); case InventoryCategoryType.Special: return false; @@ -431,7 +431,7 @@ private void RecomputeItemDetail() tasteMaterial: tasteMat); } - public IReadOnlyList GetTastes() => SelectedItem?.GetTasteDatas; + public IReadOnlyList GetTastes() => SelectedItem?.GetTasteDatas; public Material GetTasteMaterial() { diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TasteHashTagSlotUi.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TasteHashTagSlotUi.cs index 8d03b22d8..d17b48a71 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TasteHashTagSlotUi.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TasteHashTagSlotUi.cs @@ -22,7 +22,7 @@ private void OnDestroy() } } - public void Initialize(Material material, TasteData tasteData) + public void Initialize(Material material, TasteDataEntry tasteDataEntry) { if (_materialInstance != null) { @@ -31,6 +31,6 @@ public void Initialize(Material material, TasteData tasteData) _materialInstance = new Material(material); _backgroundImage.material = _materialInstance; - _localizeStringEvent.StringReference = LocalizationManager.Instance.GetLocalizedName(tasteData.Id); + _localizeStringEvent.StringReference = LocalizationManager.Instance.GetLocalizedName(tasteDataEntry.Id); } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Utilities/Constants.cs b/Assets/_DDD/_Scripts/Utilities/Constants.cs index 7f438dcd7..8bc7ccd7a 100644 --- a/Assets/_DDD/_Scripts/Utilities/Constants.cs +++ b/Assets/_DDD/_Scripts/Utilities/Constants.cs @@ -14,16 +14,16 @@ public static class DataConstants { public const string GameStateSo = "GameStateSo"; public const string InventoryTestDataSo = "InventoryTestDataSo"; - public const string ItemDataSo = "ItemDataSo"; - public const string RecipeDataSo = "RecipeDataSo"; - public const string FoodDataSo = "FoodDataSo"; - public const string DrinkDataSo = "DrinkDataSo"; - public const string IngredientDataSo = "IngredientDataSo"; - public const string CookwareDataSo = "CookwareDataSo"; - public const string TasteDataSo = "TasteDataSo"; - public const string EnvironmentDataSo = "EnvironmentDataSo"; - public const string LevelDataSo = "LevelDataSo"; - public const string CustomerPoolDataSo = "CustomerPoolDataSo"; + public const string ItemDataSo = "ItemDataAsset"; + public const string RecipeDataSo = "RecipeDataAsset"; + public const string FoodDataSo = "FoodDataAsset"; + public const string DrinkDataSo = "DrinkDataAsset"; + public const string IngredientDataSo = "IngredientDataAsset"; + public const string CookwareDataSo = "CookwareDataAsset"; + public const string TasteDataSo = "TasteDataAsset"; + public const string EnvironmentDataSo = "EnvironmentDataAsset"; + public const string LevelDataSo = "LevelDataAsset"; + public const string CustomerPoolDataSo = "CustomerPoolDataAsset"; public const string UiInputBindingSo = "UiInputBindingSo"; public const string RestaurantDataSo = "RestaurantDataSo";