Merge remote-tracking branch 'origin/develop' into develop

2025-08-01 17:37:27 +09:00 · 2025-08-01 17:37:27 +09:00 · f9d9c2397f
commit f9d9c2397f
parent ef96639139 4b24122c3d
15 changed files with 1 additions and 332 deletions
--- a/.gitignore
+++ b/.gitignore
@ -93,10 +93,7 @@ Packages/com.distantlands.cozy.core/Samples~/Legacy Integrations/*.unitypackage.
 packages-lock.json
 .vscode

-# Raw 폴더 전체 무시
-#Assets/_Datas/Raw/
-
 # 특정 atlas 파일 무시
 # Unity SpriteAtlas auto-generated files
-Assets/_DDD/_Addressables/Sprites/
+Assets/_DDD/_Addressables/Sprites/*
 .autosave/
--- a/Assets/_DDD/_Addressables/Sprites/OnlyAtlas.meta
+++ b/Assets/_DDD/_Addressables/Sprites/OnlyAtlas.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: abb68f5c46ccbd24c801bb8abf7b191d
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/_DDD/_Addressables/Sprites/OnlyAtlas/RestaurantManagementUi.spriteatlasv2
+++ b/Assets/_DDD/_Addressables/Sprites/OnlyAtlas/RestaurantManagementUi.spriteatlasv2
@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!612988286 &1
-SpriteAtlasAsset:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  serializedVersion: 2
-  m_MasterAtlas: {fileID: 0}
-  m_ImporterData:
-    packables:
-    - {fileID: -502432213, guid: f6859731666dd444a9c3bc04005ac3fa, type: 3}
-    - {fileID: 141783083, guid: acadfd472bff2194fb213497cdc62d66, type: 3}
-    - {fileID: 825273812, guid: bcb8eb887f2d0814d9faa440dd50bce4, type: 3}
-    - {fileID: -975732387, guid: 0b80400f6a609d6489f9da53bc2438c7, type: 3}
-  m_IsVariant: 0
-  m_ScriptablePacker: {fileID: 0}
--- a/Assets/_DDD/_Addressables/Sprites/OnlyAtlas/RestaurantManagementUi.spriteatlasv2.meta
+++ b/Assets/_DDD/_Addressables/Sprites/OnlyAtlas/RestaurantManagementUi.spriteatlasv2.meta
@ -1,30 +0,0 @@
-fileFormatVersion: 2
-guid: a6e29c94b45be18498c195333e651353
-SpriteAtlasImporter:
-  externalObjects: {}
-  textureSettings:
-    serializedVersion: 2
-    anisoLevel: 1
-    compressionQuality: 50
-    maxTextureSize: 2048
-    textureCompression: 0
-    filterMode: 1
-    generateMipMaps: 0
-    readable: 0
-    crunchedCompression: 0
-    sRGB: 1
-  platformSettings: []
-  packingSettings:
-    serializedVersion: 2
-    padding: 4
-    blockOffset: 1
-    allowAlphaSplitting: 0
-    enableRotation: 1
-    enableTightPacking: 1
-    enableAlphaDilation: 0
-  secondaryTextureSettings: {}
-  variantMultiplier: 1
-  bindAsDefault: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/_DDD/_Addressables/Sprites/RestaurantProps.spriteatlasv2
+++ b/Assets/_DDD/_Addressables/Sprites/RestaurantProps.spriteatlasv2
@ -1,16 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!612988286 &1
-SpriteAtlasAsset:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  serializedVersion: 2
-  m_MasterAtlas: {fileID: 0}
-  m_ImporterData:
-    packables:
-    - {fileID: 21300000, guid: 189d780f1507008429f2cdd1a2b4c9e8, type: 3}
-  m_IsVariant: 0
-  m_ScriptablePacker: {fileID: 0}
--- a/Assets/_DDD/_Addressables/Sprites/RestaurantProps.spriteatlasv2.meta
+++ b/Assets/_DDD/_Addressables/Sprites/RestaurantProps.spriteatlasv2.meta
@ -1,30 +0,0 @@
-fileFormatVersion: 2
-guid: 43d183a6e5f0da746b6dbe4b447caa9e
-SpriteAtlasImporter:
-  externalObjects: {}
-  textureSettings:
-    serializedVersion: 2
-    anisoLevel: 0
-    compressionQuality: 0
-    maxTextureSize: 0
-    textureCompression: 0
-    filterMode: 1
-    generateMipMaps: 0
-    readable: 0
-    crunchedCompression: 0
-    sRGB: 1
-  platformSettings: []
-  packingSettings:
-    serializedVersion: 2
-    padding: 4
-    blockOffset: 0
-    allowAlphaSplitting: 0
-    enableRotation: 0
-    enableTightPacking: 0
-    enableAlphaDilation: 0
-  secondaryTextureSettings: {}
-  variantMultiplier: 1
-  bindAsDefault: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/_DDD/_Addressables/Sprites/Ui.meta
+++ b/Assets/_DDD/_Addressables/Sprites/Ui.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 618e1f36a8cc9844fbe79896f29cba77
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/_DDD/_Addressables/Sprites/Ui/Common.spriteatlasv2
+++ b/Assets/_DDD/_Addressables/Sprites/Ui/Common.spriteatlasv2
@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!612988286 &1
-SpriteAtlasAsset:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  serializedVersion: 2
-  m_MasterAtlas: {fileID: 0}
-  m_ImporterData:
-    packables:
-    - {fileID: 21300000, guid: 3a77932a2914fa04fb2096d47597eb95, type: 3}
-    - {fileID: 21300000, guid: 4c3cd4ba7dc7cda49af9413345a6857d, type: 3}
-    - {fileID: 21300000, guid: a8f3c6be3ae97a245bae788539425262, type: 3}
-    - {fileID: 21300000, guid: 78e198643036d1c4985405590e98035c, type: 3}
-  m_IsVariant: 0
-  m_ScriptablePacker: {fileID: 0}
--- a/Assets/_DDD/_Addressables/Sprites/Ui/Common.spriteatlasv2.meta
+++ b/Assets/_DDD/_Addressables/Sprites/Ui/Common.spriteatlasv2.meta
@ -1,30 +0,0 @@
-fileFormatVersion: 2
-guid: 79f90744c9c7ada498ba1ee8c60272d3
-SpriteAtlasImporter:
-  externalObjects: {}
-  textureSettings:
-    serializedVersion: 2
-    anisoLevel: 1
-    compressionQuality: 50
-    maxTextureSize: 2048
-    textureCompression: 0
-    filterMode: 1
-    generateMipMaps: 0
-    readable: 0
-    crunchedCompression: 0
-    sRGB: 1
-  platformSettings: []
-  packingSettings:
-    serializedVersion: 2
-    padding: 4
-    blockOffset: 1
-    allowAlphaSplitting: 0
-    enableRotation: 1
-    enableTightPacking: 1
-    enableAlphaDilation: 0
-  secondaryTextureSettings: {}
-  variantMultiplier: 1
-  bindAsDefault: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/_DDD/_Addressables/Sprites/Ui/Drinks.spriteatlasv2
+++ b/Assets/_DDD/_Addressables/Sprites/Ui/Drinks.spriteatlasv2
@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!612988286 &1
-SpriteAtlasAsset:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  serializedVersion: 2
-  m_MasterAtlas: {fileID: 0}
-  m_ImporterData:
-    packables:
-    - {fileID: 21300000, guid: 8238e6735c0b41943ab54e053acc6e6e, type: 3}
-    - {fileID: 21300000, guid: b54ad74f6fe18fb4eaf2a7187944e599, type: 3}
-    - {fileID: 21300000, guid: 9ab155bdfe0564d4d8f86d71dff0b5b6, type: 3}
-    - {fileID: 21300000, guid: aac1ad945eb739c4caaa0cb5d41ec72c, type: 3}
-  m_IsVariant: 0
-  m_ScriptablePacker: {fileID: 0}
--- a/Assets/_DDD/_Addressables/Sprites/Ui/Drinks.spriteatlasv2.meta
+++ b/Assets/_DDD/_Addressables/Sprites/Ui/Drinks.spriteatlasv2.meta
@ -1,30 +0,0 @@
-fileFormatVersion: 2
-guid: 91f41ed6ea0600f4abed98cf0bf53bc5
-SpriteAtlasImporter:
-  externalObjects: {}
-  textureSettings:
-    serializedVersion: 2
-    anisoLevel: 1
-    compressionQuality: 50
-    maxTextureSize: 2048
-    textureCompression: 0
-    filterMode: 1
-    generateMipMaps: 0
-    readable: 0
-    crunchedCompression: 0
-    sRGB: 1
-  platformSettings: []
-  packingSettings:
-    serializedVersion: 2
-    padding: 4
-    blockOffset: 1
-    allowAlphaSplitting: 0
-    enableRotation: 1
-    enableTightPacking: 1
-    enableAlphaDilation: 0
-  secondaryTextureSettings: {}
-  variantMultiplier: 1
-  bindAsDefault: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/_DDD/_Addressables/Sprites/Ui/Foods.spriteatlasv2
+++ b/Assets/_DDD/_Addressables/Sprites/Ui/Foods.spriteatlasv2
@ -1,28 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!612988286 &1
-SpriteAtlasAsset:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  serializedVersion: 2
-  m_MasterAtlas: {fileID: 0}
-  m_ImporterData:
-    packables:
-    - {fileID: 21300000, guid: 7b0669364db4d5945b2764f2a5203be5, type: 3}
-    - {fileID: 21300000, guid: a37fd0bfd473b374a9b0ef16a8daba15, type: 3}
-    - {fileID: 21300000, guid: bc15c831d63c0ad4ebd822f8cab968b9, type: 3}
-    - {fileID: 21300000, guid: 862241056335df649b6a424c88ad34c7, type: 3}
-    - {fileID: 21300000, guid: 7f4c795da0d97cb41a7d8caecf61ede5, type: 3}
-    - {fileID: 21300000, guid: 2b052a6ad1a9ca84bb6f151739b21de1, type: 3}
-    - {fileID: 21300000, guid: 2a307ab58974752458c6a82aaca5226b, type: 3}
-    - {fileID: 21300000, guid: b55fbb7423b24714ab04d27ae1e09272, type: 3}
-    - {fileID: 21300000, guid: 051711c51c5deb3468c960cc28538ac7, type: 3}
-    - {fileID: 21300000, guid: bd56d33014c2b1e4e88310ab94d0903c, type: 3}
-    - {fileID: 21300000, guid: 1cdcbfe2f4119b54ba15de443b7737e2, type: 3}
-    - {fileID: 21300000, guid: 91f5894956b022b4abc1a25d424911c8, type: 3}
-    - {fileID: 21300000, guid: 814eb101d17bcb145a3dcb6f156cdd97, type: 3}
-  m_IsVariant: 0
-  m_ScriptablePacker: {fileID: 0}
--- a/Assets/_DDD/_Addressables/Sprites/Ui/Foods.spriteatlasv2.meta
+++ b/Assets/_DDD/_Addressables/Sprites/Ui/Foods.spriteatlasv2.meta
@ -1,30 +0,0 @@
-fileFormatVersion: 2
-guid: 034ac52b4c3fe854193b7c9c2d353be5
-SpriteAtlasImporter:
-  externalObjects: {}
-  textureSettings:
-    serializedVersion: 2
-    anisoLevel: 1
-    compressionQuality: 50
-    maxTextureSize: 2048
-    textureCompression: 0
-    filterMode: 1
-    generateMipMaps: 0
-    readable: 0
-    crunchedCompression: 0
-    sRGB: 1
-  platformSettings: []
-  packingSettings:
-    serializedVersion: 2
-    padding: 4
-    blockOffset: 1
-    allowAlphaSplitting: 0
-    enableRotation: 1
-    enableTightPacking: 1
-    enableAlphaDilation: 0
-  secondaryTextureSettings: {}
-  variantMultiplier: 1
-  bindAsDefault: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/_DDD/_Addressables/Sprites/Ui/Ingredients.spriteatlasv2
+++ b/Assets/_DDD/_Addressables/Sprites/Ui/Ingredients.spriteatlasv2
@ -1,31 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!612988286 &1
-SpriteAtlasAsset:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  serializedVersion: 2
-  m_MasterAtlas: {fileID: 0}
-  m_ImporterData:
-    packables:
-    - {fileID: 21300000, guid: 4c01c1f262ae20a46b2f5f8dda0d6313, type: 3}
-    - {fileID: 21300000, guid: 48b66e69ad2030d4a9ee0aedb3c0458c, type: 3}
-    - {fileID: 21300000, guid: 941f6a675cbc83f4b931046cdafce589, type: 3}
-    - {fileID: 21300000, guid: 5cefe051df6097c458c8e8107984b16f, type: 3}
-    - {fileID: 21300000, guid: 427b535cc87f4694693c177b042d581c, type: 3}
-    - {fileID: 21300000, guid: 85701ffb0eaf58b4e98ba522f2e92214, type: 3}
-    - {fileID: 21300000, guid: ad9a47e99f0590d4a81589c01d69d3c1, type: 3}
-    - {fileID: 21300000, guid: fce93443cf0c83d4b89b44acad321b84, type: 3}
-    - {fileID: 21300000, guid: a68b247aa580d4a4e8b1a91ee9ecd234, type: 3}
-    - {fileID: 21300000, guid: 1e1b2e6c347875c4e8fdbdabc1229d96, type: 3}
-    - {fileID: 21300000, guid: 83ac5028853b63a4c91fd6c55731474a, type: 3}
-    - {fileID: 21300000, guid: 0bf58955d22579040870674a4824b904, type: 3}
-    - {fileID: 21300000, guid: 01d59b99eac1705438cf9983ee7bc448, type: 3}
-    - {fileID: 21300000, guid: dea1cbcc83ca2fb47911dafd973cd09a, type: 3}
-    - {fileID: 21300000, guid: 102ed689cc777bd44855d4e9dec11717, type: 3}
-    - {fileID: 21300000, guid: fdef02e5dac9f20469fe2f095fb3a6d6, type: 3}
-  m_IsVariant: 0
-  m_ScriptablePacker: {fileID: 0}
--- a/Assets/_DDD/_Addressables/Sprites/Ui/Ingredients.spriteatlasv2.meta
+++ b/Assets/_DDD/_Addressables/Sprites/Ui/Ingredients.spriteatlasv2.meta
@ -1,30 +0,0 @@
-fileFormatVersion: 2
-guid: 2007acba03804024a801aee30991e439
-SpriteAtlasImporter:
-  externalObjects: {}
-  textureSettings:
-    serializedVersion: 2
-    anisoLevel: 1
-    compressionQuality: 50
-    maxTextureSize: 2048
-    textureCompression: 0
-    filterMode: 1
-    generateMipMaps: 0
-    readable: 0
-    crunchedCompression: 0
-    sRGB: 1
-  platformSettings: []
-  packingSettings:
-    serializedVersion: 2
-    padding: 4
-    blockOffset: 1
-    allowAlphaSplitting: 0
-    enableRotation: 1
-    enableTightPacking: 1
-    enableAlphaDilation: 0
-  secondaryTextureSettings: {}
-  variantMultiplier: 1
-  bindAsDefault: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: