From 4e8fd18a2a915dc21c260ba080422345e1a88f51 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Wed, 16 Jul 2025 17:23:45 +0900 Subject: [PATCH] =?UTF-8?q?=ED=94=8C=EB=A0=88=EC=9D=B4=EC=96=B4=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EB=B3=80=EA=B2=BD=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=A5=B8=20=EC=97=90=EC=85=8B=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/BaseRestaurantEnvironment.prefab | 14 +- .../Prefabs/RestaurantPlayer.prefab | 4 + .../_Addressables/Scenes/Restaurant.unity | 8 +- .../So/RestaurantPlayerDataSo.asset | 11 +- .../Prefabs/BaseRestaurantCharacter.prefab | 22 +-- .../2025-07-16 17-22-35 by 남태건.json | 157 ++++++++++++++++++ .../2025-07-16 17-22-35 by 남태건.json.meta | 7 + .../AutoCreated/GoogleSheetJson.json | 4 +- .../Logs/GoogleSheetChangeLog.asset | 63 +++++++ .../AutoCreated/So/EnvironmentDataSo.asset | 4 +- ProjectSettings/TagManager.asset | 28 +--- 11 files changed, 262 insertions(+), 60 deletions(-) create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-16 17-22-35 by 남태건.json create mode 100644 Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-16 17-22-35 by 남태건.json.meta diff --git a/Assets/_DDD/_Addressables/Prefabs/BaseRestaurantEnvironment.prefab b/Assets/_DDD/_Addressables/Prefabs/BaseRestaurantEnvironment.prefab index 0a94551f6..a42e7b73c 100644 --- a/Assets/_DDD/_Addressables/Prefabs/BaseRestaurantEnvironment.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/BaseRestaurantEnvironment.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3613361427611658652} - - component: {fileID: 2122400432313491485} + - component: {fileID: 2565173876771051831} - component: {fileID: 2663904775254336141} - component: {fileID: 5618831404245800085} m_Layer: 0 @@ -35,8 +35,8 @@ Transform: - {fileID: 7183279171644403880} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!136 &2122400432313491485 -CapsuleCollider: +--- !u!65 &2565173876771051831 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -53,11 +53,9 @@ CapsuleCollider: m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.1 - m_Height: 1 - m_Direction: 0 - m_Center: {x: 0, y: 0, z: 0.1} + serializedVersion: 3 + m_Size: {x: 0.5, y: 0.5, z: 0.1} + m_Center: {x: 0, y: 0.25, z: 0.05} --- !u!210 &2663904775254336141 SortingGroup: m_ObjectHideFlags: 0 diff --git a/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab b/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab index 80a6c7d75..4c8f5bffb 100644 --- a/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/RestaurantPlayer.prefab @@ -56,6 +56,10 @@ PrefabInstance: propertyPath: _initialSkinName value: Basic objectReference: {fileID: 0} + - target: {fileID: 5246526151924390639, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} + propertyPath: m_Direction + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5259510642736920361, guid: 3db3fc62639929c4ba6031ca4ae6600c, type: 3} propertyPath: m_Name value: RestaurantPlayer diff --git a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity index 855ce77cb..77b28c697 100644 --- a/Assets/_DDD/_Addressables/Scenes/Restaurant.unity +++ b/Assets/_DDD/_Addressables/Scenes/Restaurant.unity @@ -4216,7 +4216,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6289760680591803305, guid: 05aeb8078f8dc7c489b71a0ce5bc4fac, type: 3} propertyPath: _editorName - value: + value: "\uB0A8\uD0DC\uAC74" objectReference: {fileID: 0} - target: {fileID: 6289760680591803305, guid: 05aeb8078f8dc7c489b71a0ce5bc4fac, type: 3} propertyPath: _currentVersion @@ -28542,7 +28542,7 @@ GameObject: m_Component: - component: {fileID: 3243182830244835481} - component: {fileID: 2810108535509266895} - m_Layer: 0 + m_Layer: 3 m_Name: KitchenTile m_TagString: Untagged m_Icon: {fileID: 0} @@ -81300,7 +81300,7 @@ GameObject: - component: {fileID: 6430934828325804122} - component: {fileID: 450280007132777672} - component: {fileID: 1709838654768943039} - m_Layer: 6 + m_Layer: 3 m_Name: RestaurantGround m_TagString: Untagged m_Icon: {fileID: 0} @@ -83074,7 +83074,7 @@ GameObject: m_Component: - component: {fileID: 4302969726367423501} - component: {fileID: 8641004020164842070} - m_Layer: 0 + m_Layer: 3 m_Name: RestaurantBackgroundTile m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/_DDD/_Addressables/So/RestaurantPlayerDataSo.asset b/Assets/_DDD/_Addressables/So/RestaurantPlayerDataSo.asset index 7ecc3f51d..2124bd948 100644 --- a/Assets/_DDD/_Addressables/So/RestaurantPlayerDataSo.asset +++ b/Assets/_DDD/_Addressables/So/RestaurantPlayerDataSo.asset @@ -12,12 +12,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5583898a24cc9c7419aec8b01ee0fde4, type: 3} m_Name: RestaurantPlayerDataSo m_EditorClassIdentifier: + IsDrawLineDebug: 1 IsMoveEnabled: 1 - MoveSpeed: 7 + MoveSpeed: 3.5 + Acceleration: 70 + Deceleration: 350 IsDashEnabled: 1 - DashSpeed: 20 + DashSpeed: 15 DashTime: 0.2 DashCooldown: 0.5 + IgnoreSlidingLayerMask: + serializedVersion: 2 + m_Bits: 8 + SlidingThreshold: 0.5 WalkingSfxName: DashSfxName: MoveActionReference: {fileID: -1680190386980627800, guid: 052faaac586de48259a63d0c4782560b, type: 3} diff --git a/Assets/_DDD/_ScriptAssets/Prefabs/BaseRestaurantCharacter.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/BaseRestaurantCharacter.prefab index 3b974c2fe..733830671 100644 --- a/Assets/_DDD/_ScriptAssets/Prefabs/BaseRestaurantCharacter.prefab +++ b/Assets/_DDD/_ScriptAssets/Prefabs/BaseRestaurantCharacter.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 1761643478070701343} - component: {fileID: 5176902543201676162} - - component: {fileID: 5246526151924390639} + - component: {fileID: 732677841941379807} - component: {fileID: 8352859907019760819} - component: {fileID: 3365694194251356714} - component: {fileID: 127430239903465757} @@ -65,8 +65,8 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 116 m_CollisionDetection: 1 ---- !u!136 &5246526151924390639 -CapsuleCollider: +--- !u!65 &732677841941379807 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -83,11 +83,9 @@ CapsuleCollider: m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.2 - m_Height: 0.1 - m_Direction: 1 - m_Center: {x: 0, y: 0.1, z: 0} + serializedVersion: 3 + m_Size: {x: 0.3, y: 0.5, z: 0.1} + m_Center: {x: 0, y: 0.25, z: 0.05} --- !u!114 &8352859907019760819 MonoBehaviour: m_ObjectHideFlags: 0 @@ -210,14 +208,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e20368314a3139f4fb4b4e35af9fcf98, type: 3} m_Name: m_EditorClassIdentifier: - _originalMaterial: {fileID: 0} - _replacementMaterial: {fileID: 0} - _isSkinSet: 1 - _initialSkinName: default - _isRandomSkin: 0 - _isRandomRange: 0 - _randomRange: {x: 0, y: 0} - _randomStrings: [] --- !u!1 &6791841979869644848 GameObject: m_ObjectHideFlags: 0 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-16 17-22-35 by 남태건.json new file mode 100644 index 000000000..79d7e8fd2 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-16 17-22-35 by 남태건.json @@ -0,0 +1,157 @@ +{ + "$개요": [ + { + "": "시트 생성" + } + ], + "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": 0, + "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.3 + }, + { + "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 new file mode 100644 index 000000000..1f60a8068 --- /dev/null +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/BackUps/2025-07-16 17-22-35 by 남태건.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: faf32fed979c86f44afa82f9114d8700 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/GoogleSheetJson.json b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/GoogleSheetJson.json index c08a9eeaa..79d7e8fd2 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/GoogleSheetJson.json +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/GoogleSheetJson.json @@ -102,7 +102,7 @@ "Id": "Item_Environment_001", "EnvironmentType:Enum": "Prop", "RendererType:Enum": "Sprite", - "IsTrigger:int": 1, + "IsTrigger:int": 0, "SkeletonDataName:string": "", "SkinName:string": "", "DefaultAnimationName:string": "", @@ -140,7 +140,7 @@ "SkinName:string": "default", "DefaultAnimationName:string": "Normal", "SpriteKey:string": "", - "Size:float": 0.2 + "Size:float": 0.3 }, { "Id": "Item_Environment_005", diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Logs/GoogleSheetChangeLog.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Logs/GoogleSheetChangeLog.asset index fd18011c7..d1b1a2c0d 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Logs/GoogleSheetChangeLog.asset +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/Logs/GoogleSheetChangeLog.asset @@ -76,4 +76,67 @@ MonoBehaviour: \"\",\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\": + 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}" MaxLogs: 100 diff --git a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/EnvironmentDataSo.asset b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/EnvironmentDataSo.asset index b6d0913c3..8a78ec073 100644 --- a/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/EnvironmentDataSo.asset +++ b/Assets/_DDD/_Scripts/GenerateGoogleSheet/AutoCreated/So/EnvironmentDataSo.asset @@ -16,7 +16,7 @@ MonoBehaviour: - k__BackingField: Item_Environment_001 EnvironmentType: 1 RendererType: 1 - IsTrigger: 1 + IsTrigger: 0 SkeletonDataName: SkinName: DefaultAnimationName: @@ -48,7 +48,7 @@ MonoBehaviour: SkinName: default DefaultAnimationName: Normal SpriteKey: - Size: 0.2 + Size: 0.3 - k__BackingField: Item_Environment_005 EnvironmentType: 2 RendererType: 2 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 6413d11ff..c5679c2a9 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -2,13 +2,13 @@ %TAG !u! tag:unity3d.com,2011: --- !u!78 &1 TagManager: - serializedVersion: 2 + serializedVersion: 3 tags: [] layers: - Default - TransparentFX - Ignore Raycast - - + - Ground - Water - UI - @@ -50,27 +50,3 @@ TagManager: - Light Layer 5 - Light Layer 6 - Light Layer 7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -