diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas.meta b/Assets/_DDD/_Raw/Sprites/OnlyAtlas.meta deleted file mode 100644 index a169001a6..000000000 --- a/Assets/_DDD/_Raw/Sprites/OnlyAtlas.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 09f4966f14db79b4f89e830531b01e9e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas.meta b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas.meta deleted file mode 100644 index 868ef6d9f..000000000 --- a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0c5930b6ad0c4b449a092f59c48a2559 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/CheckLine.png b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CheckLine.png similarity index 100% rename from Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/CheckLine.png rename to Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CheckLine.png diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/CheckLine.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CheckLine.png.meta similarity index 99% rename from Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/CheckLine.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CheckLine.png.meta index 7d78ccbaa..d95754f39 100644 --- a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/CheckLine.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CheckLine.png.meta @@ -21,7 +21,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 flipGreenChannel: 0 - isReadable: 1 + isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -46,7 +46,7 @@ TextureImporter: spriteMode: 2 spriteExtrude: 2 spriteMeshType: 0 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.45117188} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/CookwareDetailPanel.png b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CookwareDetailPanel.png similarity index 100% rename from Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/CookwareDetailPanel.png rename to Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CookwareDetailPanel.png diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/CookwareDetailPanel.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CookwareDetailPanel.png.meta similarity index 99% rename from Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/CookwareDetailPanel.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CookwareDetailPanel.png.meta index 602052b69..cce2edf34 100644 --- a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/CookwareDetailPanel.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/CookwareDetailPanel.png.meta @@ -21,7 +21,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 flipGreenChannel: 0 - isReadable: 1 + isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -46,7 +46,7 @@ TextureImporter: spriteMode: 2 spriteExtrude: 2 spriteMeshType: 0 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.22851562} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/IngredientDetailPanel.png b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/IngredientDetailPanel.png similarity index 100% rename from Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/IngredientDetailPanel.png rename to Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/IngredientDetailPanel.png diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/IngredientDetailPanel.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/IngredientDetailPanel.png.meta similarity index 99% rename from Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/IngredientDetailPanel.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/IngredientDetailPanel.png.meta index 3ce8123c6..e4d0aad09 100644 --- a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/IngredientDetailPanel.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/IngredientDetailPanel.png.meta @@ -21,7 +21,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 flipGreenChannel: 0 - isReadable: 1 + isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -46,7 +46,7 @@ TextureImporter: spriteMode: 2 spriteExtrude: 2 spriteMeshType: 0 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.22851562} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/RecipeDetailPanel.png b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/RecipeDetailPanel.png similarity index 100% rename from Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/RecipeDetailPanel.png rename to Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/RecipeDetailPanel.png diff --git a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/RecipeDetailPanel.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/RecipeDetailPanel.png.meta similarity index 99% rename from Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/RecipeDetailPanel.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/RecipeDetailPanel.png.meta index f32937c65..95f234d57 100644 --- a/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi_OnlyAtlas/RecipeDetailPanel.png.meta +++ b/Assets/_DDD/_Raw/Sprites/Ui/RestaurantManagementUi/RecipeDetailPanel.png.meta @@ -21,7 +21,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 flipGreenChannel: 0 - isReadable: 1 + isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -46,7 +46,7 @@ TextureImporter: spriteMode: 2 spriteExtrude: 2 spriteMeshType: 0 - alignment: 9 + alignment: 0 spritePivot: {x: 0.5, y: 0.22851562} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message Shared Data.asset b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message Shared Data.asset index 6c4800beb..d8fe41e6d 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message Shared Data.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message Shared Data.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd6f246c77e4b967b82e361d0aa0ab6d1ad79cfaba4d6252ea11d03ea8e9723a -size 1958 +oid sha256:26c3adfa5b70107bb6c5169ea96adbabc26193c183c57e0708f7a7e0d6fe9618 +size 2060 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_en.asset b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_en.asset index b85ddc541..ac9de9104 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_en.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_en.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ffb4207c67a170673a7c6108c7ba9b3b825612c39a48e85ec3ff11c3d71fb3f4 -size 2504 +oid sha256:1fca5c7e2ead58cf5b83e5bd9caf847ef8cb257066d959b81016cf7251b9eea3 +size 2584 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ja.asset b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ja.asset index 6d982bcd2..a9d555f3e 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ja.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ja.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21cb08a57e3a57f2e4b357c3b58115af62148c85efb7978c94dc94b8bae7082f -size 2447 +oid sha256:899bcabcf791b0a43bbe60ceda2f084a560001902e0508c1f6478b4f0050b10a +size 2527 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ko.asset b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ko.asset index a2f5e0ba3..c31ef6df4 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ko.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Global_Message/Global_Message_ko.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69f65a6cd9b7bb2e5afcbac5ff99b0ff1aebe8c25aaca388e0ce0fd123bf22c0 -size 4292 +oid sha256:e59f10566fecafc1be07f4aeea70ee0a8bddb7f6f441b889b0c9216a6e020f58 +size 4573 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message Shared Data.asset b/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message Shared Data.asset index 220a1a9d6..a88c9a23d 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message Shared Data.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message Shared Data.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e73e6ac12f59190cbfb77da0f0b3b65d4623f5027388eb7554fe05a0840f2264 -size 1801 +oid sha256:5333426da435487e48c8b05c4e99aa138dc2a8082d733550550987bc36cb41e6 +size 1811 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_en.asset b/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_en.asset index f2758af73..8d0bec8c9 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_en.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_en.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:691ddcf7a799e7daaff9d575a796af089fdfa4b514a906ef0362efdca2955844 -size 1393 +oid sha256:ea3c269c2537f173e3a5702e8560b3672da96c0d0fbc50e99b673990a8872a1b +size 1403 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_ja.asset b/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_ja.asset index 0a489a1e5..3a9c53247 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_ja.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_ja.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76d377fc62db31dd86625aac8125005b239eac708a51ffcfb6bf0dc73954ebae -size 1393 +oid sha256:585bb46aa52e0ea4bd39b53a7671328105b55c87779b2e600eaf871a1748e624 +size 1403 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_ko.asset b/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_ko.asset index 68df4a8c9..f149eebce 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_ko.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Interaction_Message/Interaction_Message_ko.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3384191d17bcdb460dfaf3f9eddf3332112c1ca16535958c6104f12fb5c21bea -size 2048 +oid sha256:b1a72819a89839c6988a76fe9dda3ab5c8dc8870ac37684e3906c25c4343e6b9 +size 2120 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description Shared Data.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description Shared Data.asset index d2bacf822..ab569e327 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description Shared Data.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description Shared Data.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61f9e98daed479199a120bdf0637da420b0cde26dff6fe0ac8cef4ca409a55fa +oid sha256:2e24cc3daa5752e408b9b7a7b11ece964d22fac6757c31583372bd93d88f79d0 size 5985 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_en.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_en.asset index 7964a46ba..9cb3a05d1 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_en.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_en.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6bca12d1979ce4a43c7460f2d385e9a62b72f0578689b5dcb9e13c11ab4e28bb +oid sha256:07d9eddad4ef9ba794c0a75217587fc57600f14f76f06b09c96aa85abf36524d size 4610 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ja.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ja.asset index bb3d2785c..d53e6644c 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ja.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ja.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:05e88ba4b9aa594fcea3d708b3b5f04efc911cf7853fd6683f619df654e77fd3 +oid sha256:1b6b16d07f3e18c965c4b518ba05d095153cecaf74894ab6b365e6d6b6f8a0e2 size 4610 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ko.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ko.asset index caa48a68e..13086e1c8 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ko.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Description/Item_Description_ko.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f2b2bfbd0a1ae282b5f39ad76ff35489a507f784251cfddc2b61683f226b2d0 +oid sha256:841e326cb884d53c17751a1eaf54f4116bba2ae9b580e4c82dc1e0fa66994339 size 13456 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name Shared Data.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name Shared Data.asset index ae073198b..9a039a3c7 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name Shared Data.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name Shared Data.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:519967efddde4486ae815ac76788132022ab25083a7a8eb9e7b774308bab1685 +oid sha256:41d655c9e170643c4bf0aa9a9ebbffb0621ada578c63c8a8590f333fad503de0 size 5621 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_en.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_en.asset index 505b9ee2d..d87c1a209 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_en.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_en.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:25b76cd77f763d71e4c8d6f26d0e6cb6ad7af4043022321bce0925b8e0647458 +oid sha256:3fc86dec7ab1df2dcff3995d8cb37b53cf962011efdf63868a26403dfd20ac27 size 5206 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ja.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ja.asset index 284554670..e709f926f 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ja.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ja.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ddc5085fa397005bcab5673942cdca7727e866415dc523b10cb5d8679e3f2734 +oid sha256:ed16c98a2a8666bfb1c7fa7d5fa297e9f4e8d3818b48d57507dc04334b2b5861 size 4603 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ko.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ko.asset index e7d9bbd1f..236ac1cc4 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ko.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Name/Item_Name_ko.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d0c9649f133e44070c433312bc78a7499f9353cbfb3447b05e742b78aa6fa58 +oid sha256:ba87a6f071b6541a146e6dc27a49396c0972ea312c9b1de29bd8a49a618634da size 5889 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste Shared Data.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste Shared Data.asset index ced06e8b9..d2e243ded 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste Shared Data.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste Shared Data.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:94c528a87db6e8d7d466872b7234bb7855ef2c134ff79427da08055552cd36aa +oid sha256:126b7564696a13af5926bdcddb73f386637567d3327a6aebb980cb369f9a015d size 2379 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_en.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_en.asset index 893162c9d..db5d046f6 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_en.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_en.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a90d7b0f25142bbcd9a3278f0bd9ded867dae3b7476b36c96396c9406ae31f2e +oid sha256:19799ef501be556e6394f6c2c337a1900133259990b532fa5b67f0cc44449363 size 2168 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_ja.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_ja.asset index 32800077c..f2add326d 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_ja.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_ja.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f25bdba88ce3dde4fa24b24ae43dfb9e383801466e3add61ac726bb527f8c999 +oid sha256:071eef293043adedf30e022e41be392204ed53d1fb7ad0a7c93b2be32c97a16f size 2044 diff --git a/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_ko.asset b/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_ko.asset index 3c456432f..43d4d8e81 100644 --- a/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_ko.asset +++ b/Assets/_DDD/_ScriptAssets/Localization/Item_Taste/Item_Taste_ko.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f27aaa4dd2a5dda3d79a680f8d3befd23fa188cc21acf19521734dae34665fb +oid sha256:643aaea1f09cf8d111367384ea40347e6441acf467276f38ef427f6398ab1141 size 2410 diff --git a/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostProcessors.cs b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostProcessors.cs index c5fca9a11..092196f23 100644 --- a/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostProcessors.cs +++ b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostProcessors.cs @@ -9,16 +9,13 @@ public class AssetPostProcessors : AssetPostprocessor private void OnPreprocessTexture() { var importer = assetImporter as TextureImporter; + if (!importer) return; var upperPath = importer.assetPath.ToUpper(); if (upperPath.Contains(PathConstants.RawSpritesPathUpper)) { - if (upperPath.Contains(PathConstants.RawOnlyAtlasPathUpper)) - { - AssetPostprocessorSprite.OnPreprocessTextureOnlyAtlas(importer); - } - else if (upperPath.Contains(PathConstants.RawUiPathUpper)) + if (upperPath.Contains(PathConstants.RawUiPathUpper)) { AssetPostprocessorSprite.OnPreprocessTextureForUi(importer); } diff --git a/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorSprite.cs b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorSprite.cs index 281a6e9e7..be7a8dd5d 100644 --- a/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorSprite.cs +++ b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorSprite.cs @@ -16,7 +16,6 @@ public static class AssetPostprocessorSprite public static void OnPreprocessTexture(TextureImporter importer) { importer.textureType = TextureImporterType.Sprite; - importer.spriteImportMode = SpriteImportMode.Single; importer.GetSourceTextureWidthAndHeight(out var width, out var height); importer.spritePixelsPerUnit = width <= height ? width : height; @@ -25,7 +24,6 @@ public static void OnPreprocessTexture(TextureImporter importer) importer.isReadable = true; importer.mipmapEnabled = false; importer.streamingMipmaps = false; - importer.wrapMode = TextureWrapMode.Clamp; importer.filterMode = FilterMode.Bilinear; importer.textureCompression = TextureImporterCompression.Uncompressed; @@ -44,16 +42,11 @@ public static void OnPreprocessTexture(TextureImporter importer) public static void OnPreprocessTextureForUi(TextureImporter importer) { importer.textureType = TextureImporterType.Sprite; - importer.spriteImportMode = SpriteImportMode.Single; - - // 기본 PPU (UI는 100 또는 1 고정 추천) - // importer.spritePixelsPerUnit = 100f; importer.sRGBTexture = true; importer.isReadable = false; importer.mipmapEnabled = false; importer.streamingMipmaps = false; - importer.wrapMode = TextureWrapMode.Clamp; importer.filterMode = FilterMode.Bilinear; importer.textureCompression = TextureImporterCompression.Uncompressed; @@ -68,17 +61,6 @@ public static void OnPreprocessTextureForUi(TextureImporter importer) importer.SetTextureSettings(textureSettings); } - - public static void OnPreprocessTextureOnlyAtlas(TextureImporter importer) - { - if (importer.textureType == TextureImporterType.Sprite) - { - return; - } - - importer.textureType = TextureImporterType.Sprite; - importer.spriteImportMode = SpriteImportMode.Single; - } private static void TryApplyPivotAfterImport(string path) { diff --git a/Assets/_DDD/_Scripts/Game/GameData/DataManager.cs b/Assets/_DDD/_Scripts/Game/GameData/DataManager.cs index 0133b43ef..09a3d593d 100644 --- a/Assets/_DDD/_Scripts/Game/GameData/DataManager.cs +++ b/Assets/_DDD/_Scripts/Game/GameData/DataManager.cs @@ -13,6 +13,7 @@ public class DataManager : Singleton, IManager private const string AssetLabel = "GoogleSheetSo"; private const string Icon = "_icon"; + private const string AtlasLabel = "Atlas"; public void PreInit() { @@ -21,7 +22,7 @@ public void PreInit() public async Task Init() { - await LoadAllGameDataSo(); + await LoadAllGameDataAssets(); await LoadSpriteAtlas(); } @@ -30,7 +31,7 @@ public void PostInit() } - private async Task LoadAllGameDataSo() + private async Task LoadAllGameDataAssets() { var assets = await AssetManager.Instance.LoadAssetsByLabel(AssetLabel); _dataAssetTable = new Dictionary(assets.Count); @@ -45,7 +46,7 @@ private async Task LoadAllGameDataSo() private async Task LoadSpriteAtlas() { - List spriteAtlases = await AssetManager.Instance.LoadAssetsByLabel(DataConstants.AtlasLabel); + List spriteAtlases = await AssetManager.Instance.LoadAssetsByLabel(AtlasLabel); _spriteAtlas = new Dictionary(spriteAtlases.Count); foreach (var atlas in spriteAtlases) diff --git a/Assets/_DDD/_Scripts/Game/GameUi/CommonButton.cs b/Assets/_DDD/_Scripts/Game/GameUi/CommonButton.cs index 803522936..2e8b361cf 100644 --- a/Assets/_DDD/_Scripts/Game/GameUi/CommonButton.cs +++ b/Assets/_DDD/_Scripts/Game/GameUi/CommonButton.cs @@ -269,6 +269,13 @@ public void OnSubmit(BaseEventData eventData) public void SetInteractable(bool interactable) { _button.interactable = interactable; + if (interactable == false) + { + _isHighlighted = false; + _isPressed = false; + _isSelected = false; + _isToggled = false; + } UpdateVisualState(); } diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementUi.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementUi.cs index 83edb0270..945d046bd 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementUi.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementUi.cs @@ -65,7 +65,6 @@ protected override void OnCreatedInitializePopup() { InitializeViews(); InitializeTabGroups(); - SetupCategoryTabs(); SetupBindings(); } @@ -173,12 +172,6 @@ private void InitializeViews() } } - private void SetupCategoryTabs() - { - _menuCategoryTabs.UseDefaultAllowedValues(); - _cookwareCategoryTabs.UseDefaultAllowedValues(); - } - private void InitializeTabGroups() { _sectionTabs.Initialize(OnSectionTabSelected); @@ -189,7 +182,7 @@ private void InitializeTabGroups() private void UpdateSectionTabs() { if (_viewModel == null) return; - _sectionTabs.SelectTab((int)_viewModel.CurrentSection); + _sectionTabs.TrySelectTab((int)_viewModel.CurrentSection); } private void UpdateCategoryTabs() @@ -199,10 +192,10 @@ private void UpdateCategoryTabs() switch (_viewModel.CurrentSection) { case SectionButtonType.Menu: - _menuCategoryTabs.SelectTab((int)_viewModel.CurrentCategory); + _menuCategoryTabs.TrySelectTab((int)_viewModel.CurrentCategory); break; case SectionButtonType.Cookware: - _cookwareCategoryTabs.SelectTab((int)_viewModel.CurrentCategory); + _cookwareCategoryTabs.TrySelectTab((int)_viewModel.CurrentCategory); break; } } @@ -264,7 +257,8 @@ private void HandleCloseRequested() private void HandleMenuCategorySelected(InventoryCategoryType category) { - _menuCategoryTabs.SelectTab((int)category); + if (_menuCategoryTabs.TrySelectTab((int)category)) return; + if (_cookwareCategoryTabs.TrySelectTab((int)category)) return; } private void OnSectionTabSelected(int sectionValue) diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabGroupUi.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabGroupUi.cs index 550ee59cf..b060b6325 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabGroupUi.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabGroupUi.cs @@ -76,22 +76,6 @@ public void Initialize(Action onTabSelected) InitializeTabs(); } - /// - /// 기본 허용 값들을 사용하여 탭을 초기화합니다. - /// - public void UseDefaultAllowedValues() - { - if (TabButtonConfig.TryGetValue(_tabButtonType, out List defaultValues)) - { - // 기본값을 바로 사용하여 탭 초기화 - InitializeTabsWithValues(defaultValues); - } - else - { - Debug.LogWarning($"TabButtonType {_tabButtonType}에 대한 설정이 정의되지 않았습니다.", this); - } - } - /// /// 지정된 값들로 탭들을 초기화합니다. /// @@ -144,24 +128,23 @@ private void InitializeTabs() /// private void HandleTabButtonClicked(int tabValue) { - SelectTab(tabValue); + TrySelectTab(tabValue); } /// /// 지정된 값을 가진 탭을 선택합니다. /// - public void SelectTab(int tabValue) + public bool TrySelectTab(int tabValue) { if (_tabLookup == null || _tabLookup.Count == 0) { Debug.LogWarning("탭 룩업이 초기화되지 않았습니다.", this); - return; + return false; } - if (!_tabLookup.ContainsKey(tabValue)) + if (_tabLookup.ContainsKey(tabValue) == false) { - Debug.LogWarning($"탭 값 {tabValue}에 해당하는 탭을 찾을 수 없습니다.", this); - return; + return false; } CurrentTabValue = tabValue; @@ -174,6 +157,7 @@ public void SelectTab(int tabValue) // 이벤트 호출 OnTabSelected?.Invoke(tabValue); + return true; } /// @@ -185,7 +169,7 @@ public void SelectFirstTab() if (_tabButtons[0] != null) { var firstTabValue = _tabButtons[0].TabValue; - SelectTab(firstTabValue); + TrySelectTab(firstTabValue); } } @@ -223,7 +207,7 @@ public void Move(int direction) // 상호작용 가능한 탭을 찾았으면 이동 if (IsTabInteractable(tabValues[newIndex])) { - SelectTab(tabValues[newIndex]); + TrySelectTab(tabValues[newIndex]); } } diff --git a/Assets/_DDD/_Scripts/Utilities/Constants.cs b/Assets/_DDD/_Scripts/Utilities/Constants.cs index e89072d85..67e42f2e0 100644 --- a/Assets/_DDD/_Scripts/Utilities/Constants.cs +++ b/Assets/_DDD/_Scripts/Utilities/Constants.cs @@ -10,28 +10,6 @@ public static class CommonConstants public const string BlockImage = "BlockImage"; } - public static class DataConstants - { - public const string GameStateSo = "GameStateSo"; - public const string InventoryTestDataSo = "InventoryTestDataSo"; - public const string ItemDataSo = "ItemDataAsset"; - public const string RecipeDataSo = "RecipeDataAsset"; - public const string FoodDataSo = "FoodDataAsset"; - public const string DrinkDataSo = "DrinkDataAsset"; - public const string IngredientDataSo = "IngredientDataAsset"; - public const string CookwareDataSo = "CookwareDataAsset"; - public const string TasteDataSo = "TasteDataAsset"; - public const string EnvironmentDataSo = "EnvironmentDataAsset"; - public const string LevelDataSo = "LevelDataAsset"; - public const string CustomerPoolDataSo = "CustomerPoolDataAsset"; - public const string UiInputBindingSo = "UiInputBindingSo"; - - public const string RestaurantDataSo = "RestaurantDataSo"; - - public const string AtlasLabel = "Atlas"; - public const string BasePropSpriteMaterial = "BasePropSpriteMaterial"; - } - public static class RestaurantPlayerAnimationType { public const string Idle = "Idle";