From 9992341492d65b6126c48a1560abba80348b2bd0 Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Tue, 22 Jul 2025 19:07:14 +0900 Subject: [PATCH] =?UTF-8?q?GoogleSheetManager=20-=20NativeEnum=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_DDD/_Scripts/GameEvent/IInteractable.cs | 3 +- .../2025-07-16 13-28-42 by 남태건.json | 157 ------------------ .../2025-07-16 17-22-35 by 남태건.json.meta | 7 - ....json => 2025-07-22 19-03-24 by 하정현.json} | 62 ++++++- ...a => 2025-07-22 19-03-24 by 하정현.json.meta} | 2 +- .../AutoCreated/Classes/EnvironmentData.cs | 4 + .../AutoCreated/GoogleSheetJson.json | 62 ++++++- .../Logs/GoogleSheetChangeLog.asset | 123 +++++--------- .../AutoCreated/So/EnvironmentDataSo.asset | 5 + .../AutoCreated/So/ItemDataSo.asset | 28 +++- .../Core/GoogleSheetManager.cs | 14 ++ 11 files changed, 211 insertions(+), 256 deletions(-) delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-16 13-28-42 by 남태건.json delete mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-16 17-22-35 by 남태건.json.meta rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/{2025-07-16 17-22-35 by 남태건.json => 2025-07-22 19-03-24 by 하정현.json} (78%) rename Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/{2025-07-16 13-28-42 by 남태건.json.meta => 2025-07-22 19-03-24 by 하정현.json.meta} (75%) diff --git a/Assets/_DDD/_Scripts/GameEvent/IInteractable.cs b/Assets/_DDD/_Scripts/GameEvent/IInteractable.cs index 996cc1b1c..acbaaf882 100644 --- a/Assets/_DDD/_Scripts/GameEvent/IInteractable.cs +++ b/Assets/_DDD/_Scripts/GameEvent/IInteractable.cs @@ -5,7 +5,8 @@ namespace DDD { public enum InteractionType { - Default + None, + RestaurantManagement, } public interface IInteractable { diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-16 13-28-42 by 남태건.json b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-16 13-28-42 by 남태건.json deleted file mode 100644 index c08a9eeaa..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-16 13-28-42 by 남태건.json +++ /dev/null @@ -1,157 +0,0 @@ -{ - "$개요": [ - { - "": "시트 생성" - } - ], - "ItemData": [ - { - "Id": "식별번호", - "ItemType:Enum": "아이템타입" - }, - { - "Id": "Item_Food_001", - "ItemType:Enum": "Food" - }, - { - "Id": "Item_Environment_001", - "ItemType:Enum": "Environment" - }, - { - "Id": "Item_Environment_002", - "ItemType:Enum": "Environment" - }, - { - "Id": "Item_Environment_003", - "ItemType:Enum": "Environment" - }, - { - "Id": "Item_Environment_004", - "ItemType:Enum": "Environment" - }, - { - "Id": "Item_Environment_005", - "ItemType:Enum": "Environment" - } - ], - "FoodData": [ - { - "Id:string": "식별ID", - "Name:string": "이름", - "Cookware:Enum": "요리도구", - "Ingredient1:string": "재료1", - "Ingredient2:string": "재료2", - "Taste1:Taste_Enum": "맛1", - "Taste2:Taste_Enum": "맛2", - "SpriteKey:string": "SpriteAtlas 키 값" - }, - { - "Id:string": "Item_Food_001", - "Name:string": "햇빛수프", - "Cookware:Enum": "Pot", - "Ingredient1:string": "극락쌀", - "Ingredient2:string": "햇빛당근", - "Taste1:Taste_Enum": "Bitter", - "Taste2:Taste_Enum": "Sweet", - "SpriteKey:string": "Gold" - }, - { - "Id:string": "Item_Food_002", - "Name:string": "B", - "Cookware:Enum": "FryingPan", - "Ingredient1:string": 1, - "Ingredient2:string": 1, - "Taste1:Taste_Enum": "Spicy", - "Taste2:Taste_Enum": "Bitter", - "SpriteKey:string": "" - }, - { - "Id:string": "Item_Food_003", - "Name:string": "C", - "Cookware:Enum": "Pot", - "Ingredient1:string": 2, - "Ingredient2:string": 2, - "Taste1:Taste_Enum": "Fresh", - "Taste2:Taste_Enum": "None", - "SpriteKey:string": "" - }, - { - "Id:string": "Item_Food_004", - "Name:string": "D", - "Cookware:Enum": "Plating", - "Ingredient1:string": 3, - "Ingredient2:string": 3, - "Taste1:Taste_Enum": " ", - "Taste2:Taste_Enum": "Salty", - "SpriteKey:string": "" - } - ], - "EnvironmentData": [ - { - "Id": "식별번호", - "EnvironmentType:Enum": "오브젝트 타입", - "RendererType:Enum": "렌더러 타입", - "IsTrigger:int": "트리거 여부", - "SkeletonDataName:string": "스켈레톤 애니메이션 에셋 이름", - "SkinName:string": "스파인 스킨 이름", - "DefaultAnimationName:string": "", - "SpriteKey:string": "SpriteAtlas 키 값", - "Size:float": "유니티 내의 이미지 크기" - }, - { - "Id": "Item_Environment_001", - "EnvironmentType:Enum": "Prop", - "RendererType:Enum": "Sprite", - "IsTrigger:int": 1, - "SkeletonDataName:string": "", - "SkinName:string": "", - "DefaultAnimationName:string": "", - "SpriteKey:string": "Barrel01", - "Size:float": 1 - }, - { - "Id": "Item_Environment_002", - "EnvironmentType:Enum": "Prop", - "RendererType:Enum": "Spine", - "IsTrigger:int": 1, - "SkeletonDataName:string": "Coral_SkeletonData", - "SkinName:string": "Coral01", - "DefaultAnimationName:string": "Coral01/Idle", - "SpriteKey:string": "", - "Size:float": 1 - }, - { - "Id": "Item_Environment_003", - "EnvironmentType:Enum": "Prop", - "RendererType:Enum": "Spine", - "IsTrigger:int": 1, - "SkeletonDataName:string": "Coral_SkeletonData", - "SkinName:string": "Coral02", - "DefaultAnimationName:string": "Coral02/Idle", - "SpriteKey:string": "", - "Size:float": 1 - }, - { - "Id": "Item_Environment_004", - "EnvironmentType:Enum": "Prop", - "RendererType:Enum": "Spine", - "IsTrigger:int": 1, - "SkeletonDataName:string": "SummerGrass01_SkeletonData", - "SkinName:string": "default", - "DefaultAnimationName:string": "Normal", - "SpriteKey:string": "", - "Size:float": 0.2 - }, - { - "Id": "Item_Environment_005", - "EnvironmentType:Enum": "Interactable", - "RendererType:Enum": "Spine", - "IsTrigger:int": 0, - "SkeletonDataName:string": "", - "SkinName:string": "", - "DefaultAnimationName:string": "", - "SpriteKey:string": "", - "Size:float": 1 - } - ] -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-16 17-22-35 by 남태건.json.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-16 17-22-35 by 남태건.json.meta deleted file mode 100644 index 1f60a8068..000000000 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-16 17-22-35 by 남태건.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: faf32fed979c86f44afa82f9114d8700 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-16 17-22-35 by 남태건.json b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-22 19-03-24 by 하정현.json similarity index 78% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-16 17-22-35 by 남태건.json rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-22 19-03-24 by 하정현.json index 79d7e8fd2..c6539c575 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-16 17-22-35 by 남태건.json +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-22 19-03-24 by 하정현.json @@ -10,8 +10,60 @@ "ItemType:Enum": "아이템타입" }, { - "Id": "Item_Food_001", - "ItemType:Enum": "Food" + "Id": "item_food_001", + "ItemType:Enum": "food" + }, + { + "Id": "item_food_002", + "ItemType:Enum": "food" + }, + { + "Id": "item_food_003", + "ItemType:Enum": "food" + }, + { + "Id": "item_food_004", + "ItemType:Enum": "food" + }, + { + "Id": "item_food_005", + "ItemType:Enum": "food" + }, + { + "Id": "", + "ItemType:Enum": "" + }, + { + "Id": "", + "ItemType:Enum": "" + }, + { + "Id": "", + "ItemType:Enum": "" + }, + { + "Id": "", + "ItemType:Enum": "" + }, + { + "Id": "", + "ItemType:Enum": "" + }, + { + "Id": "", + "ItemType:Enum": "" + }, + { + "Id": "", + "ItemType:Enum": "" + }, + { + "Id": "", + "ItemType:Enum": "" + }, + { + "Id": "", + "ItemType:Enum": "" }, { "Id": "Item_Environment_001", @@ -90,6 +142,7 @@ { "Id": "식별번호", "EnvironmentType:Enum": "오브젝트 타입", + "InteractionType:NativeEnum": "인터랙션타입", "RendererType:Enum": "렌더러 타입", "IsTrigger:int": "트리거 여부", "SkeletonDataName:string": "스켈레톤 애니메이션 에셋 이름", @@ -101,6 +154,7 @@ { "Id": "Item_Environment_001", "EnvironmentType:Enum": "Prop", + "InteractionType:NativeEnum": "None", "RendererType:Enum": "Sprite", "IsTrigger:int": 0, "SkeletonDataName:string": "", @@ -112,6 +166,7 @@ { "Id": "Item_Environment_002", "EnvironmentType:Enum": "Prop", + "InteractionType:NativeEnum": "None", "RendererType:Enum": "Spine", "IsTrigger:int": 1, "SkeletonDataName:string": "Coral_SkeletonData", @@ -123,6 +178,7 @@ { "Id": "Item_Environment_003", "EnvironmentType:Enum": "Prop", + "InteractionType:NativeEnum": "None", "RendererType:Enum": "Spine", "IsTrigger:int": 1, "SkeletonDataName:string": "Coral_SkeletonData", @@ -134,6 +190,7 @@ { "Id": "Item_Environment_004", "EnvironmentType:Enum": "Prop", + "InteractionType:NativeEnum": "None", "RendererType:Enum": "Spine", "IsTrigger:int": 1, "SkeletonDataName:string": "SummerGrass01_SkeletonData", @@ -145,6 +202,7 @@ { "Id": "Item_Environment_005", "EnvironmentType:Enum": "Interactable", + "InteractionType:NativeEnum": "RestaurantManagement", "RendererType:Enum": "Spine", "IsTrigger:int": 0, "SkeletonDataName:string": "", diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-16 13-28-42 by 남태건.json.meta b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-22 19-03-24 by 하정현.json.meta similarity index 75% rename from Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-16 13-28-42 by 남태건.json.meta rename to Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-22 19-03-24 by 하정현.json.meta index 87618254f..a841c8f50 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-16 13-28-42 by 남태건.json.meta +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-22 19-03-24 by 하정현.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 42c6cc66b5bf7734da0f1ab7002a6450 +guid: e93a26e94066c4d3c9dca5a80cdb1652 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentData.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentData.cs index 19d1b197d..991e85726 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentData.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Classes/EnvironmentData.cs @@ -16,6 +16,10 @@ public class EnvironmentData : IId [Tooltip("오브젝트 타입")] public EnvironmentType EnvironmentType; + /// 인터랙션타입 + [Tooltip("인터랙션타입")] + public InteractionType InteractionType; + /// 렌더러 타입 [Tooltip("렌더러 타입")] public RendererType RendererType; diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/GoogleSheetJson.json b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/GoogleSheetJson.json index 79d7e8fd2..c6539c575 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/GoogleSheetJson.json +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/GoogleSheetJson.json @@ -10,8 +10,60 @@ "ItemType:Enum": "아이템타입" }, { - "Id": "Item_Food_001", - "ItemType:Enum": "Food" + "Id": "item_food_001", + "ItemType:Enum": "food" + }, + { + "Id": "item_food_002", + "ItemType:Enum": "food" + }, + { + "Id": "item_food_003", + "ItemType:Enum": "food" + }, + { + "Id": "item_food_004", + "ItemType:Enum": "food" + }, + { + "Id": "item_food_005", + "ItemType:Enum": "food" + }, + { + "Id": "", + "ItemType:Enum": "" + }, + { + "Id": "", + "ItemType:Enum": "" + }, + { + "Id": "", + "ItemType:Enum": "" + }, + { + "Id": "", + "ItemType:Enum": "" + }, + { + "Id": "", + "ItemType:Enum": "" + }, + { + "Id": "", + "ItemType:Enum": "" + }, + { + "Id": "", + "ItemType:Enum": "" + }, + { + "Id": "", + "ItemType:Enum": "" + }, + { + "Id": "", + "ItemType:Enum": "" }, { "Id": "Item_Environment_001", @@ -90,6 +142,7 @@ { "Id": "식별번호", "EnvironmentType:Enum": "오브젝트 타입", + "InteractionType:NativeEnum": "인터랙션타입", "RendererType:Enum": "렌더러 타입", "IsTrigger:int": "트리거 여부", "SkeletonDataName:string": "스켈레톤 애니메이션 에셋 이름", @@ -101,6 +154,7 @@ { "Id": "Item_Environment_001", "EnvironmentType:Enum": "Prop", + "InteractionType:NativeEnum": "None", "RendererType:Enum": "Sprite", "IsTrigger:int": 0, "SkeletonDataName:string": "", @@ -112,6 +166,7 @@ { "Id": "Item_Environment_002", "EnvironmentType:Enum": "Prop", + "InteractionType:NativeEnum": "None", "RendererType:Enum": "Spine", "IsTrigger:int": 1, "SkeletonDataName:string": "Coral_SkeletonData", @@ -123,6 +178,7 @@ { "Id": "Item_Environment_003", "EnvironmentType:Enum": "Prop", + "InteractionType:NativeEnum": "None", "RendererType:Enum": "Spine", "IsTrigger:int": 1, "SkeletonDataName:string": "Coral_SkeletonData", @@ -134,6 +190,7 @@ { "Id": "Item_Environment_004", "EnvironmentType:Enum": "Prop", + "InteractionType:NativeEnum": "None", "RendererType:Enum": "Spine", "IsTrigger:int": 1, "SkeletonDataName:string": "SummerGrass01_SkeletonData", @@ -145,6 +202,7 @@ { "Id": "Item_Environment_005", "EnvironmentType:Enum": "Interactable", + "InteractionType:NativeEnum": "RestaurantManagement", "RendererType:Enum": "Spine", "IsTrigger:int": 0, "SkeletonDataName:string": "", diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Logs/GoogleSheetChangeLog.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Logs/GoogleSheetChangeLog.asset index d1b1a2c0d..b3bde0f69 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Logs/GoogleSheetChangeLog.asset +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Logs/GoogleSheetChangeLog.asset @@ -13,13 +13,25 @@ MonoBehaviour: m_Name: GoogleSheetChangeLog m_EditorClassIdentifier: _logs: - - Editor: "\uB0A8\uD0DC\uAC74" - Timestamp: 2025-07-16 13:28:42 + - Editor: "\uD558\uC815\uD604" + Timestamp: 2025-07-22 19:03:24 JsonSnapshot: "{\n \"$\uAC1C\uC694\": [\n {\n \"\": \"\uC2DC\uD2B8 \uC0DD\uC131\"\n }\n ],\n \"ItemData\": [\n {\n \"Id\": \"\uC2DD\uBCC4\uBC88\uD638\",\n \"ItemType:Enum\": \"\uC544\uC774\uD15C\uD0C0\uC785\"\n },\n {\n - \"Id\": \"Item_Food_001\",\n \"ItemType:Enum\": \"Food\"\n },\n - {\n \"Id\": \"Item_Environment_001\",\n \"ItemType:Enum\": \"Environment\"\n + \"Id\": \"item_food_001\",\n \"ItemType:Enum\": \"food\"\n },\n + {\n \"Id\": \"item_food_002\",\n \"ItemType:Enum\": \"food\"\n + },\n {\n \"Id\": \"item_food_003\",\n \"ItemType:Enum\": \"food\"\n + },\n {\n \"Id\": \"item_food_004\",\n \"ItemType:Enum\": \"food\"\n + },\n {\n \"Id\": \"item_food_005\",\n \"ItemType:Enum\": \"food\"\n + },\n {\n \"Id\": \"\",\n \"ItemType:Enum\": \"\"\n },\n + {\n \"Id\": \"\",\n \"ItemType:Enum\": \"\"\n },\n {\n + \"Id\": \"\",\n \"ItemType:Enum\": \"\"\n },\n {\n \"Id\": + \"\",\n \"ItemType:Enum\": \"\"\n },\n {\n \"Id\": \"\",\n + \"ItemType:Enum\": \"\"\n },\n {\n \"Id\": \"\",\n \"ItemType:Enum\": + \"\"\n },\n {\n \"Id\": \"\",\n \"ItemType:Enum\": \"\"\n + },\n {\n \"Id\": \"\",\n \"ItemType:Enum\": \"\"\n },\n + {\n \"Id\": \"\",\n \"ItemType:Enum\": \"\"\n },\n {\n + \"Id\": \"Item_Environment_001\",\n \"ItemType:Enum\": \"Environment\"\n },\n {\n \"Id\": \"Item_Environment_002\",\n \"ItemType:Enum\": \"Environment\"\n },\n {\n \"Id\": \"Item_Environment_003\",\n \"ItemType:Enum\": \"Environment\"\n },\n {\n \"Id\": \"Item_Environment_004\",\n @@ -47,6 +59,7 @@ MonoBehaviour: \"Taste2:Taste_Enum\": \"Salty\",\n \"SpriteKey:string\": \"\"\n }\n ],\n \"EnvironmentData\": [\n {\n \"Id\": \"\uC2DD\uBCC4\uBC88\uD638\",\n \"EnvironmentType:Enum\": \"\uC624\uBE0C\uC81D\uD2B8 \uD0C0\uC785\",\n + \"InteractionType:NativeEnum\": \"\uC778\uD130\uB799\uC158\uD0C0\uC785\",\n \"RendererType:Enum\": \"\uB80C\uB354\uB7EC \uD0C0\uC785\",\n \"IsTrigger:int\": \"\uD2B8\uB9AC\uAC70 \uC5EC\uBD80\",\n \"SkeletonDataName:string\": \"\uC2A4\uCF08\uB808\uD1A4 \uC560\uB2C8\uBA54\uC774\uC158 \uC5D0\uC14B \uC774\uB984\",\n \"SkinName:string\": @@ -54,89 +67,29 @@ MonoBehaviour: \"\",\n \"SpriteKey:string\": \"SpriteAtlas \uD0A4 \uAC12\",\n \"Size:float\": \"\uC720\uB2C8\uD2F0 \uB0B4\uC758 \uC774\uBBF8\uC9C0 \uD06C\uAE30\"\n },\n {\n \"Id\": \"Item_Environment_001\",\n \"EnvironmentType:Enum\": - \"Prop\",\n \"RendererType:Enum\": \"Sprite\",\n \"IsTrigger:int\": - 1,\n \"SkeletonDataName:string\": \"\",\n \"SkinName:string\": \"\",\n - \"DefaultAnimationName:string\": \"\",\n \"SpriteKey:string\": \"Barrel01\",\n - \"Size:float\": 1\n },\n {\n \"Id\": \"Item_Environment_002\",\n - \"EnvironmentType:Enum\": \"Prop\",\n \"RendererType:Enum\": \"Spine\",\n - \"IsTrigger:int\": 1,\n \"SkeletonDataName:string\": \"Coral_SkeletonData\",\n - \"SkinName:string\": \"Coral01\",\n \"DefaultAnimationName:string\": \"Coral01/Idle\",\n - \"SpriteKey:string\": \"\",\n \"Size:float\": 1\n },\n {\n - \"Id\": \"Item_Environment_003\",\n \"EnvironmentType:Enum\": \"Prop\",\n - \"RendererType:Enum\": \"Spine\",\n \"IsTrigger:int\": 1,\n \"SkeletonDataName:string\": + \"Prop\",\n \"InteractionType:NativeEnum\": \"None\",\n \"RendererType:Enum\": + \"Sprite\",\n \"IsTrigger:int\": 0,\n \"SkeletonDataName:string\": + \"\",\n \"SkinName:string\": \"\",\n \"DefaultAnimationName:string\": + \"\",\n \"SpriteKey:string\": \"Barrel01\",\n \"Size:float\": 1\n + },\n {\n \"Id\": \"Item_Environment_002\",\n \"EnvironmentType:Enum\": + \"Prop\",\n \"InteractionType:NativeEnum\": \"None\",\n \"RendererType:Enum\": + \"Spine\",\n \"IsTrigger:int\": 1,\n \"SkeletonDataName:string\": + \"Coral_SkeletonData\",\n \"SkinName:string\": \"Coral01\",\n \"DefaultAnimationName:string\": + \"Coral01/Idle\",\n \"SpriteKey:string\": \"\",\n \"Size:float\": + 1\n },\n {\n \"Id\": \"Item_Environment_003\",\n \"EnvironmentType:Enum\": + \"Prop\",\n \"InteractionType:NativeEnum\": \"None\",\n \"RendererType:Enum\": + \"Spine\",\n \"IsTrigger:int\": 1,\n \"SkeletonDataName:string\": \"Coral_SkeletonData\",\n \"SkinName:string\": \"Coral02\",\n \"DefaultAnimationName:string\": \"Coral02/Idle\",\n \"SpriteKey:string\": \"\",\n \"Size:float\": 1\n },\n {\n \"Id\": \"Item_Environment_004\",\n \"EnvironmentType:Enum\": - \"Prop\",\n \"RendererType:Enum\": \"Spine\",\n \"IsTrigger:int\": - 1,\n \"SkeletonDataName:string\": \"SummerGrass01_SkeletonData\",\n - \"SkinName:string\": \"default\",\n \"DefaultAnimationName:string\": \"Normal\",\n - \"SpriteKey:string\": \"\",\n \"Size:float\": 0.2\n },\n {\n - \"Id\": \"Item_Environment_005\",\n \"EnvironmentType:Enum\": \"Interactable\",\n - \"RendererType:Enum\": \"Spine\",\n \"IsTrigger:int\": 0,\n \"SkeletonDataName:string\": - \"\",\n \"SkinName:string\": \"\",\n \"DefaultAnimationName:string\": - \"\",\n \"SpriteKey:string\": \"\",\n \"Size:float\": 1\n }\n - ]\n}" - - Editor: "\uB0A8\uD0DC\uAC74" - Timestamp: 2025-07-16 17:22:35 - JsonSnapshot: "{\n \"$\uAC1C\uC694\": [\n {\n \"\": \"\uC2DC\uD2B8 \uC0DD\uC131\"\n - }\n ],\n \"ItemData\": [\n {\n \"Id\": \"\uC2DD\uBCC4\uBC88\uD638\",\n - \"ItemType:Enum\": \"\uC544\uC774\uD15C\uD0C0\uC785\"\n },\n {\n - \"Id\": \"Item_Food_001\",\n \"ItemType:Enum\": \"Food\"\n },\n - {\n \"Id\": \"Item_Environment_001\",\n \"ItemType:Enum\": \"Environment\"\n - },\n {\n \"Id\": \"Item_Environment_002\",\n \"ItemType:Enum\": - \"Environment\"\n },\n {\n \"Id\": \"Item_Environment_003\",\n - \"ItemType:Enum\": \"Environment\"\n },\n {\n \"Id\": \"Item_Environment_004\",\n - \"ItemType:Enum\": \"Environment\"\n },\n {\n \"Id\": \"Item_Environment_005\",\n - \"ItemType:Enum\": \"Environment\"\n }\n ],\n \"FoodData\": [\n {\n - \"Id:string\": \"\uC2DD\uBCC4ID\",\n \"Name:string\": \"\uC774\uB984\",\n - \"Cookware:Enum\": \"\uC694\uB9AC\uB3C4\uAD6C\",\n \"Ingredient1:string\": - \"\uC7AC\uB8CC1\",\n \"Ingredient2:string\": \"\uC7AC\uB8CC2\",\n - \"Taste1:Taste_Enum\": \"\uB9DB1\",\n \"Taste2:Taste_Enum\": \"\uB9DB2\",\n - \"SpriteKey:string\": \"SpriteAtlas \uD0A4 \uAC12\"\n },\n {\n \"Id:string\": - \"Item_Food_001\",\n \"Name:string\": \"\uD587\uBE5B\uC218\uD504\",\n - \"Cookware:Enum\": \"Pot\",\n \"Ingredient1:string\": \"\uADF9\uB77D\uC300\",\n - \"Ingredient2:string\": \"\uD587\uBE5B\uB2F9\uADFC\",\n \"Taste1:Taste_Enum\": - \"Bitter\",\n \"Taste2:Taste_Enum\": \"Sweet\",\n \"SpriteKey:string\": - \"Gold\"\n },\n {\n \"Id:string\": \"Item_Food_002\",\n \"Name:string\": - \"B\",\n \"Cookware:Enum\": \"FryingPan\",\n \"Ingredient1:string\": - 1,\n \"Ingredient2:string\": 1,\n \"Taste1:Taste_Enum\": \"Spicy\",\n - \"Taste2:Taste_Enum\": \"Bitter\",\n \"SpriteKey:string\": \"\"\n },\n - {\n \"Id:string\": \"Item_Food_003\",\n \"Name:string\": \"C\",\n - \"Cookware:Enum\": \"Pot\",\n \"Ingredient1:string\": 2,\n \"Ingredient2:string\": - 2,\n \"Taste1:Taste_Enum\": \"Fresh\",\n \"Taste2:Taste_Enum\": \"None\",\n - \"SpriteKey:string\": \"\"\n },\n {\n \"Id:string\": \"Item_Food_004\",\n - \"Name:string\": \"D\",\n \"Cookware:Enum\": \"Plating\",\n \"Ingredient1:string\": - 3,\n \"Ingredient2:string\": 3,\n \"Taste1:Taste_Enum\": \" \",\n - \"Taste2:Taste_Enum\": \"Salty\",\n \"SpriteKey:string\": \"\"\n }\n - ],\n \"EnvironmentData\": [\n {\n \"Id\": \"\uC2DD\uBCC4\uBC88\uD638\",\n - \"EnvironmentType:Enum\": \"\uC624\uBE0C\uC81D\uD2B8 \uD0C0\uC785\",\n - \"RendererType:Enum\": \"\uB80C\uB354\uB7EC \uD0C0\uC785\",\n \"IsTrigger:int\": - \"\uD2B8\uB9AC\uAC70 \uC5EC\uBD80\",\n \"SkeletonDataName:string\": \"\uC2A4\uCF08\uB808\uD1A4 - \uC560\uB2C8\uBA54\uC774\uC158 \uC5D0\uC14B \uC774\uB984\",\n \"SkinName:string\": - \"\uC2A4\uD30C\uC778 \uC2A4\uD0A8 \uC774\uB984\",\n \"DefaultAnimationName:string\": - \"\",\n \"SpriteKey:string\": \"SpriteAtlas \uD0A4 \uAC12\",\n \"Size:float\": - \"\uC720\uB2C8\uD2F0 \uB0B4\uC758 \uC774\uBBF8\uC9C0 \uD06C\uAE30\"\n },\n - {\n \"Id\": \"Item_Environment_001\",\n \"EnvironmentType:Enum\": - \"Prop\",\n \"RendererType:Enum\": \"Sprite\",\n \"IsTrigger:int\": + \"Prop\",\n \"InteractionType:NativeEnum\": \"None\",\n \"RendererType:Enum\": + \"Spine\",\n \"IsTrigger:int\": 1,\n \"SkeletonDataName:string\": + \"SummerGrass01_SkeletonData\",\n \"SkinName:string\": \"default\",\n + \"DefaultAnimationName:string\": \"Normal\",\n \"SpriteKey:string\": \"\",\n + \"Size:float\": 0.3\n },\n {\n \"Id\": \"Item_Environment_005\",\n + \"EnvironmentType:Enum\": \"Interactable\",\n \"InteractionType:NativeEnum\": + \"RestaurantManagement\",\n \"RendererType:Enum\": \"Spine\",\n \"IsTrigger:int\": 0,\n \"SkeletonDataName:string\": \"\",\n \"SkinName:string\": \"\",\n - \"DefaultAnimationName:string\": \"\",\n \"SpriteKey:string\": \"Barrel01\",\n - \"Size:float\": 1\n },\n {\n \"Id\": \"Item_Environment_002\",\n - \"EnvironmentType:Enum\": \"Prop\",\n \"RendererType:Enum\": \"Spine\",\n - \"IsTrigger:int\": 1,\n \"SkeletonDataName:string\": \"Coral_SkeletonData\",\n - \"SkinName:string\": \"Coral01\",\n \"DefaultAnimationName:string\": \"Coral01/Idle\",\n - \"SpriteKey:string\": \"\",\n \"Size:float\": 1\n },\n {\n - \"Id\": \"Item_Environment_003\",\n \"EnvironmentType:Enum\": \"Prop\",\n - \"RendererType:Enum\": \"Spine\",\n \"IsTrigger:int\": 1,\n \"SkeletonDataName:string\": - \"Coral_SkeletonData\",\n \"SkinName:string\": \"Coral02\",\n \"DefaultAnimationName:string\": - \"Coral02/Idle\",\n \"SpriteKey:string\": \"\",\n \"Size:float\": - 1\n },\n {\n \"Id\": \"Item_Environment_004\",\n \"EnvironmentType:Enum\": - \"Prop\",\n \"RendererType:Enum\": \"Spine\",\n \"IsTrigger:int\": - 1,\n \"SkeletonDataName:string\": \"SummerGrass01_SkeletonData\",\n - \"SkinName:string\": \"default\",\n \"DefaultAnimationName:string\": \"Normal\",\n - \"SpriteKey:string\": \"\",\n \"Size:float\": 0.3\n },\n {\n - \"Id\": \"Item_Environment_005\",\n \"EnvironmentType:Enum\": \"Interactable\",\n - \"RendererType:Enum\": \"Spine\",\n \"IsTrigger:int\": 0,\n \"SkeletonDataName:string\": - \"\",\n \"SkinName:string\": \"\",\n \"DefaultAnimationName:string\": - \"\",\n \"SpriteKey:string\": \"\",\n \"Size:float\": 1\n }\n - ]\n}" + \"DefaultAnimationName:string\": \"\",\n \"SpriteKey:string\": \"\",\n + \"Size:float\": 1\n }\n ]\n}" MaxLogs: 100 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/EnvironmentDataSo.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/EnvironmentDataSo.asset index 8a78ec073..a1b30a2e7 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/EnvironmentDataSo.asset +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/EnvironmentDataSo.asset @@ -15,6 +15,7 @@ MonoBehaviour: Datas: - k__BackingField: Item_Environment_001 EnvironmentType: 1 + InteractionType: 0 RendererType: 1 IsTrigger: 0 SkeletonDataName: @@ -24,6 +25,7 @@ MonoBehaviour: Size: 1 - k__BackingField: Item_Environment_002 EnvironmentType: 1 + InteractionType: 0 RendererType: 2 IsTrigger: 1 SkeletonDataName: Coral_SkeletonData @@ -33,6 +35,7 @@ MonoBehaviour: Size: 1 - k__BackingField: Item_Environment_003 EnvironmentType: 1 + InteractionType: 0 RendererType: 2 IsTrigger: 1 SkeletonDataName: Coral_SkeletonData @@ -42,6 +45,7 @@ MonoBehaviour: Size: 1 - k__BackingField: Item_Environment_004 EnvironmentType: 1 + InteractionType: 0 RendererType: 2 IsTrigger: 1 SkeletonDataName: SummerGrass01_SkeletonData @@ -51,6 +55,7 @@ MonoBehaviour: Size: 0.3 - k__BackingField: Item_Environment_005 EnvironmentType: 2 + InteractionType: 1 RendererType: 2 IsTrigger: 0 SkeletonDataName: diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/ItemDataSo.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/ItemDataSo.asset index 59a9fb112..990d13ecd 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/ItemDataSo.asset +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/ItemDataSo.asset @@ -13,8 +13,34 @@ MonoBehaviour: m_Name: ItemDataSo m_EditorClassIdentifier: Datas: - - k__BackingField: Item_Food_001 + - k__BackingField: item_food_001 ItemType: 1 + - k__BackingField: item_food_002 + ItemType: 1 + - k__BackingField: item_food_003 + ItemType: 1 + - k__BackingField: item_food_004 + ItemType: 1 + - k__BackingField: item_food_005 + ItemType: 1 + - k__BackingField: + ItemType: 0 + - k__BackingField: + ItemType: 0 + - k__BackingField: + ItemType: 0 + - k__BackingField: + ItemType: 0 + - k__BackingField: + ItemType: 0 + - k__BackingField: + ItemType: 0 + - k__BackingField: + ItemType: 0 + - k__BackingField: + ItemType: 0 + - k__BackingField: + ItemType: 0 - k__BackingField: Item_Environment_001 ItemType: 2 - k__BackingField: Item_Environment_002 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetManager.cs b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetManager.cs index 4dcb0dd34..e82c86284 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetManager.cs +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/Core/GoogleSheetManager.cs @@ -377,6 +377,10 @@ private void GenerateClassFilesPerSheet(string jsonInput) { enumType = rawName.Split(':')[1].Replace("_Enum", ""); } + else if (rawName.Contains(":NativeEnum")) + { + continue; + } if (!string.IsNullOrEmpty(enumType)) { @@ -501,6 +505,11 @@ private string GenerateDataClassCode(string className, JArray items) fieldName = parts[0]; explicitType = parts[1].Replace("_Enum", ""); } + else if (rawName.Contains(":NativeEnum")) + { + fieldName = rawName.Split(':')[0]; + explicitType = fieldName; + } else if (rawName.Contains(":")) { var parts = rawName.Split(':'); @@ -674,6 +683,11 @@ private async Task InternalCreateGoogleSheetSoAsync() fieldName = parts[0]; explicitType = parts[1].Replace("_Enum", ""); } + else if (rawName.Contains(":NativeEnum")) + { + fieldName = rawName.Split(':')[0]; + explicitType = fieldName; + } else if (rawName.Contains(":")) { var parts = rawName.Split(':');