diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 722bfce03..216545320 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: 30e7f67fe9aaa7849a34c9b6e2bc53ae m_currentHash: serializedVersion: 2 - Hash: 7600c443183b1c4f3c9a27d0df106d6a + Hash: 00000000000000000000000000000000 m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 1 m_CatalogRequestsTimeout: 0 @@ -101,7 +101,10 @@ MonoBehaviour: m_LabelNames: - default - GoogleSheetSo - - GoogleSheetSprite + - Sprites + - Prefab + - Atlas + - Sprite m_SchemaTemplates: [] m_GroupTemplateObjects: - {fileID: 11400000, guid: f804fe78e7005554f9ba60273aade35b, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset b/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset index f7e5ad8ef..25163b3f5 100644 --- a/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset +++ b/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset @@ -53,8 +53,8 @@ MonoBehaviour: m_CacheClearBehavior: 0 m_IncludeInBuild: 1 m_BundledAssetProviderType: - m_AssemblyName: - m_ClassName: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider m_ForceUniqueProvider: 0 m_UseAssetBundleCache: 1 m_UseAssetBundleCrc: 1 @@ -65,13 +65,13 @@ MonoBehaviour: m_RedirectLimit: -1 m_RetryCount: 0 m_BuildPath: - m_Id: + m_Id: 30b8e03fd76b09f46850a05b2650884d m_LoadPath: - m_Id: + m_Id: 7852182deca226a488adf0342a6f6c9a m_BundleMode: 0 m_AssetBundleProviderType: - m_AssemblyName: - m_ClassName: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider m_UseDefaultSchemaSettings: 0 m_SelectedPathPairIndex: 0 m_BundleNaming: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSo_Group.asset b/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSo_Group.asset index ea1b8fac4..aea7353f8 100644 --- a/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSo_Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSo_Group.asset @@ -15,19 +15,19 @@ MonoBehaviour: m_GroupName: GoogleSheetSo_Group m_GUID: 7fe0c33d351391a45a0ea3c93ecef42e m_SerializeEntries: - - m_GUID: 364b51c69a98a334e8a64fb378a87dea - m_Address: FoodSo - m_ReadOnly: 0 - m_SerializedLabels: - - GoogleSheetSo - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 5479f075b6cda4949a55b4f1e2cb6dd1 + - m_GUID: 3dee12c6902e0644fab1d0e2693857a8 m_Address: ItemSo m_ReadOnly: 0 m_SerializedLabels: - GoogleSheetSo FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 6e22365847202cd42978093a2b420135 + - m_GUID: b7e176e1cb8d76941af3b6344a4e1401 + m_Address: FoodSo + m_ReadOnly: 0 + m_SerializedLabels: + - GoogleSheetSo + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: f38617ba14522db4d87bb7e10c280a2d m_Address: MonsterSo m_ReadOnly: 0 m_SerializedLabels: diff --git a/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSprite_Group.asset b/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSprite_Group.asset index bc7bf61bd..baa62eca3 100644 --- a/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSprite_Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSprite_Group.asset @@ -15,11 +15,23 @@ MonoBehaviour: m_GroupName: GoogleSheetSprite_Group m_GUID: 30e7f67fe9aaa7849a34c9b6e2bc53ae m_SerializeEntries: + - m_GUID: 1aad5f6adfc7c7d44b36ce007d3c0f1e + m_Address: Items + m_ReadOnly: 0 + m_SerializedLabels: + - Atlas + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 492dada85383b554aaf3526ca343f061 + m_Address: Barrel + m_ReadOnly: 0 + m_SerializedLabels: + - Prefab + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: e15933f76da90e742866563b5cd9e45f m_Address: Gold m_ReadOnly: 0 m_SerializedLabels: - - GoogleSheetSprite + - Sprite FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: d12ffbb6f886d48418efb0b6d15ccb88, type: 2} diff --git a/Assets/AddressableImportSettings.asset b/Assets/AddressableImportSettings.asset index 9e290c8d1..c94a63efb 100644 --- a/Assets/AddressableImportSettings.asset +++ b/Assets/AddressableImportSettings.asset @@ -15,13 +15,36 @@ MonoBehaviour: rulesEnabled: 1 allowGroupCreation: 1 rules: - - path: Assets/_Datas/Addressables/ + - path: Assets/_Datas/Addressables/(?[^/]+)/(?.*)\.spriteatlasv2 matchType: 1 groupName: - groupTemplate: {fileID: 0} + groupTemplate: {fileID: 11400000, guid: f804fe78e7005554f9ba60273aade35b, type: 2} groupTemplateApplicationMode: 0 labelRefs: [] - dynamicLabels: [] + dynamicLabels: + - Atlas LabelMode: 1 simplified: 0 - addressReplacement: + addressReplacement: ${asset} + - path: Assets/_Datas/Addressables/(?[^/]+)/(?.*)\.prefab + matchType: 1 + groupName: + groupTemplate: {fileID: 11400000, guid: f804fe78e7005554f9ba60273aade35b, type: 2} + groupTemplateApplicationMode: 0 + labelRefs: [] + dynamicLabels: + - Prefab + LabelMode: 1 + simplified: 0 + addressReplacement: ${asset} + - path: Assets/_Datas/Addressables/(?[^/]+)/(?.*)\.png + matchType: 1 + groupName: + groupTemplate: {fileID: 11400000, guid: f804fe78e7005554f9ba60273aade35b, type: 2} + groupTemplateApplicationMode: 0 + labelRefs: [] + dynamicLabels: + - Sprite + LabelMode: 1 + simplified: 0 + addressReplacement: ${asset} diff --git a/Assets/_Datas/01.Scenes/00.Title.unity b/Assets/_Datas/01.Scenes/00.Title.unity index 2551c08ac..64792d098 100644 --- a/Assets/_Datas/01.Scenes/00.Title.unity +++ b/Assets/_Datas/01.Scenes/00.Title.unity @@ -314,9 +314,9 @@ MonoBehaviour: _isAccessGoogleSheet: 1 _googleSheetUrl: https://script.google.com/macros/s/AKfycbw8TRSl_OuY2S-RX0yvOJi1SqNqoflG0R3pWxk9GC9u_wvGQeuABZc0VH7YJ5lMrAl4/exec _namespace: DDD - _availSheets: Food/Monster + _availSheets: Food/Monster/Item _generateFolderPath: /_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated - _currentVersion: "0 - 2025-06-11 14:50:56 by \uB0A8\uD0DC\uAC74" + _currentVersion: "1 - 2025-07-04 16:18:02 by \uB0A8\uD0DC\uAC74" _restoreIndex: 0 _editorName: _refreshTrigger: 0 diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated.meta b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated.meta index d97d1c4d4..408d34cd2 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated.meta +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b08735de6fa10f04cb3ed2b468f643a8 +guid: 02446bd475e913840a5ced8a9947fc01 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps.meta b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps.meta index 6e49c1e67..c4a2099b6 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps.meta +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f54b898e12310cc46b3f54b221443457 +guid: 7da4dbb1f606d514ab52dfbd63c7291b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-07-04 16-17-14 by 남태건.json b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-07-04 16-17-14 by 남태건.json new file mode 100644 index 000000000..704c37a1a --- /dev/null +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-07-04 16-17-14 by 남태건.json @@ -0,0 +1,116 @@ +{ + "$개요": [ + { + "": "시트 생성" + } + ], + "Food": [ + { + "Id:string": "식별ID", + "Name:string": "이름", + "Cookware_Enum": "요리도구", + "Ingredient1:string": "재료1", + "Ingredient2:string": "재료2", + "Taste1:Taste_Enum": "맛1", + "Taste2:Taste_Enum": "맛2", + "Sprite:Sprite": "Addressable 이미지 이름" + }, + { + "Id:string": "Food001", + "Name:string": "햇빛수프", + "Cookware_Enum": "Pot", + "Ingredient1:string": "극락쌀", + "Ingredient2:string": "햇빛당근", + "Taste1:Taste_Enum": "Bitter", + "Taste2:Taste_Enum": "Sweet", + "Sprite:Sprite": "Gold" + }, + { + "Id:string": "Food002", + "Name:string": "B", + "Cookware_Enum": "FryingPan", + "Ingredient1:string": 1, + "Ingredient2:string": 1, + "Taste1:Taste_Enum": "Spicy", + "Taste2:Taste_Enum": "Bitter", + "Sprite:Sprite": "" + }, + { + "Id:string": "Food003", + "Name:string": "C", + "Cookware_Enum": "Pot", + "Ingredient1:string": 2, + "Ingredient2:string": 2, + "Taste1:Taste_Enum": "Fresh", + "Taste2:Taste_Enum": "None", + "Sprite:Sprite": "" + }, + { + "Id:string": "Food004", + "Name:string": "D", + "Cookware_Enum": "Plating", + "Ingredient1:string": 3, + "Ingredient2:string": 3, + "Taste1:Taste_Enum": " ", + "Taste2:Taste_Enum": "Salty", + "Sprite:Sprite": "Gold" + } + ], + "Monster": [ + { + "Id": "식별번호", + "Name": "이름", + "T1": "테스트1" + }, + { + "Id": "Test001", + "Name": "A", + "T1": 1 + }, + { + "Id": "Test002", + "Name": "B", + "T1": 2 + }, + { + "Id": "Test003", + "Name": "C", + "T1": 3 + }, + { + "Id": "Test004", + "Name": "D", + "T1": 4 + } + ], + "Item": [ + { + "Id": "식별번호", + "Name": "이름", + "ItemType_Enum": "아이템타입", + "CellSizeX:int": "셀크기X", + "CellSizeY:int": "셀크기Y" + }, + { + "Id": "Item001", + "Name": "나무장판", + "ItemType_Enum": "Floor", + "CellSizeX:int": 1, + "CellSizeY:int": 1 + }, + { + "Id": "Item002", + "Name": "테이블", + "ItemType_Enum": "Furniture", + "CellSizeX:int": 2, + "CellSizeY:int": 2 + }, + { + "Id": "Item003", + "Name": "전등", + "ItemType_Enum": "WallMount", + "CellSizeX:int": 3, + "CellSizeY:int": 3 + } + ] +} \ No newline at end of file diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-06-25 16-14-34 by 이용균.json.meta b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-07-04 16-17-14 by 남태건.json.meta similarity index 75% rename from Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-06-25 16-14-34 by 이용균.json.meta rename to Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-07-04 16-17-14 by 남태건.json.meta index 3b6250271..7086f8170 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-06-25 16-14-34 by 이용균.json.meta +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-07-04 16-17-14 by 남태건.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1f9b8f585350fe54bb7e558ae0b00e98 +guid: 34736dc9e04421b48a5a6f1f16fb1768 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-06-25 16-14-34 by 이용균.json b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-07-04 16-18-02 by 남태건.json similarity index 98% rename from Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-06-25 16-14-34 by 이용균.json rename to Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-07-04 16-18-02 by 남태건.json index d6bde372d..336e92adc 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-06-25 16-14-34 by 이용균.json +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-07-04 16-18-02 by 남태건.json @@ -51,7 +51,7 @@ "Cookware_Enum": "Plating", "Ingredient1:string": 3, "Ingredient2:string": 3, - "Taste1:Taste_Enum": "Sour", + "Taste1:Taste_Enum": " ", "Taste2:Taste_Enum": "Salty", "Sprite:Sprite": "Gold" } diff --git a/Assets/_Datas/Scripts.meta b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-07-04 16-18-02 by 남태건.json.meta similarity index 57% rename from Assets/_Datas/Scripts.meta rename to Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-07-04 16-18-02 by 남태건.json.meta index ea6df74fb..8bb74582c 100644 --- a/Assets/_Datas/Scripts.meta +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/BackUps/2025-07-04 16-18-02 by 남태건.json.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: b41c9ea4d54c4cc41b4b67a9cefde1e7 -folderAsset: yes -DefaultImporter: +guid: 8bb3a518e5321c149b1909292ea8def4 +TextScriptImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes.meta b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes.meta index da4730b2c..c93e1de40 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes.meta +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9ffbcd7f689c7cf4ba2de02ba49e07f2 +guid: 2333a82b3380c04498d7059761f125ce folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Food.cs b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Food.cs index aa4600ca8..10c021718 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Food.cs +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Food.cs @@ -1,6 +1,7 @@ // using System; using UnityEngine; + namespace DDD { [Serializable] diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Food.cs.meta b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Food.cs.meta index 6adc7cd33..8c464bc08 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Food.cs.meta +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Food.cs.meta @@ -1,2 +1,2 @@ fileFormatVersion: 2 -guid: 814b474d2e6fe8842ac33070aea9e4f1 \ No newline at end of file +guid: 07d32adeac9e96e4ca9cc90de1b3fa4b \ No newline at end of file diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/FoodSo.cs.meta b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/FoodSo.cs.meta index d6fe68054..8e5d3b047 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/FoodSo.cs.meta +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/FoodSo.cs.meta @@ -1,2 +1,2 @@ fileFormatVersion: 2 -guid: b5478aa41b87d9d4884cd90e79797927 \ No newline at end of file +guid: 68f7086db4e68fc4d913633d06d803f0 \ No newline at end of file diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Item.cs b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Item.cs index a1d8b5a78..e57cf720c 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Item.cs +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Item.cs @@ -1,6 +1,7 @@ // using System; using UnityEngine; + namespace DDD { [Serializable] diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Item.cs.meta b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Item.cs.meta index eb77ebba1..5f911c956 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Item.cs.meta +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Item.cs.meta @@ -1,2 +1,2 @@ fileFormatVersion: 2 -guid: 5cab0c6954bc2c5408c61f1eb944b9bc \ No newline at end of file +guid: ae55dc0aec9727b4a8cfbb29172ad176 \ No newline at end of file diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/ItemSo.cs.meta b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/ItemSo.cs.meta index 100c30d89..2ebc04e5e 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/ItemSo.cs.meta +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/ItemSo.cs.meta @@ -1,2 +1,2 @@ fileFormatVersion: 2 -guid: 786eeb81014098446b41cf48e8e8210f \ No newline at end of file +guid: 7b5deaa05a95b394fb6f6fd6a450e445 \ No newline at end of file diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Monster.cs b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Monster.cs index b379e9e02..5f7113aea 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Monster.cs +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Monster.cs @@ -1,6 +1,7 @@ // using System; using UnityEngine; + namespace DDD { [Serializable] diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Monster.cs.meta b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Monster.cs.meta index bf3b9baf9..e8721a154 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Monster.cs.meta +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/Monster.cs.meta @@ -1,2 +1,2 @@ fileFormatVersion: 2 -guid: b35f0d230750e024683ee7d00983884c \ No newline at end of file +guid: 0b53849f7f9a9ad4f85656f3563afb61 \ No newline at end of file diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/MonsterSo.cs.meta b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/MonsterSo.cs.meta index 8e9446dea..c823d96d3 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/MonsterSo.cs.meta +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Classes/MonsterSo.cs.meta @@ -1,2 +1,2 @@ fileFormatVersion: 2 -guid: 92273e6c1df22a947b0f82b38374eef6 \ No newline at end of file +guid: 7e1500a3fc388674fa8ef2759d5d1c95 \ No newline at end of file diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/EnumTypes.cs b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/EnumTypes.cs index afaf79b92..a225552b4 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/EnumTypes.cs +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/EnumTypes.cs @@ -1,30 +1,34 @@ // using System; -public enum Cookware -{ - None = 0, - Pot = 1, - FryingPan = 2, - Plating = 3, -} -public enum Taste +namespace DDD { - None = 0, - Bitter = 1, - Sweet = 2, - Spicy = 3, - Fresh = 4, - Sour = 5, - Salty = 6, -} - -public enum ItemType + public enum Cookware { - None = 0, - Floor = 1, - Furniture = 2, - WallMount = 3, -} + None = 0, + Pot = 1, + FryingPan = 2, + Plating = 3, + } + public enum Taste +{ + None = 0, + Bitter = 1, + Sweet = 2, + Spicy = 3, + Fresh = 4, + _ = 5, + Salty = 6, + } + + public enum ItemType +{ + None = 0, + Floor = 1, + Furniture = 2, + WallMount = 3, + } + +} diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/EnumTypes.cs.meta b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/EnumTypes.cs.meta index 63b17e060..338158caa 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/EnumTypes.cs.meta +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/EnumTypes.cs.meta @@ -1,2 +1,2 @@ fileFormatVersion: 2 -guid: d9a6fefe198556045aaa566096d1e3a8 \ No newline at end of file +guid: 3a2412871438d5a42b0363c1b7ba1107 \ No newline at end of file diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/GoogleSheetJson.json b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/GoogleSheetJson.json index d6bde372d..336e92adc 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/GoogleSheetJson.json +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/GoogleSheetJson.json @@ -51,7 +51,7 @@ "Cookware_Enum": "Plating", "Ingredient1:string": 3, "Ingredient2:string": 3, - "Taste1:Taste_Enum": "Sour", + "Taste1:Taste_Enum": " ", "Taste2:Taste_Enum": "Salty", "Sprite:Sprite": "Gold" } diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/GoogleSheetJson.json.meta b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/GoogleSheetJson.json.meta index a4aca6c85..8919e6c77 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/GoogleSheetJson.json.meta +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/GoogleSheetJson.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d8db8bbd19c57d24bbbe1fa57e645b0a +guid: 4fdba796e7cd86341abd1a4b7df540bb TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Logs.meta b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Logs.meta index 5c04bf0cc..42cf00473 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Logs.meta +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Logs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a8b41209f15ce744385e03c59b464e17 +guid: bce34a870d914854bbcd1b22e531a027 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Logs/GoogleSheetChangeLog.asset b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Logs/GoogleSheetChangeLog.asset index 477bbe508..c8a0a5df1 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Logs/GoogleSheetChangeLog.asset +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Logs/GoogleSheetChangeLog.asset @@ -13,8 +13,8 @@ MonoBehaviour: m_Name: GoogleSheetChangeLog m_EditorClassIdentifier: _logs: - - Editor: "\uC774\uC6A9\uADE0" - Timestamp: 2025-06-25 16:14:34 + - Editor: "\uB0A8\uD0DC\uAC74" + Timestamp: 2025-07-04 16:17:14 JsonSnapshot: "{\n \"$\uAC1C\uC694\": [\n {\n \"\": \"\uC2DC\uD2B8 \uC0DD\uC131\"\n }\n ],\n \"Food\": [\n {\n \"Id:string\": \"\uC2DD\uBCC4ID\",\n \"Name:string\": \"\uC774\uB984\",\n \"Cookware_Enum\": \"\uC694\uB9AC\uB3C4\uAD6C\",\n @@ -34,7 +34,46 @@ MonoBehaviour: 2,\n \"Taste1:Taste_Enum\": \"Fresh\",\n \"Taste2:Taste_Enum\": \"None\",\n \"Sprite:Sprite\": \"\"\n },\n {\n \"Id:string\": \"Food004\",\n \"Name:string\": \"D\",\n \"Cookware_Enum\": \"Plating\",\n \"Ingredient1:string\": - 3,\n \"Ingredient2:string\": 3,\n \"Taste1:Taste_Enum\": \"Sour\",\n + 3,\n \"Ingredient2:string\": 3,\n \"Taste1:Taste_Enum\": \" \",\n + \"Taste2:Taste_Enum\": \"Salty\",\n \"Sprite:Sprite\": \"Gold\"\n }\n + ],\n \"Monster\": [\n {\n \"Id\": \"\uC2DD\uBCC4\uBC88\uD638\",\n + \"Name\": \"\uC774\uB984\",\n \"T1\": \"\uD14C\uC2A4\uD2B81\"\n },\n + {\n \"Id\": \"Test001\",\n \"Name\": \"A\",\n \"T1\": 1\n + },\n {\n \"Id\": \"Test002\",\n \"Name\": \"B\",\n \"T1\": + 2\n },\n {\n \"Id\": \"Test003\",\n \"Name\": \"C\",\n + \"T1\": 3\n },\n {\n \"Id\": \"Test004\",\n \"Name\": \"D\",\n + \"T1\": 4\n }\n ],\n \"Item\": [\n {\n \"Id\": \"\uC2DD\uBCC4\uBC88\uD638\",\n + \"Name\": \"\uC774\uB984\",\n \"ItemType_Enum\": \"\uC544\uC774\uD15C\uD0C0\uC785\",\n + \"CellSizeX:int\": \"\uC140\uD06C\uAE30X\",\n \"CellSizeY:int\": \"\uC140\uD06C\uAE30Y\"\n + },\n {\n \"Id\": \"Item001\",\n \"Name\": \"\uB098\uBB34\uC7A5\uD310\",\n + \"ItemType_Enum\": \"Floor\",\n \"CellSizeX:int\": 1,\n \"CellSizeY:int\": + 1\n },\n {\n \"Id\": \"Item002\",\n \"Name\": \"\uD14C\uC774\uBE14\",\n + \"ItemType_Enum\": \"Furniture\",\n \"CellSizeX:int\": 2,\n \"CellSizeY:int\": + 2\n },\n {\n \"Id\": \"Item003\",\n \"Name\": \"\uC804\uB4F1\",\n + \"ItemType_Enum\": \"WallMount\",\n \"CellSizeX:int\": 3,\n \"CellSizeY:int\": + 3\n }\n ]\n}" + - Editor: "\uB0A8\uD0DC\uAC74" + Timestamp: 2025-07-04 16:18:02 + JsonSnapshot: "{\n \"$\uAC1C\uC694\": [\n {\n \"\": \"\uC2DC\uD2B8 \uC0DD\uC131\"\n + }\n ],\n \"Food\": [\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 + \"Sprite:Sprite\": \"Addressable \uC774\uBBF8\uC9C0 \uC774\uB984\"\n },\n + {\n \"Id:string\": \"Food001\",\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 \"Sprite:Sprite\": + \"Gold\"\n },\n {\n \"Id:string\": \"Food002\",\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 \"Sprite:Sprite\": \"\"\n },\n + {\n \"Id:string\": \"Food003\",\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 + \"Sprite:Sprite\": \"\"\n },\n {\n \"Id:string\": \"Food004\",\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 \"Sprite:Sprite\": \"Gold\"\n }\n ],\n \"Monster\": [\n {\n \"Id\": \"\uC2DD\uBCC4\uBC88\uD638\",\n \"Name\": \"\uC774\uB984\",\n \"T1\": \"\uD14C\uC2A4\uD2B81\"\n },\n diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Logs/GoogleSheetChangeLog.asset.meta b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Logs/GoogleSheetChangeLog.asset.meta index 1ebea417b..bfa2ea6b1 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Logs/GoogleSheetChangeLog.asset.meta +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/Logs/GoogleSheetChangeLog.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 687f7f52bb7ac3e4fad3ba48439a29ac +guid: 6e67be730ca421042b0578c98fa55699 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So.meta b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So.meta index 556eacb53..58c553585 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So.meta +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 99d65a0af712fd646b80a5eec3113b50 +guid: abfee3200f5694a46b3d0871285819cc folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/FoodSo.asset b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/FoodSo.asset index c9ba1ee56..32f85a3a4 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/FoodSo.asset +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/FoodSo.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b5478aa41b87d9d4884cd90e79797927, type: 3} + m_Script: {fileID: 11500000, guid: 68f7086db4e68fc4d913633d06d803f0, type: 3} m_Name: FoodSo m_EditorClassIdentifier: FoodList: diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/FoodSo.asset.meta b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/FoodSo.asset.meta index 332b43cc9..cf6525ddf 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/FoodSo.asset.meta +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/FoodSo.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 364b51c69a98a334e8a64fb378a87dea +guid: b7e176e1cb8d76941af3b6344a4e1401 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/ItemSo.asset b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/ItemSo.asset index d814e7622..dff4d1af5 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/ItemSo.asset +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/ItemSo.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 786eeb81014098446b41cf48e8e8210f, type: 3} + m_Script: {fileID: 11500000, guid: 7b5deaa05a95b394fb6f6fd6a450e445, type: 3} m_Name: ItemSo m_EditorClassIdentifier: ItemList: diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/ItemSo.asset.meta b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/ItemSo.asset.meta index 62ff33732..aaaed86b9 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/ItemSo.asset.meta +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/ItemSo.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5479f075b6cda4949a55b4f1e2cb6dd1 +guid: 3dee12c6902e0644fab1d0e2693857a8 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/MonsterSo.asset b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/MonsterSo.asset index 90174df3c..9ac3266fe 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/MonsterSo.asset +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/MonsterSo.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 92273e6c1df22a947b0f82b38374eef6, type: 3} + m_Script: {fileID: 11500000, guid: 7e1500a3fc388674fa8ef2759d5d1c95, type: 3} m_Name: MonsterSo m_EditorClassIdentifier: MonsterList: diff --git a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/MonsterSo.asset.meta b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/MonsterSo.asset.meta index 5cfa202d1..6262d8c16 100644 --- a/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/MonsterSo.asset.meta +++ b/Assets/_Datas/02.Scripts/GenerateGoogleSheets/AutoCreated/So/MonsterSo.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6e22365847202cd42978093a2b420135 +guid: f38617ba14522db4d87bb7e10c280a2d NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/_Datas/02.Scripts/Items/Inventory.cs b/Assets/_Datas/02.Scripts/Items/Inventory.cs index 16e3a6ffb..cab35bea5 100644 --- a/Assets/_Datas/02.Scripts/Items/Inventory.cs +++ b/Assets/_Datas/02.Scripts/Items/Inventory.cs @@ -1,63 +1,63 @@ -using System.Collections.Generic; -using UnityEngine; - -namespace DDD -{ - public class Inventory : MonoBehaviour - { - public RectTransform inventoryRoot; - public ItemUI itemPrefab; - - private Dictionary inventory; - private Stack unusedItemUIs; - private Transform unusedRoot; - - private ItemUI selectedItem; - - private async void Start() - { - var task = GoogleSheetManager.LoadSo(); - var items = await task; - - itemPrefab.transform.SetParent(null); - itemPrefab.gameObject.SetActive(false); - - unusedItemUIs = new Stack(); - var obj = new GameObject("UnusedRoot"); - obj.SetActive(false); - unusedRoot = obj.transform; - - // TODO: 데이터에서 가져오기 - inventory = new Dictionary(); - inventory["0"] = items.ItemList[0]; - inventory["1"] = items.ItemList[1]; - inventory["2"] = items.ItemList[2]; - UpdateItemList(); - } - - public void UpdateItemList() - { - var counts = inventoryRoot.childCount; - for (int i = 0; i < counts; ++i) - { - var child = inventoryRoot.GetChild(0); - unusedItemUIs.Push(child.GetComponent()); - child.SetParent(unusedRoot); - } - - foreach (var item in inventory) - { - var usingPool = unusedItemUIs.TryPop(out var itemObject); - - if (usingPool == false) - { - itemObject = Instantiate(itemPrefab.gameObject).GetComponent(); - } - - itemObject.gameObject.SetActive(true); - itemObject.transform.SetParent(inventoryRoot); - itemObject.SetUpItem(item.Value); - } - } - } -} \ No newline at end of file +// using System.Collections.Generic; +// using UnityEngine; +// +// namespace DDD +// { +// public class Inventory : MonoBehaviour +// { +// public RectTransform inventoryRoot; +// public ItemUI itemPrefab; +// +// private Dictionary inventory; +// private Stack unusedItemUIs; +// private Transform unusedRoot; +// +// private ItemUI selectedItem; +// +// private async void Start() +// { +// var task = GoogleSheetManager.LoadSo(); +// var items = await task; +// +// itemPrefab.transform.SetParent(null); +// itemPrefab.gameObject.SetActive(false); +// +// unusedItemUIs = new Stack(); +// var obj = new GameObject("UnusedRoot"); +// obj.SetActive(false); +// unusedRoot = obj.transform; +// +// // TODO: 데이터에서 가져오기 +// inventory = new Dictionary(); +// inventory["0"] = items.ItemList[0]; +// inventory["1"] = items.ItemList[1]; +// inventory["2"] = items.ItemList[2]; +// UpdateItemList(); +// } +// +// public void UpdateItemList() +// { +// var counts = inventoryRoot.childCount; +// for (int i = 0; i < counts; ++i) +// { +// var child = inventoryRoot.GetChild(0); +// unusedItemUIs.Push(child.GetComponent()); +// child.SetParent(unusedRoot); +// } +// +// foreach (var item in inventory) +// { +// var usingPool = unusedItemUIs.TryPop(out var itemObject); +// +// if (usingPool == false) +// { +// itemObject = Instantiate(itemPrefab.gameObject).GetComponent(); +// } +// +// itemObject.gameObject.SetActive(true); +// itemObject.transform.SetParent(inventoryRoot); +// itemObject.SetUpItem(item.Value); +// } +// } +// } +// } \ No newline at end of file diff --git a/Assets/_Datas/02.Scripts/Items/ItemUI.cs b/Assets/_Datas/02.Scripts/Items/ItemUI.cs index e43e1dd4e..7285e79ee 100644 --- a/Assets/_Datas/02.Scripts/Items/ItemUI.cs +++ b/Assets/_Datas/02.Scripts/Items/ItemUI.cs @@ -5,19 +5,19 @@ namespace DDD { public class ItemUI : MonoBehaviour { - public TextMeshProUGUI nameText; - - private Item _item; - - public void SetUpItem(Item item) - { - _item = item; - UpdateItem(); - } - - private void UpdateItem() - { - nameText.text = _item.Name; - } + // public TextMeshProUGUI nameText; + // + // private Item _item; + // + // public void SetUpItem(Item item) + // { + // _item = item; + // UpdateItem(); + // } + // + // private void UpdateItem() + // { + // nameText.text = _item.Name; + // } } } \ No newline at end of file diff --git a/Assets/_Datas/03.Image/Uis/Gold02.png.meta b/Assets/_Datas/03.Image/Uis/Gold02.png.meta index bcbd94c3c..690cdb5df 100644 --- a/Assets/_Datas/03.Image/Uis/Gold02.png.meta +++ b/Assets/_Datas/03.Image/Uis/Gold02.png.meta @@ -133,6 +133,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + spriteCustomMetadata: + entries: [] nameFileIdTable: {} mipmapLimitGroupName: pSDRemoveMatte: 0 diff --git a/Assets/_Datas/Addressables/Items/Barrel.prefab b/Assets/_Datas/Addressables/Items/Barrel.prefab index 7b50ff9c1..8cee33a42 100644 --- a/Assets/_Datas/Addressables/Items/Barrel.prefab +++ b/Assets/_Datas/Addressables/Items/Barrel.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1729167076258722398 +--- !u!1 &5799723711254518527 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,7 +8,7 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4298635208858866552} + - component: {fileID: 5765335169201649049} m_Layer: 0 m_Name: Barrel m_TagString: Untagged @@ -16,23 +16,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4298635208858866552 +--- !u!4 &5765335169201649049 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1729167076258722398} + m_GameObject: {fileID: 5799723711254518527} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 3224128751907053624} + - {fileID: 8594072857435888823} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7923654973883356309 +--- !u!1 &7282862855117613265 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -40,8 +40,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3224128751907053624} - - component: {fileID: 6445448472156230971} + - component: {fileID: 8594072857435888823} + - component: {fileID: 7771024025582628391} m_Layer: 0 m_Name: VisualLook m_TagString: Untagged @@ -49,28 +49,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &3224128751907053624 +--- !u!4 &8594072857435888823 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7923654973883356309} + m_GameObject: {fileID: 7282862855117613265} serializedVersion: 2 m_LocalRotation: {x: 0.34202015, y: 0, z: 0, w: 0.9396927} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 4298635208858866552} + m_Father: {fileID: 5765335169201649049} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &6445448472156230971 +--- !u!212 &7771024025582628391 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7923654973883356309} + m_GameObject: {fileID: 7282862855117613265} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 diff --git a/Assets/_Datas/03.Image/Uis/Gold.png b/Assets/_Datas/Addressables/Sprites/Gold.png similarity index 100% rename from Assets/_Datas/03.Image/Uis/Gold.png rename to Assets/_Datas/Addressables/Sprites/Gold.png diff --git a/Assets/_Datas/03.Image/Uis/Gold.png.meta b/Assets/_Datas/Addressables/Sprites/Gold.png.meta similarity index 98% rename from Assets/_Datas/03.Image/Uis/Gold.png.meta rename to Assets/_Datas/Addressables/Sprites/Gold.png.meta index 9ddfc6143..f67635c61 100644 --- a/Assets/_Datas/03.Image/Uis/Gold.png.meta +++ b/Assets/_Datas/Addressables/Sprites/Gold.png.meta @@ -44,8 +44,8 @@ TextureImporter: lightmap: 0 compressionQuality: 50 spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 + spriteExtrude: 2 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 64