diff --git a/Assets/AddressableAssetsData/AssetGroups/Group.asset b/Assets/AddressableAssetsData/AssetGroups/Group.asset index 47df4c876..13c5b9881 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Group.asset @@ -15,6 +15,12 @@ MonoBehaviour: m_GroupName: Group m_GUID: 30e7f67fe9aaa7849a34c9b6e2bc53ae m_SerializeEntries: + - m_GUID: 034ac52b4c3fe854193b7c9c2d353be5 + m_Address: Foods + m_ReadOnly: 0 + m_SerializedLabels: + - Atlas + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 077fbb30d2367574db4211e2945acda0 m_Address: TodayMenuSlotUi m_ReadOnly: 0 @@ -32,8 +38,8 @@ MonoBehaviour: m_SerializedLabels: - Prefab FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 13bbbe2f81166d44688a0e9f581b8a8a - m_Address: Foods + - m_GUID: 2007acba03804024a801aee30991e439 + m_Address: Ingredients m_ReadOnly: 0 m_SerializedLabels: - Atlas @@ -66,29 +72,17 @@ MonoBehaviour: m_SerializedLabels: - Atlas FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 46f458d0dcf53304ebe8ae4c3b6e4453 - m_Address: Drinks - m_ReadOnly: 0 - m_SerializedLabels: - - Atlas - FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 47e757b9a170ab649af14c4d7b80ac41 m_Address: CreateRestaurantPlayerSo m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 58f31f9092125f740b7d78c711fc58b8 + - m_GUID: 79f90744c9c7ada498ba1ee8c60272d3 m_Address: Common m_ReadOnly: 0 m_SerializedLabels: - Atlas FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 5d82394aa19c5c44eb2e4c888189ec51 - m_Address: Ingredients - m_ReadOnly: 0 - m_SerializedLabels: - - Atlas - FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 83afdd7c8e0232443a83b09a90d0d3b1 m_Address: InventorySlotUi m_ReadOnly: 0 @@ -100,8 +94,8 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 992ad55164428014d929f6d81e21f96f - m_Address: RestaurantManagementUi + - m_GUID: 91f41ed6ea0600f4abed98cf0bf53bc5 + m_Address: Drinks m_ReadOnly: 0 m_SerializedLabels: - Atlas @@ -117,6 +111,12 @@ MonoBehaviour: m_SerializedLabels: - Scene FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: a6e29c94b45be18498c195333e651353 + m_Address: RestaurantManagementUi + m_ReadOnly: 0 + m_SerializedLabels: + - Atlas + FlaggedDuringContentUpdateRestriction: 0 - m_GUID: c6d19267dabc844449cc778f2f03fb34 m_Address: SummerGrass01_SkeletonData m_ReadOnly: 0 diff --git a/Assets/_DDD/Restaurant/Ui/RestaurantManagementUi/Materials/BlackOutlineUi.mat b/Assets/_DDD/Restaurant/Ui/RestaurantManagementUi/Materials/BlackOutlineUi.mat index 1c8294f85..ade7d76d2 100644 --- a/Assets/_DDD/Restaurant/Ui/RestaurantManagementUi/Materials/BlackOutlineUi.mat +++ b/Assets/_DDD/Restaurant/Ui/RestaurantManagementUi/Materials/BlackOutlineUi.mat @@ -25,8 +25,8 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - GRADIENT2COL_ON - OUTBASE8DIR_ON - - OUTBASEPIXELPERF_ON - OUTBASE_ON m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -81,11 +81,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _FadeBurnTex: - m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _FadeTex: - m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} + m_Texture: {fileID: 2800000, guid: b2ae57e82cd4b4d4ebfa9986f7c77c83, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _GlowTex: @@ -117,7 +117,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OverlayTex: - m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3} + m_Texture: {fileID: 2800000, guid: b2ae57e82cd4b4d4ebfa9986f7c77c83, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ParallaxMap: @@ -201,9 +201,9 @@ Material: - _EditorDrawers: 7 - _EnvironmentReflections: 1 - _FadeAmount: -0.1 - - _FadeBurnGlow: 2 - - _FadeBurnTransition: 0.075 - - _FadeBurnWidth: 0.025 + - _FadeBurnGlow: 1 + - _FadeBurnTransition: 0.01 + - _FadeBurnWidth: 0 - _FishEyeUvAmount: 0.35 - _FlickerAlpha: 0 - _FlickerFreq: 0.2 @@ -219,8 +219,8 @@ Material: - _Glow: 10 - _GlowGlobal: 1 - _GradBlend: 1 - - _GradBoostX: 1.2 - - _GradBoostY: 1.2 + - _GradBoostX: 5 + - _GradBoostY: 0.1 - _GradIsRadial: 0 - _GrassManualAnim: 1 - _GrassManualToggle: 0 @@ -267,17 +267,17 @@ Material: - _OutlineDistortTexXSpeed: 5 - _OutlineDistortTexYSpeed: 5 - _OutlineGlow: 1 - - _OutlinePixelWidth: 30 + - _OutlinePixelWidth: 50 - _OutlineTexRotation: 136 - - _OutlineTexRotationSpeed: 15 - - _OutlineTexXSpeed: 0 + - _OutlineTexRotationSpeed: 0 + - _OutlineTexXSpeed: 6.9 - _OutlineTexYSpeed: 10 - _OutlineThickness: 1 - - _OutlineWidth: 0.051 + - _OutlineWidth: 0.2 - _OverlayBlend: 1 - _OverlayGlow: 1 - - _OverlayTextureScrollXSpeed: 0.25 - - _OverlayTextureScrollYSpeed: 0.25 + - _OverlayTextureScrollXSpeed: 0 + - _OverlayTextureScrollYSpeed: 0 - _Parallax: 0.005 - _PinchUvAmount: 0.35 - _PixelateSize: 32 @@ -302,8 +302,8 @@ Material: - _ShakeUvX: 1.5 - _ShakeUvY: 1 - _ShineGlow: 1 - - _ShineLocation: 0.5 - - _ShineRotate: 0 + - _ShineLocation: 0.88 + - _ShineRotate: 0.72 - _ShineWidth: 0.1 - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 @@ -339,7 +339,7 @@ Material: - _ZWrite: 0 - _ZoomUvAmount: 0.5 m_Colors: - - _AlphaOutlineColor: {r: 1, g: 0.033018887, b: 0.033018887, a: 1} + - _AlphaOutlineColor: {r: 0, g: 0, b: 0, a: 1} - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _ClipRect: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} @@ -354,12 +354,12 @@ Material: - _ColorSwapRed: {r: 1, g: 1, b: 1, a: 1} - _Dimensions: {r: 0.8, g: 0.6, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _FadeBurnColor: {r: 1, g: 1, b: 0, a: 1} + - _FadeBurnColor: {r: 1, g: 1, b: 1, a: 1} - _GlowColor: {r: 1, g: 1, b: 1, a: 1} - _GradBotLeftCol: {r: 0, g: 0, b: 1, a: 1} - _GradBotRightCol: {r: 0, g: 1, b: 0, a: 1} - _GradTopLeftCol: {r: 1, g: 0, b: 0, a: 1} - - _GradTopRightCol: {r: 1, g: 1, b: 0, a: 1} + - _GradTopRightCol: {r: 1, g: 1, b: 1, a: 1} - _GreyscaleTintColor: {r: 1, g: 1, b: 1, a: 1} - _HitEffectColor: {r: 1, g: 1, b: 1, a: 1} - _HologramStripeColor: {r: 0, g: 1, b: 1, a: 1} diff --git a/Assets/_DDD/_Addressables/OnlyAtlas.meta b/Assets/_DDD/_Addressables/Sprites/OnlyAtlas.meta similarity index 77% rename from Assets/_DDD/_Addressables/OnlyAtlas.meta rename to Assets/_DDD/_Addressables/Sprites/OnlyAtlas.meta index ad8999b41..bbdefb2af 100644 --- a/Assets/_DDD/_Addressables/OnlyAtlas.meta +++ b/Assets/_DDD/_Addressables/Sprites/OnlyAtlas.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 20b62c5b4c574374bb9724f447f4be13 +guid: abb68f5c46ccbd24c801bb8abf7b191d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_DDD/_Addressables/OnlyAtlas/RestaurantManagementUi.spriteatlasv2 b/Assets/_DDD/_Addressables/Sprites/OnlyAtlas/RestaurantManagementUi.spriteatlasv2 similarity index 100% rename from Assets/_DDD/_Addressables/OnlyAtlas/RestaurantManagementUi.spriteatlasv2 rename to Assets/_DDD/_Addressables/Sprites/OnlyAtlas/RestaurantManagementUi.spriteatlasv2 diff --git a/Assets/_DDD/_Addressables/OnlyAtlas/RestaurantManagementUi.spriteatlasv2.meta b/Assets/_DDD/_Addressables/Sprites/OnlyAtlas/RestaurantManagementUi.spriteatlasv2.meta similarity index 73% rename from Assets/_DDD/_Addressables/OnlyAtlas/RestaurantManagementUi.spriteatlasv2.meta rename to Assets/_DDD/_Addressables/Sprites/OnlyAtlas/RestaurantManagementUi.spriteatlasv2.meta index bc3e53405..3630008b2 100644 --- a/Assets/_DDD/_Addressables/OnlyAtlas/RestaurantManagementUi.spriteatlasv2.meta +++ b/Assets/_DDD/_Addressables/Sprites/OnlyAtlas/RestaurantManagementUi.spriteatlasv2.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 992ad55164428014d929f6d81e21f96f +guid: a6e29c94b45be18498c195333e651353 SpriteAtlasImporter: externalObjects: {} textureSettings: serializedVersion: 2 - anisoLevel: 0 - compressionQuality: 0 - maxTextureSize: 0 + anisoLevel: 1 + compressionQuality: 50 + maxTextureSize: 2048 textureCompression: 0 filterMode: 1 generateMipMaps: 0 @@ -17,10 +17,10 @@ SpriteAtlasImporter: packingSettings: serializedVersion: 2 padding: 4 - blockOffset: 0 + blockOffset: 1 allowAlphaSplitting: 0 - enableRotation: 0 - enableTightPacking: 0 + enableRotation: 1 + enableTightPacking: 1 enableAlphaDilation: 0 secondaryTextureSettings: {} variantMultiplier: 1 diff --git a/Assets/_DDD/_Addressables/Ui.meta b/Assets/_DDD/_Addressables/Sprites/Ui.meta similarity index 77% rename from Assets/_DDD/_Addressables/Ui.meta rename to Assets/_DDD/_Addressables/Sprites/Ui.meta index ef0540fcf..785bd8d37 100644 --- a/Assets/_DDD/_Addressables/Ui.meta +++ b/Assets/_DDD/_Addressables/Sprites/Ui.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f800d5783de78f341bded6f4ed04ad8b +guid: 618e1f36a8cc9844fbe79896f29cba77 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_DDD/_Addressables/Ui/Common.spriteatlasv2 b/Assets/_DDD/_Addressables/Sprites/Ui/Common.spriteatlasv2 similarity index 100% rename from Assets/_DDD/_Addressables/Ui/Common.spriteatlasv2 rename to Assets/_DDD/_Addressables/Sprites/Ui/Common.spriteatlasv2 diff --git a/Assets/_DDD/_Addressables/Ui/Common.spriteatlasv2.meta b/Assets/_DDD/_Addressables/Sprites/Ui/Common.spriteatlasv2.meta similarity index 73% rename from Assets/_DDD/_Addressables/Ui/Common.spriteatlasv2.meta rename to Assets/_DDD/_Addressables/Sprites/Ui/Common.spriteatlasv2.meta index fa8bdfd72..58358332f 100644 --- a/Assets/_DDD/_Addressables/Ui/Common.spriteatlasv2.meta +++ b/Assets/_DDD/_Addressables/Sprites/Ui/Common.spriteatlasv2.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 58f31f9092125f740b7d78c711fc58b8 +guid: 79f90744c9c7ada498ba1ee8c60272d3 SpriteAtlasImporter: externalObjects: {} textureSettings: serializedVersion: 2 - anisoLevel: 0 - compressionQuality: 0 - maxTextureSize: 0 + anisoLevel: 1 + compressionQuality: 50 + maxTextureSize: 2048 textureCompression: 0 filterMode: 1 generateMipMaps: 0 @@ -17,10 +17,10 @@ SpriteAtlasImporter: packingSettings: serializedVersion: 2 padding: 4 - blockOffset: 0 + blockOffset: 1 allowAlphaSplitting: 0 - enableRotation: 0 - enableTightPacking: 0 + enableRotation: 1 + enableTightPacking: 1 enableAlphaDilation: 0 secondaryTextureSettings: {} variantMultiplier: 1 diff --git a/Assets/_DDD/_Addressables/Ui/Drinks.spriteatlasv2 b/Assets/_DDD/_Addressables/Sprites/Ui/Drinks.spriteatlasv2 similarity index 100% rename from Assets/_DDD/_Addressables/Ui/Drinks.spriteatlasv2 rename to Assets/_DDD/_Addressables/Sprites/Ui/Drinks.spriteatlasv2 diff --git a/Assets/_DDD/_Addressables/Ui/Drinks.spriteatlasv2.meta b/Assets/_DDD/_Addressables/Sprites/Ui/Drinks.spriteatlasv2.meta similarity index 73% rename from Assets/_DDD/_Addressables/Ui/Drinks.spriteatlasv2.meta rename to Assets/_DDD/_Addressables/Sprites/Ui/Drinks.spriteatlasv2.meta index f253a1259..362263291 100644 --- a/Assets/_DDD/_Addressables/Ui/Drinks.spriteatlasv2.meta +++ b/Assets/_DDD/_Addressables/Sprites/Ui/Drinks.spriteatlasv2.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 46f458d0dcf53304ebe8ae4c3b6e4453 +guid: 91f41ed6ea0600f4abed98cf0bf53bc5 SpriteAtlasImporter: externalObjects: {} textureSettings: serializedVersion: 2 - anisoLevel: 0 - compressionQuality: 0 - maxTextureSize: 0 + anisoLevel: 1 + compressionQuality: 50 + maxTextureSize: 2048 textureCompression: 0 filterMode: 1 generateMipMaps: 0 @@ -17,10 +17,10 @@ SpriteAtlasImporter: packingSettings: serializedVersion: 2 padding: 4 - blockOffset: 0 + blockOffset: 1 allowAlphaSplitting: 0 - enableRotation: 0 - enableTightPacking: 0 + enableRotation: 1 + enableTightPacking: 1 enableAlphaDilation: 0 secondaryTextureSettings: {} variantMultiplier: 1 diff --git a/Assets/_DDD/_Addressables/Ui/Foods.spriteatlasv2 b/Assets/_DDD/_Addressables/Sprites/Ui/Foods.spriteatlasv2 similarity index 100% rename from Assets/_DDD/_Addressables/Ui/Foods.spriteatlasv2 rename to Assets/_DDD/_Addressables/Sprites/Ui/Foods.spriteatlasv2 diff --git a/Assets/_DDD/_Addressables/Ui/Foods.spriteatlasv2.meta b/Assets/_DDD/_Addressables/Sprites/Ui/Foods.spriteatlasv2.meta similarity index 73% rename from Assets/_DDD/_Addressables/Ui/Foods.spriteatlasv2.meta rename to Assets/_DDD/_Addressables/Sprites/Ui/Foods.spriteatlasv2.meta index 032730439..76713f1bc 100644 --- a/Assets/_DDD/_Addressables/Ui/Foods.spriteatlasv2.meta +++ b/Assets/_DDD/_Addressables/Sprites/Ui/Foods.spriteatlasv2.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 13bbbe2f81166d44688a0e9f581b8a8a +guid: 034ac52b4c3fe854193b7c9c2d353be5 SpriteAtlasImporter: externalObjects: {} textureSettings: serializedVersion: 2 - anisoLevel: 0 - compressionQuality: 0 - maxTextureSize: 0 + anisoLevel: 1 + compressionQuality: 50 + maxTextureSize: 2048 textureCompression: 0 filterMode: 1 generateMipMaps: 0 @@ -17,10 +17,10 @@ SpriteAtlasImporter: packingSettings: serializedVersion: 2 padding: 4 - blockOffset: 0 + blockOffset: 1 allowAlphaSplitting: 0 - enableRotation: 0 - enableTightPacking: 0 + enableRotation: 1 + enableTightPacking: 1 enableAlphaDilation: 0 secondaryTextureSettings: {} variantMultiplier: 1 diff --git a/Assets/_DDD/_Addressables/Ui/Ingredients.spriteatlasv2 b/Assets/_DDD/_Addressables/Sprites/Ui/Ingredients.spriteatlasv2 similarity index 100% rename from Assets/_DDD/_Addressables/Ui/Ingredients.spriteatlasv2 rename to Assets/_DDD/_Addressables/Sprites/Ui/Ingredients.spriteatlasv2 diff --git a/Assets/_DDD/_Addressables/Ui/Ingredients.spriteatlasv2.meta b/Assets/_DDD/_Addressables/Sprites/Ui/Ingredients.spriteatlasv2.meta similarity index 73% rename from Assets/_DDD/_Addressables/Ui/Ingredients.spriteatlasv2.meta rename to Assets/_DDD/_Addressables/Sprites/Ui/Ingredients.spriteatlasv2.meta index 561dc1ea9..23ca45b4a 100644 --- a/Assets/_DDD/_Addressables/Ui/Ingredients.spriteatlasv2.meta +++ b/Assets/_DDD/_Addressables/Sprites/Ui/Ingredients.spriteatlasv2.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: 5d82394aa19c5c44eb2e4c888189ec51 +guid: 2007acba03804024a801aee30991e439 SpriteAtlasImporter: externalObjects: {} textureSettings: serializedVersion: 2 - anisoLevel: 0 - compressionQuality: 0 - maxTextureSize: 0 + anisoLevel: 1 + compressionQuality: 50 + maxTextureSize: 2048 textureCompression: 0 filterMode: 1 generateMipMaps: 0 @@ -17,10 +17,10 @@ SpriteAtlasImporter: packingSettings: serializedVersion: 2 padding: 4 - blockOffset: 0 + blockOffset: 1 allowAlphaSplitting: 0 - enableRotation: 0 - enableTightPacking: 0 + enableRotation: 1 + enableTightPacking: 1 enableAlphaDilation: 0 secondaryTextureSettings: {} variantMultiplier: 1 diff --git a/Assets/_DDD/_Raw/OnlyAtlas.meta b/Assets/_DDD/_Raw/Sprites/OnlyAtlas.meta similarity index 100% rename from Assets/_DDD/_Raw/OnlyAtlas.meta rename to Assets/_DDD/_Raw/Sprites/OnlyAtlas.meta diff --git a/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi.meta b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi.meta similarity index 100% rename from Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi.meta rename to Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi.meta diff --git a/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CheckLine.png b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CheckLine.png similarity index 100% rename from Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CheckLine.png rename to Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CheckLine.png diff --git a/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CheckLine.png.meta b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CheckLine.png.meta similarity index 97% rename from Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CheckLine.png.meta rename to Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CheckLine.png.meta index d12e94f12..af1eda05d 100644 --- a/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CheckLine.png.meta +++ b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CheckLine.png.meta @@ -21,7 +21,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 flipGreenChannel: 0 - isReadable: 0 + isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -46,8 +46,8 @@ TextureImporter: spriteMode: 2 spriteExtrude: 2 spriteMeshType: 0 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} + alignment: 9 + spritePivot: {x: 0.5, y: 0.45117188} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -123,7 +123,7 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: CheckLine_0 + name: CheckLine rect: serializedVersion: 2 x: 0 @@ -160,7 +160,7 @@ TextureImporter: - key: SpriteEditor.SliceSettings value: '{"sliceOnImport":false,"gridCellCount":{"x":1.0,"y":1.0},"gridSpriteSize":{"x":64.0,"y":64.0},"gridSpriteOffset":{"x":0.0,"y":0.0},"gridSpritePadding":{"x":0.0,"y":0.0},"pivot":{"x":0.0,"y":0.0},"autoSlicingMethod":0,"spriteAlignment":0,"slicingType":0,"keepEmptyRects":false,"isAlternate":false}' nameFileIdTable: - CheckLine_0: -502432213 + CheckLine: -502432213 CheckLine_1: 1957413318 mipmapLimitGroupName: pSDRemoveMatte: 0 diff --git a/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png similarity index 100% rename from Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png rename to Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png diff --git a/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png.meta b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png.meta similarity index 97% rename from Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png.meta rename to Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png.meta index 16ee4a295..0bda8ded9 100644 --- a/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png.meta +++ b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png.meta @@ -21,7 +21,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 flipGreenChannel: 0 - isReadable: 0 + isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -46,8 +46,8 @@ TextureImporter: spriteMode: 2 spriteExtrude: 2 spriteMeshType: 0 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} + alignment: 9 + spritePivot: {x: 0.5, y: 0.22851562} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/IngredientDetailPanel.png b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/IngredientDetailPanel.png similarity index 100% rename from Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/IngredientDetailPanel.png rename to Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/IngredientDetailPanel.png diff --git a/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/IngredientDetailPanel.png.meta b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/IngredientDetailPanel.png.meta similarity index 98% rename from Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/IngredientDetailPanel.png.meta rename to Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/IngredientDetailPanel.png.meta index 78230bf1b..f4ee184f1 100644 --- a/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/IngredientDetailPanel.png.meta +++ b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/IngredientDetailPanel.png.meta @@ -21,7 +21,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 flipGreenChannel: 0 - isReadable: 0 + isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -46,8 +46,8 @@ TextureImporter: spriteMode: 2 spriteExtrude: 2 spriteMeshType: 0 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} + alignment: 9 + spritePivot: {x: 0.5, y: 0.22851562} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 diff --git a/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/RecipeDetailPanel.png b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/RecipeDetailPanel.png similarity index 100% rename from Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/RecipeDetailPanel.png rename to Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/RecipeDetailPanel.png diff --git a/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/RecipeDetailPanel.png.meta b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/RecipeDetailPanel.png.meta similarity index 98% rename from Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/RecipeDetailPanel.png.meta rename to Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/RecipeDetailPanel.png.meta index 6ae441ce2..f32937c65 100644 --- a/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/RecipeDetailPanel.png.meta +++ b/Assets/_DDD/_Raw/Sprites/OnlyAtlas/RestaurantManagementUi/RecipeDetailPanel.png.meta @@ -21,7 +21,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 flipGreenChannel: 0 - isReadable: 0 + isReadable: 1 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -46,8 +46,8 @@ TextureImporter: spriteMode: 2 spriteExtrude: 2 spriteMeshType: 0 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} + alignment: 9 + spritePivot: {x: 0.5, y: 0.22851562} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 diff --git a/Assets/_DDD/_Raw/Ui.meta b/Assets/_DDD/_Raw/Sprites/Ui.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui.meta rename to Assets/_DDD/_Raw/Sprites/Ui.meta diff --git a/Assets/_DDD/_Raw/Ui/Common.meta b/Assets/_DDD/_Raw/Sprites/Ui/Common.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Common.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Common.meta diff --git a/Assets/_DDD/_Raw/Ui/Common/CheckNo.png b/Assets/_DDD/_Raw/Sprites/Ui/Common/CheckNo.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Common/CheckNo.png rename to Assets/_DDD/_Raw/Sprites/Ui/Common/CheckNo.png diff --git a/Assets/_DDD/_Raw/Ui/Common/CheckNo.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Common/CheckNo.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Common/CheckNo.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Common/CheckNo.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Common/CheckYes.png b/Assets/_DDD/_Raw/Sprites/Ui/Common/CheckYes.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Common/CheckYes.png rename to Assets/_DDD/_Raw/Sprites/Ui/Common/CheckYes.png diff --git a/Assets/_DDD/_Raw/Ui/Common/CheckYes.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Common/CheckYes.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Common/CheckYes.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Common/CheckYes.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Common/EmptyDrink.png b/Assets/_DDD/_Raw/Sprites/Ui/Common/EmptyDrink.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Common/EmptyDrink.png rename to Assets/_DDD/_Raw/Sprites/Ui/Common/EmptyDrink.png diff --git a/Assets/_DDD/_Raw/Ui/Common/EmptyDrink.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Common/EmptyDrink.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Common/EmptyDrink.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Common/EmptyDrink.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Common/EmptyFood.png b/Assets/_DDD/_Raw/Sprites/Ui/Common/EmptyFood.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Common/EmptyFood.png rename to Assets/_DDD/_Raw/Sprites/Ui/Common/EmptyFood.png diff --git a/Assets/_DDD/_Raw/Ui/Common/EmptyFood.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Common/EmptyFood.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Common/EmptyFood.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Common/EmptyFood.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Drinks.meta b/Assets/_DDD/_Raw/Sprites/Ui/Drinks.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Drinks.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Drinks.meta diff --git a/Assets/_DDD/_Raw/Ui/Drinks/item_drink_001.png b/Assets/_DDD/_Raw/Sprites/Ui/Drinks/item_drink_001.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Drinks/item_drink_001.png rename to Assets/_DDD/_Raw/Sprites/Ui/Drinks/item_drink_001.png diff --git a/Assets/_DDD/_Raw/Ui/Drinks/item_drink_001.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Drinks/item_drink_001.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Drinks/item_drink_001.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Drinks/item_drink_001.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Drinks/item_drink_002.png b/Assets/_DDD/_Raw/Sprites/Ui/Drinks/item_drink_002.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Drinks/item_drink_002.png rename to Assets/_DDD/_Raw/Sprites/Ui/Drinks/item_drink_002.png diff --git a/Assets/_DDD/_Raw/Ui/Drinks/item_drink_002.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Drinks/item_drink_002.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Drinks/item_drink_002.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Drinks/item_drink_002.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Drinks/item_drink_003.png b/Assets/_DDD/_Raw/Sprites/Ui/Drinks/item_drink_003.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Drinks/item_drink_003.png rename to Assets/_DDD/_Raw/Sprites/Ui/Drinks/item_drink_003.png diff --git a/Assets/_DDD/_Raw/Ui/Drinks/item_drink_003.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Drinks/item_drink_003.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Drinks/item_drink_003.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Drinks/item_drink_003.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Drinks/item_drink_004.png b/Assets/_DDD/_Raw/Sprites/Ui/Drinks/item_drink_004.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Drinks/item_drink_004.png rename to Assets/_DDD/_Raw/Sprites/Ui/Drinks/item_drink_004.png diff --git a/Assets/_DDD/_Raw/Ui/Drinks/item_drink_004.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Drinks/item_drink_004.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Drinks/item_drink_004.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Drinks/item_drink_004.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Foods.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Foods.meta diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_001.png b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_001.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_001.png rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_001.png diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_001.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_001.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_001.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_001.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_002.png b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_002.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_002.png rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_002.png diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_002.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_002.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_002.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_002.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_003.png b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_003.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_003.png rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_003.png diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_003.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_003.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_003.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_003.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_004.png b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_004.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_004.png rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_004.png diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_004.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_004.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_004.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_004.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_006.png b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_006.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_006.png rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_006.png diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_006.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_006.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_006.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_006.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_007.png b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_007.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_007.png rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_007.png diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_007.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_007.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_007.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_007.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_008.png b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_008.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_008.png rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_008.png diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_008.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_008.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_008.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_008.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_009.png b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_009.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_009.png rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_009.png diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_009.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_009.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_009.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_009.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_011.png b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_011.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_011.png rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_011.png diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_011.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_011.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_011.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_011.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_012.png b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_012.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_012.png rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_012.png diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_012.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_012.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_012.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_012.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_013.png b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_013.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_013.png rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_013.png diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_013.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_013.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_013.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_013.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_014.png b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_014.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_014.png rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_014.png diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_014.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_014.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_014.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_014.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_017.png b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_017.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_017.png rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_017.png diff --git a/Assets/_DDD/_Raw/Ui/Foods/item_food_017.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_017.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Foods/item_food_017.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Foods/item_food_017.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Ingredients.meta b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients.meta diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_001.png b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_001.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_001.png rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_001.png diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_001.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_001.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_001.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_001.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_002.png b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_002.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_002.png rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_002.png diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_002.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_002.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_002.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_002.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_003.png b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_003.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_003.png rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_003.png diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_003.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_003.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_003.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_003.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_004.png b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_004.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_004.png rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_004.png diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_004.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_004.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_004.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_004.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_005.png b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_005.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_005.png rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_005.png diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_005.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_005.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_005.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_005.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_006.png b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_006.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_006.png rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_006.png diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_006.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_006.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_006.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_006.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_007.png b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_007.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_007.png rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_007.png diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_007.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_007.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_007.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_007.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_008.png b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_008.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_008.png rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_008.png diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_008.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_008.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_008.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_008.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_009.png b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_009.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_009.png rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_009.png diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_009.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_009.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_009.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_009.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_010.png b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_010.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_010.png rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_010.png diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_010.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_010.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_010.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_010.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_014.png b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_014.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_014.png rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_014.png diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_014.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_014.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_014.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_014.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_015.png b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_015.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_015.png rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_015.png diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_015.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_015.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_015.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_015.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_018.png b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_018.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_018.png rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_018.png diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_018.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_018.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_018.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_018.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_021.png b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_021.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_021.png rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_021.png diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_021.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_021.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_021.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_021.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_022.png b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_022.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_022.png rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_022.png diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_022.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_022.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_022.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_022.png.meta diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_023.png b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_023.png similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_023.png rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_023.png diff --git a/Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_023.png.meta b/Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_023.png.meta similarity index 100% rename from Assets/_DDD/_Raw/Ui/Ingredients/item_ingredient_023.png.meta rename to Assets/_DDD/_Raw/Sprites/Ui/Ingredients/item_ingredient_023.png.meta diff --git a/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostProcessors.cs b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostProcessors.cs index a2682ead5..19c7b32e5 100644 --- a/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostProcessors.cs +++ b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostProcessors.cs @@ -15,15 +15,18 @@ private void OnPreprocessTexture() if (upperPath.Contains(PathConstants.RawUiPathUpper)) { - AssetPostprocessorSprite.OnPreprocessTextureForUi(importer); - } - else if (upperPath.Contains(PathConstants.RawSpritesPathUpper)) - { - AssetPostprocessorSprite.OnPreprocessTexture(importer); - } - else if (upperPath.Contains(PathConstants.RawOnlyAtlasPathUpper)) - { - AssetPostprocessorSprite.OnPreprocessTextureOnlyAtlas(importer); + if (upperPath.Contains(PathConstants.RawOnlyAtlasPathUpper)) + { + AssetPostprocessorSprite.OnPreprocessTextureOnlyAtlas(importer); + } + else if (upperPath.Contains(PathConstants.RawSpritesPathUpper)) + { + AssetPostprocessorSprite.OnPreprocessTexture(importer); + } + else + { + AssetPostprocessorSprite.OnPreprocessTextureForUi(importer); + } } } diff --git a/Assets/_DDD/_Scripts/Utilities/Constants.cs b/Assets/_DDD/_Scripts/Utilities/Constants.cs index f9acf6e3f..8de426db0 100644 --- a/Assets/_DDD/_Scripts/Utilities/Constants.cs +++ b/Assets/_DDD/_Scripts/Utilities/Constants.cs @@ -38,8 +38,8 @@ public static class RestaurantPlayerAnimation public static class PathConstants { public const string RawSpritesPathUpper = "ASSETS/_DDD/_RAW/SPRITES/"; - public const string RawUiPathUpper = "ASSETS/_DDD/_RAW/UI/"; - public const string RawOnlyAtlasPathUpper = "ASSETS/_DDD/_RAW/ONLYATLAS/"; + public const string RawUiPathUpper = "ASSETS/_DDD/_RAW/SPRITES/UI/"; + public const string RawOnlyAtlasPathUpper = "ASSETS/_DDD/_RAW/SPRITES/ONLYATLAS/"; public const string RawFolderPath = "/_Raw"; public const string AddressablesFolderPath = "/_Addressables"; }