From 6d08ec9252a6c448e3b0f842068d5472fb1b94a2 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Wed, 30 Jul 2025 19:38:12 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A1=B0=EB=A6=AC=20=EB=8F=84=EA=B5=AC=20?= =?UTF-8?q?=ED=83=AD=20=EC=9E=91=EC=97=85=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RestaurantManagementUi.spriteatlasv2 | 3 +- .../CookwareDetailPanel.png | 3 + .../CookwareDetailPanel.png.meta | 168 ++++++++++ ...arePanel.png => IngredientDetailPanel.png} | 0 ...ng.meta => IngredientDetailPanel.png.meta} | 4 +- ...ookwarePanel.png => RecipeDetailPanel.png} | 0 ...el.png.meta => RecipeDetailPanel.png.meta} | 4 +- .../_ScriptAssets/Prefabs/UiManager.prefab | 314 +++++++++--------- .../InventoryUi/InventoryView.cs | 4 +- .../RestaurantManagementUi/ItemDetailView.cs | 38 ++- .../RestaurantManagementUi.cs | 25 +- .../TabUi/TabButtonUi.cs | 11 + .../TabUi/TabGroupUi.cs | 13 +- 13 files changed, 410 insertions(+), 177 deletions(-) create mode 100644 Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png create mode 100644 Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png.meta rename Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/{NotCookwarePanel.png => IngredientDetailPanel.png} (100%) rename Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/{NotCookwarePanel.png.meta => IngredientDetailPanel.png.meta} (98%) rename Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/{CookwarePanel.png => RecipeDetailPanel.png} (100%) rename Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/{CookwarePanel.png.meta => RecipeDetailPanel.png.meta} (98%) diff --git a/Assets/_DDD/_Addressables/OnlyAtlas/RestaurantManagementUi.spriteatlasv2 b/Assets/_DDD/_Addressables/OnlyAtlas/RestaurantManagementUi.spriteatlasv2 index 28a0571de..1a8a5127d 100644 --- a/Assets/_DDD/_Addressables/OnlyAtlas/RestaurantManagementUi.spriteatlasv2 +++ b/Assets/_DDD/_Addressables/OnlyAtlas/RestaurantManagementUi.spriteatlasv2 @@ -12,7 +12,8 @@ SpriteAtlasAsset: m_ImporterData: packables: - {fileID: -502432213, guid: f6859731666dd444a9c3bc04005ac3fa, type: 3} - - {fileID: -975732387, guid: 0b80400f6a609d6489f9da53bc2438c7, 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} diff --git a/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png b/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png new file mode 100644 index 000000000..5c3476f72 --- /dev/null +++ b/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52aa1b8f133683318167222473f446cb1852b56a1f84755b517be5f6932c712d +size 17041 diff --git a/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png.meta b/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png.meta new file mode 100644 index 000000000..16ee4a295 --- /dev/null +++ b/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CookwareDetailPanel.png.meta @@ -0,0 +1,168 @@ +fileFormatVersion: 2 +guid: acadfd472bff2194fb213497cdc62d66 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 2 + spriteMeshType: 0 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: CookwareDetailPanel + rect: + serializedVersion: 2 + x: 0 + y: 117 + width: 512 + height: 234 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 70a27c0e626941b4ba70d935160ae374 + internalID: 141783083 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: + - 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: + CookwareDetailPanel: 141783083 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/NotCookwarePanel.png b/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/IngredientDetailPanel.png similarity index 100% rename from Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/NotCookwarePanel.png rename to Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/IngredientDetailPanel.png diff --git a/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/NotCookwarePanel.png.meta b/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/IngredientDetailPanel.png.meta similarity index 98% rename from Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/NotCookwarePanel.png.meta rename to Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/IngredientDetailPanel.png.meta index edec3912b..78230bf1b 100644 --- a/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/NotCookwarePanel.png.meta +++ b/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/IngredientDetailPanel.png.meta @@ -123,7 +123,7 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: NotCookwarePanel + name: IngredientDetailPanel 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: - NotCookwarePanel: 825273812 + IngredientDetailPanel: 825273812 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: processed diff --git a/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CookwarePanel.png b/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/RecipeDetailPanel.png similarity index 100% rename from Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CookwarePanel.png rename to Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/RecipeDetailPanel.png diff --git a/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CookwarePanel.png.meta b/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/RecipeDetailPanel.png.meta similarity index 98% rename from Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CookwarePanel.png.meta rename to Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/RecipeDetailPanel.png.meta index 275cfcb06..6ae441ce2 100644 --- a/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/CookwarePanel.png.meta +++ b/Assets/_DDD/_Raw/OnlyAtlas/RestaurantManagementUi/RecipeDetailPanel.png.meta @@ -136,7 +136,7 @@ TextureImporter: serializedVersion: 2 sprites: - serializedVersion: 2 - name: CookwarePanel + name: RecipeDetailPanel rect: serializedVersion: 2 x: 0 @@ -173,7 +173,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: - CookwarePanel: -975732387 + RecipeDetailPanel: -975732387 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: processed diff --git a/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab index b82856429..9976234c4 100644 --- a/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab +++ b/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab @@ -379,9 +379,9 @@ RectTransform: m_Father: {fileID: 1875034819620308290} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -21, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &2195521861224488785 CanvasRenderer: @@ -1144,7 +1144,7 @@ GameObject: m_Component: - component: {fileID: 7034903074407012824} m_Layer: 5 - m_Name: InventoryCategoryPanel + m_Name: MenuCategoryPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1358,7 +1358,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -0.00000667572} - m_SizeDelta: {x: 0, y: 283} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &4455849737257894435 MonoBehaviour: @@ -1757,7 +1757,8 @@ MonoBehaviour: _inventoryView: {fileID: 2047433905958591238} _itemDetailView: {fileID: 7187859246691058540} _sectionTabs: {fileID: 3412150873873046232} - _categoryTabs: {fileID: 8937672504025748459} + _menuCategoryTabs: {fileID: 8937672504025748459} + _cookwareCategoryTabs: {fileID: 195952124745473889} --- !u!1 &3136738684647897689 GameObject: m_ObjectHideFlags: 0 @@ -1905,7 +1906,7 @@ GameObject: - component: {fileID: 8078955599071181865} - component: {fileID: 8937672504025748459} m_Layer: 5 - m_Name: CategoryTabGroupUi + m_Name: MenuCategoryTabGroupUi m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2844,7 +2845,6 @@ MonoBehaviour: _tabButtons: - {fileID: 4259650029125789555} - {fileID: 4540577351612455078} - - {fileID: 562535455544165745} --- !u!1 &4720465464268976843 GameObject: m_ObjectHideFlags: 0 @@ -2991,7 +2991,7 @@ GameObject: m_Component: - component: {fileID: 1997123807297444195} m_Layer: 5 - m_Name: InventoryCategoryPanel + m_Name: CookwareCategoryPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3272,7 +3272,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 38, y: 0} - m_SizeDelta: {x: 324.96002, y: -20} + m_SizeDelta: {x: 0, y: -20} m_Pivot: {x: 0, y: 0.5} --- !u!114 &788662360802420040 MonoBehaviour: @@ -3484,10 +3484,10 @@ RectTransform: - {fileID: 7277272132657383817} m_Father: {fileID: 3998916864298566288} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 556.25, y: -40} - m_SizeDelta: {x: 197.5, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5526512686592268562 CanvasRenderer: @@ -3538,7 +3538,7 @@ GameObject: - component: {fileID: 3031975280063336366} - component: {fileID: 195952124745473889} m_Layer: 5 - m_Name: CategoryTabGroupUi + m_Name: CookwareCategoryTabGroupUi m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4660,10 +4660,10 @@ RectTransform: - {fileID: 2768408132379331307} m_Father: {fileID: 3998916864298566288} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 216.25, y: -40} - m_SizeDelta: {x: 422.5, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7914822155608647276 CanvasRenderer: @@ -5590,6 +5590,7 @@ MonoBehaviour: _descriptionLocalizer: {fileID: 7773702407997318972} _cookWarePanel: {fileID: 7125113852259692313} _cookwareImage: {fileID: 9103009765615207844} + _tasteHashTagPanel: {fileID: 1267700265221531591} _tasteHashTagContent1: {fileID: 4098406426953214058} _tasteHashTagContentLayoutGroup: {fileID: 1525380172147653226} _tasteHashTagContent2: {fileID: 2768408132379331307} @@ -7153,7 +7154,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.x @@ -7161,15 +7162,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.x - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.y - value: 133 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalPosition.x @@ -7201,11 +7202,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.x - value: 449 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.y - value: -211.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -7255,7 +7256,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.x @@ -7263,15 +7264,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.x - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.y - value: 133 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalPosition.x @@ -7303,11 +7304,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.x - value: 386 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.y - value: -204.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -7552,6 +7553,7 @@ MonoBehaviour: _animator: {fileID: 2615890409481915537} _label: {fileID: 1628919949471468038} _content: [] + _isEnabled: 1 --- !u!224 &3858662839343360872 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3617399278284653010, guid: d11d5cf80be02d7469f07db925af284a, type: 3} @@ -7790,6 +7792,7 @@ MonoBehaviour: _label: {fileID: 1641734074151327218} _content: - {fileID: 6193665945825828398} + _isEnabled: 1 --- !u!114 &7658427862910281593 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8139,7 +8142,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_AnchorMin.x @@ -8147,15 +8150,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_SizeDelta.x - value: 284.68 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_SizeDelta.y - value: 29.39 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_LocalPosition.x @@ -8187,11 +8190,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_AnchoredPosition.x - value: 175.34 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_AnchoredPosition.y - value: -101.085 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -8241,23 +8244,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6620233851129534747, guid: f9bb25b96d102c34ea2088901e9815df, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6620233851129534747, guid: f9bb25b96d102c34ea2088901e9815df, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6620233851129534747, guid: f9bb25b96d102c34ea2088901e9815df, type: 3} propertyPath: m_SizeDelta.x - value: 36.4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6620233851129534747, guid: f9bb25b96d102c34ea2088901e9815df, type: 3} propertyPath: m_AnchoredPosition.x - value: 15 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6620233851129534747, guid: f9bb25b96d102c34ea2088901e9815df, type: 3} propertyPath: m_AnchoredPosition.y - value: -17.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7711966263543122389, guid: f9bb25b96d102c34ea2088901e9815df, type: 3} propertyPath: m_AnchorMax.y @@ -8341,6 +8344,10 @@ PrefabInstance: propertyPath: m_fontSize value: 32 objectReference: {fileID: 0} + - target: {fileID: 2189377788458160067, guid: d11d5cf80be02d7469f07db925af284a, type: 3} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2189377788458160067, guid: d11d5cf80be02d7469f07db925af284a, type: 3} propertyPath: m_Navigation.m_Mode value: 0 @@ -8561,6 +8568,7 @@ MonoBehaviour: _animator: {fileID: 4130886049805240510} _label: {fileID: 830156148325486121} _content: [] + _isEnabled: 0 --- !u!114 &7478346035653633187 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8600,7 +8608,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.x @@ -8608,15 +8616,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.x - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.y - value: 133 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalPosition.x @@ -8648,11 +8656,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.x - value: 386 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.y - value: -71.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -8808,7 +8816,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.x @@ -8816,15 +8824,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.x - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.y - value: 133 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalPosition.x @@ -8856,11 +8864,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.x - value: 191 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.y - value: -71.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -9012,7 +9020,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_AnchorMin.x @@ -9020,15 +9028,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_SizeDelta.x - value: 257.72 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_SizeDelta.y - value: 29.39 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_LocalPosition.x @@ -9060,11 +9068,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_AnchoredPosition.x - value: 161.86 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_AnchoredPosition.y - value: -153.475 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -9122,7 +9130,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.x @@ -9130,15 +9138,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.x - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.y - value: 133 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalPosition.x @@ -9170,11 +9178,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.x - value: 124 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.y - value: -204.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -9330,7 +9338,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.x @@ -9338,15 +9346,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.x - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.y - value: 133 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalPosition.x @@ -9378,11 +9386,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.x - value: 255 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.y - value: -204.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -9436,7 +9444,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.x @@ -9444,15 +9452,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.x - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.y - value: 133 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalPosition.x @@ -9484,11 +9492,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.x - value: 320 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.y - value: -211.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -10165,6 +10173,7 @@ MonoBehaviour: _animator: {fileID: 7292153866515317490} _label: {fileID: 6333322395543995493} _content: [] + _isEnabled: 1 --- !u!224 &8427312772612220171 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3617399278284653010, guid: d11d5cf80be02d7469f07db925af284a, type: 3} @@ -10383,6 +10392,7 @@ MonoBehaviour: _animator: {fileID: 7210471250156169931} _label: {fileID: 6252730220008680540} _content: [] + _isEnabled: 1 --- !u!224 &8489714628886220082 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3617399278284653010, guid: d11d5cf80be02d7469f07db925af284a, type: 3} @@ -10620,6 +10630,7 @@ MonoBehaviour: _label: {fileID: 6347064870059061541} _content: - {fileID: 3623547258794563387} + _isEnabled: 1 --- !u!114 &7919307604414184462 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10754,27 +10765,27 @@ PrefabInstance: m_Modifications: - target: {fileID: 2798659778440617956, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2798659778440617956, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2798659778440617956, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_SizeDelta.x - value: 61.21 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2798659778440617956, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_SizeDelta.y - value: 40.69 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2798659778440617956, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_AnchoredPosition.x - value: 85.744995 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2798659778440617956, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_AnchoredPosition.y - value: -24.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3936671778860388973, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_Name @@ -10928,7 +10939,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.x @@ -10936,15 +10947,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.x - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.y - value: 133 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalPosition.x @@ -10976,11 +10987,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.x - value: 449 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.y - value: -71.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -11238,7 +11249,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_AnchorMin.x @@ -11246,15 +11257,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_SizeDelta.x - value: 233.46 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_SizeDelta.y - value: 29.39 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_LocalPosition.x @@ -11286,11 +11297,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_AnchoredPosition.x - value: 149.73001 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_AnchoredPosition.y - value: -48.695 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2101980386021614144, guid: ff07d58cdb81fca4f80b04a12d40d7d9, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -11344,7 +11355,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.x @@ -11352,15 +11363,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.x - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.y - value: 133 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalPosition.x @@ -11392,11 +11403,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.x - value: 255 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.y - value: -71.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -11756,7 +11767,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.x @@ -11764,15 +11775,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.x - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.y - value: 133 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalPosition.x @@ -11804,11 +11815,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.x - value: 124 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.y - value: -71.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -11886,27 +11897,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6068175654963885001, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6068175654963885001, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6068175654963885001, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_SizeDelta.x - value: 20.78 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6068175654963885001, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_SizeDelta.y - value: 40 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6068175654963885001, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_AnchoredPosition.x - value: 22.39 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6068175654963885001, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_AnchoredPosition.y - value: -25 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8035394201733596699, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_AnchorMax.x @@ -11970,7 +11981,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9124744816064830070, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_SizeDelta.x - value: 44.78 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9124744816064830070, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_SizeDelta.y @@ -12056,7 +12067,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.x @@ -12064,15 +12075,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.x - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.y - value: 133 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalPosition.x @@ -12104,11 +12115,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.x - value: 517 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.y - value: -71.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -12368,7 +12379,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9124744816064830070, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_SizeDelta.x - value: 51.08 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9124744816064830070, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_SizeDelta.y @@ -12754,7 +12765,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.x @@ -12762,15 +12773,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.x - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.y - value: 133 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalPosition.x @@ -12802,11 +12813,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.x - value: 517 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.y - value: -204.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -12888,27 +12899,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6068175654963885001, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6068175654963885001, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6068175654963885001, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_SizeDelta.x - value: 56.05 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6068175654963885001, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_SizeDelta.y - value: 39 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6068175654963885001, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_AnchoredPosition.x - value: 40.025 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6068175654963885001, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_AnchoredPosition.y - value: -24.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8035394201733596699, guid: f28a226717a80c9408dc27c756ce6e2f, type: 3} propertyPath: m_AnchorMax.x @@ -13058,7 +13069,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.x @@ -13066,15 +13077,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.x - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.y - value: 133 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalPosition.x @@ -13106,11 +13117,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.x - value: 191 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.y - value: -211.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -13160,7 +13171,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.x @@ -13168,15 +13179,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.x - value: 132 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_SizeDelta.y - value: 133 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalPosition.x @@ -13208,11 +13219,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.x - value: 320 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_AnchoredPosition.y - value: -71.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 186537154872449206, guid: e349efbef7b74ce47af461f7985bfdc2, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -13538,6 +13549,7 @@ MonoBehaviour: _animator: {fileID: 6134941593432695108} _label: {fileID: 7490933929858115539} _content: [] + _isEnabled: 1 --- !u!114 &7490933929858115539 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1235175980690940092, guid: d11d5cf80be02d7469f07db925af284a, type: 3} @@ -13853,6 +13865,7 @@ MonoBehaviour: _animator: {fileID: 6504321178583266142} _label: {fileID: 7536045829221479881} _content: [] + _isEnabled: 1 --- !u!95 &6504321178583266142 stripped Animator: m_CorrespondingSourceObject: {fileID: 2590324484831684139, guid: d11d5cf80be02d7469f07db925af284a, type: 3} @@ -14071,6 +14084,7 @@ MonoBehaviour: _animator: {fileID: 6469855202218579620} _label: {fileID: 7718922786118144051} _content: [] + _isEnabled: 1 --- !u!95 &6469855202218579620 stripped Animator: m_CorrespondingSourceObject: {fileID: 2590324484831684139, guid: d11d5cf80be02d7469f07db925af284a, type: 3} @@ -14222,23 +14236,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6620233851129534747, guid: f9bb25b96d102c34ea2088901e9815df, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6620233851129534747, guid: f9bb25b96d102c34ea2088901e9815df, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6620233851129534747, guid: f9bb25b96d102c34ea2088901e9815df, type: 3} propertyPath: m_SizeDelta.x - value: 36.4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6620233851129534747, guid: f9bb25b96d102c34ea2088901e9815df, type: 3} propertyPath: m_AnchoredPosition.x - value: 15 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6620233851129534747, guid: f9bb25b96d102c34ea2088901e9815df, type: 3} propertyPath: m_AnchoredPosition.y - value: -17.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7711966263543122389, guid: f9bb25b96d102c34ea2088901e9815df, type: 3} propertyPath: m_AnchorMax.y diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/InventoryUi/InventoryView.cs b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/InventoryUi/InventoryView.cs index 04785d1ac..7eb71742a 100644 --- a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/InventoryUi/InventoryView.cs +++ b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/InventoryUi/InventoryView.cs @@ -100,9 +100,9 @@ private bool MatchesCategory(ItemViewModel model, InventoryCategoryType category case InventoryCategoryType.Ingredient: return model.ItemType == ItemType.Ingredient; case InventoryCategoryType.Cookware: - + return DataManager.Instance.GetDataSo().TryGetDataById(model.Id, out var cookwareData); case InventoryCategoryType.Special: - return true; + return false; default: return false; } diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemDetailView.cs b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemDetailView.cs index 495d1678c..eb15cde5c 100644 --- a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemDetailView.cs +++ b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemDetailView.cs @@ -18,6 +18,7 @@ public class ItemDetailView : MonoBehaviour, IEventHandler _tasteHashTagSlotUis = new(); private ItemViewModel _currentItemViewModel; private TaskCompletionSource _isInitialized = new(); - - private const string CookwarePanel = "CookwarePanel"; - private const string NotCookwarePanel = "NotCookwarePanel"; + + private const string CookwareDetailPanel = "CookwareDetailPanel"; + private const string IngredientDetailPanel = "IngredientDetailPanel"; + private const string RecipeDetailPanel = "RecipeDetailPanel"; private async void Start() { @@ -129,17 +131,31 @@ private void UpdateTasteHashTags(ItemViewModel model) public void UpdateCategory(InventoryCategoryType category) { - if (category == InventoryCategoryType.Ingredient) + switch (category) { - _viewImage.sprite = DataManager.Instance.GetSprite(NotCookwarePanel); - _cookWarePanel.gameObject.SetActive(false); - } - else - { - _viewImage.sprite = DataManager.Instance.GetSprite(CookwarePanel); - _cookWarePanel.gameObject.SetActive(true); + case InventoryCategoryType.Food: + case InventoryCategoryType.Drink: + _viewImage.sprite = DataManager.Instance.GetSprite(RecipeDetailPanel); + _tasteHashTagPanel.gameObject.SetActive(true); + _cookWarePanel.gameObject.SetActive(true); + break; + case InventoryCategoryType.Ingredient: + _viewImage.sprite = DataManager.Instance.GetSprite(IngredientDetailPanel); + _tasteHashTagPanel.gameObject.SetActive(true); + _cookWarePanel.gameObject.SetActive(false); + break; + case InventoryCategoryType.Cookware: + case InventoryCategoryType.Special: + _viewImage.sprite = DataManager.Instance.GetSprite(CookwareDetailPanel); + _tasteHashTagPanel.gameObject.SetActive(false); + _cookWarePanel.gameObject.SetActive(false); + break; + default: + throw new ArgumentOutOfRangeException(nameof(category), category, null); } + if (!_tasteHashTagPanel.gameObject.activeInHierarchy) return; + Canvas.ForceUpdateCanvases(); UpdateTasteHashTags(_currentItemViewModel); } diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/RestaurantManagementUi.cs b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/RestaurantManagementUi.cs index 4b8a39666..17b53c848 100644 --- a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/RestaurantManagementUi.cs +++ b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/RestaurantManagementUi.cs @@ -2,6 +2,7 @@ using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.InputSystem; +using UnityEngine.Serialization; namespace DDD { @@ -10,14 +11,15 @@ public class RestaurantManagementUi : PopupUi, IEventHandle [SerializeField] private InventoryView _inventoryView; [SerializeField] private ItemDetailView _itemDetailView; [SerializeField] private TabGroupUi _sectionTabs; - [SerializeField] private TabGroupUi _categoryTabs; + [SerializeField] private TabGroupUi _menuCategoryTabs; + [SerializeField] private TabGroupUi _cookwareCategoryTabs; protected override GameObject GetInitialSelected() { var inventoryViewInitialSelectedObject = _inventoryView.GetInitialSelected(); if (inventoryViewInitialSelectedObject) return inventoryViewInitialSelectedObject; - return _categoryTabs.GetFirstInteractableButton; + return _menuCategoryTabs.GetFirstInteractableButton; } public async override void Open() @@ -26,7 +28,11 @@ public async override void Open() await _inventoryView.Initialize(); _sectionTabs.Initialize(OnSectionTabSelected); - _categoryTabs.Initialize(OnCategoryTabSelected); + _menuCategoryTabs.Initialize(OnCategoryTabSelected); + _cookwareCategoryTabs.Initialize(OnCategoryTabSelected); + + _sectionTabs.SelectFirstTab(); + _menuCategoryTabs.SelectFirstTab(); EventBus.Register(this); } @@ -87,6 +93,17 @@ private void HandleInteract2() private void OnSectionTabSelected(RestaurantManagementSectionType section) { + switch (section) + { + case RestaurantManagementSectionType.Menu: + _menuCategoryTabs.SelectFirstTab(); + break; + case RestaurantManagementSectionType.Cookware: + _cookwareCategoryTabs.SelectFirstTab(); + break; + default: + throw new ArgumentOutOfRangeException(nameof(section), section, null); + } // TODO : 추후 Menu, Cookware, Worker에 맞춰 다른 콘텐츠 노출 처리 } @@ -107,7 +124,7 @@ public void Invoke(TodayMenuRemovedEvent evt) if (newInventoryCategoryType == InventoryCategoryType.None) return; - _categoryTabs.SelectTab(newInventoryCategoryType); + _menuCategoryTabs.SelectTab(newInventoryCategoryType); } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabButtonUi.cs b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabButtonUi.cs index 9ef6b1de0..948a3a258 100644 --- a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabButtonUi.cs +++ b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabButtonUi.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using TMPro; using UnityEngine; +using UnityEngine.Serialization; using UnityEngine.UI; namespace DDD @@ -31,12 +32,22 @@ public class TabButtonUi : MonoBehaviour, IInteractableUi where T : Enum [SerializeField] private Animator _animator; [SerializeField] private TextMeshProUGUI _label; [SerializeField] private List _content = new(); + + [SerializeField] private bool _isEnabled = true; private Action _onSelected; private bool _isSelected; + + private readonly int _canDisabled = Animator.StringToHash("CanDisabled"); private void OnEnable() { + if (_isEnabled == false) + { + _animator.SetBool(_canDisabled, true); + return; + } + if (_isSelected) { _animator.SetTrigger(nameof(DefaultAnimatorParams.Selected)); diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabGroupUi.cs b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabGroupUi.cs index 72b34839a..92b352cff 100644 --- a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabGroupUi.cs +++ b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabGroupUi.cs @@ -29,11 +29,6 @@ public void Initialize(Action onTabSelected) tab.Initialize(OnTabClicked); _tabLookup[tab.TabType] = tab; } - - if (_tabButtons.Count > 0) - { - SelectTab(_tabButtons[0].TabType); - } } private void OnTabClicked(T type) @@ -52,6 +47,14 @@ public void SelectTab(T type) _onTabSelected?.Invoke(type); } + public void SelectFirstTab() + { + if (_tabButtons.Count > 0) + { + SelectTab(_tabButtons[0].TabType); + } + } + public void Move(int direction) { var tabTypes = TabOrder;