From 21cf69123cb62f11cb2367ee65923c5346623a81 Mon Sep 17 00:00:00 2001 From: NTG Date: Sun, 17 Aug 2025 16:23:05 +0900 Subject: [PATCH] =?UTF-8?q?ui=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Uis/Elements/Buttons/ItemSlot.prefab | 20 ++ .../Uis/Elements/Buttons/TabButton.prefab | 6 +- .../PopupUis/RestaurantManagementUi.prefab | 252 ++++++++++-------- .../_Addressables/Prefabs/Uis/TabGroup.prefab | 7 +- .../_ScriptAssets/Prefabs/UiManager.prefab | 28 +- Assets/_DDD/_Scripts/GameUi/BasePopupUi.cs | 2 + Assets/_DDD/_Scripts/GameUi/BaseUi.cs | 2 + .../ItemUi/IItemSlotInteractorStrategy.cs | 4 +- .../ItemUi/ItemSlotInteractor.cs | 10 +- .../RestaurantManagementUi.cs | 6 +- .../TabUi/CommonTabButtonUi.cs.meta | 2 - .../TabUi/CommonTabGroupUi.cs.meta | 2 - .../{CommonTabButtonUi.cs => TabButtonUi.cs} | 3 +- .../TabUi/TabButtonUi.cs.meta | 2 + .../{CommonTabGroupUi.cs => TabGroupUi.cs} | 6 +- .../TabUi/TabGroupUi.cs.meta | 2 + .../TodayMenuInteractorStrategy.cs | 8 +- .../TodayCookwareInteractorStrategy.cs | 8 +- 18 files changed, 217 insertions(+), 153 deletions(-) delete mode 100644 Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/CommonTabButtonUi.cs.meta delete mode 100644 Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/CommonTabGroupUi.cs.meta rename Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/{CommonTabButtonUi.cs => TabButtonUi.cs} (96%) create mode 100644 Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabButtonUi.cs.meta rename Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/{CommonTabGroupUi.cs => TabGroupUi.cs} (97%) create mode 100644 Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabGroupUi.cs.meta diff --git a/Assets/_DDD/_Addressables/Prefabs/Uis/Elements/Buttons/ItemSlot.prefab b/Assets/_DDD/_Addressables/Prefabs/Uis/Elements/Buttons/ItemSlot.prefab index 07e8ab750..62d48b230 100644 --- a/Assets/_DDD/_Addressables/Prefabs/Uis/Elements/Buttons/ItemSlot.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/Uis/Elements/Buttons/ItemSlot.prefab @@ -262,14 +262,34 @@ PrefabInstance: propertyPath: m_fontSize value: 28 objectReference: {fileID: 0} + - target: {fileID: 5018155048200938608, guid: 4e6ece2a19dc5204bb37f2182e8d857c, type: 3} + propertyPath: m_fontColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5018155048200938608, guid: 4e6ece2a19dc5204bb37f2182e8d857c, type: 3} + propertyPath: m_fontColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5018155048200938608, guid: 4e6ece2a19dc5204bb37f2182e8d857c, type: 3} + propertyPath: m_fontColor.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5018155048200938608, guid: 4e6ece2a19dc5204bb37f2182e8d857c, type: 3} propertyPath: m_fontSizeBase value: 28 objectReference: {fileID: 0} + - target: {fileID: 5018155048200938608, guid: 4e6ece2a19dc5204bb37f2182e8d857c, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 2100000, guid: 865aa7aee5ed6944fba874808f503978, type: 2} - target: {fileID: 5018155048200938608, guid: 4e6ece2a19dc5204bb37f2182e8d857c, type: 3} propertyPath: m_enableAutoSizing value: 0 objectReference: {fileID: 0} + - target: {fileID: 5018155048200938608, guid: 4e6ece2a19dc5204bb37f2182e8d857c, type: 3} + propertyPath: m_fontColor32.rgba + value: 4294967295 + objectReference: {fileID: 0} - target: {fileID: 5018155048200938608, guid: 4e6ece2a19dc5204bb37f2182e8d857c, type: 3} propertyPath: m_HorizontalAlignment value: 4 diff --git a/Assets/_DDD/_Addressables/Prefabs/Uis/Elements/Buttons/TabButton.prefab b/Assets/_DDD/_Addressables/Prefabs/Uis/Elements/Buttons/TabButton.prefab index 8f9391f8e..e41d311fd 100644 --- a/Assets/_DDD/_Addressables/Prefabs/Uis/Elements/Buttons/TabButton.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/Uis/Elements/Buttons/TabButton.prefab @@ -126,14 +126,14 @@ PrefabInstance: m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 6930594362999665433, guid: 4e6ece2a19dc5204bb37f2182e8d857c, type: 3} insertIndex: -1 - addedObject: {fileID: 8389875582394272808} + addedObject: {fileID: 7362127152242091771} m_SourcePrefab: {fileID: 100100000, guid: 4e6ece2a19dc5204bb37f2182e8d857c, type: 3} --- !u!1 &20944589761710885 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6930594362999665433, guid: 4e6ece2a19dc5204bb37f2182e8d857c, type: 3} m_PrefabInstance: {fileID: 6945678879497254972} m_PrefabAsset: {fileID: 0} ---- !u!114 &8389875582394272808 +--- !u!114 &7362127152242091771 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -142,7 +142,7 @@ MonoBehaviour: m_GameObject: {fileID: 20944589761710885} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dab48428d68382941a9c50967ca788c6, type: 3} + m_Script: {fileID: 11500000, guid: a0323801ed497de44ab53f18c23cc402, type: 3} m_Name: m_EditorClassIdentifier: _button: {fileID: 1035128454163554855} diff --git a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/RestaurantManagementUi.prefab b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/RestaurantManagementUi.prefab index 3f35a0ed8..644a02bc7 100644 --- a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/RestaurantManagementUi.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/RestaurantManagementUi.prefab @@ -571,15 +571,15 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6976887216763693478, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} m_PrefabInstance: {fileID: 100475263793030182} m_PrefabAsset: {fileID: 0} ---- !u!114 &8433595979903363086 stripped +--- !u!114 &7444294172908782301 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8389875582394272808, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} + m_CorrespondingSourceObject: {fileID: 7362127152242091771, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} m_PrefabInstance: {fileID: 100475263793030182} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dab48428d68382941a9c50967ca788c6, type: 3} + m_Script: {fileID: 11500000, guid: a0323801ed497de44ab53f18c23cc402, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1001 &173994714025796772 @@ -1035,6 +1035,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7362127152242091771, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} + propertyPath: _content.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7362127152242091771, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} + propertyPath: '_content.Array.data[0]' + value: + objectReference: {fileID: 7741997075854565809} - target: {fileID: 8389875582394272808, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} propertyPath: _content.Array.size value: 1 @@ -1048,22 +1056,22 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} ---- !u!224 &7484059388139300099 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6976887216763693478, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} - m_PrefabInstance: {fileID: 508442390773730469} - m_PrefabAsset: {fileID: 0} ---- !u!114 &8313797525677277325 stripped +--- !u!114 &7000245333006772830 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8389875582394272808, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} + m_CorrespondingSourceObject: {fileID: 7362127152242091771, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} m_PrefabInstance: {fileID: 508442390773730469} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dab48428d68382941a9c50967ca788c6, type: 3} + m_Script: {fileID: 11500000, guid: a0323801ed497de44ab53f18c23cc402, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &7484059388139300099 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6976887216763693478, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} + m_PrefabInstance: {fileID: 508442390773730469} + m_PrefabAsset: {fileID: 0} --- !u!1001 &537371120847322514 PrefabInstance: m_ObjectHideFlags: 0 @@ -1645,22 +1653,22 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} ---- !u!224 &7872101382914420209 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6976887216763693478, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} - m_PrefabInstance: {fileID: 1003655699496977495} - m_PrefabAsset: {fileID: 0} ---- !u!114 &8755948678055053439 stripped +--- !u!114 &7765951958178177708 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8389875582394272808, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} + m_CorrespondingSourceObject: {fileID: 7362127152242091771, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} m_PrefabInstance: {fileID: 1003655699496977495} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dab48428d68382941a9c50967ca788c6, type: 3} + m_Script: {fileID: 11500000, guid: a0323801ed497de44ab53f18c23cc402, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &7872101382914420209 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6976887216763693478, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} + m_PrefabInstance: {fileID: 1003655699496977495} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1076335789579091115 PrefabInstance: m_ObjectHideFlags: 0 @@ -1681,18 +1689,26 @@ PrefabInstance: propertyPath: _tabButtons.Array.size value: 3 objectReference: {fileID: 0} - - target: {fileID: 1145923760353354570, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} + - target: {fileID: 4600523280764627687, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} + propertyPath: _tabButtonType + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4600523280764627687, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} + propertyPath: _tabButtons.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4600523280764627687, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} propertyPath: '_tabButtons.Array.data[0]' value: - objectReference: {fileID: 5048678772360475557} - - target: {fileID: 1145923760353354570, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} + objectReference: {fileID: 6076998978558859638} + - target: {fileID: 4600523280764627687, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} propertyPath: '_tabButtons.Array.data[1]' value: - objectReference: {fileID: 8313797525677277325} - - target: {fileID: 1145923760353354570, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} + objectReference: {fileID: 7000245333006772830} + - target: {fileID: 4600523280764627687, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} propertyPath: '_tabButtons.Array.data[2]' value: - objectReference: {fileID: 3354650480348987228} + objectReference: {fileID: 4380674300671890831} - target: {fileID: 6226854956448074850, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1789,15 +1805,15 @@ PrefabInstance: addedObject: {fileID: 8305100377523793440} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} ---- !u!114 &74531650346426337 stripped +--- !u!114 &3546512405981124172 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1145923760353354570, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} + m_CorrespondingSourceObject: {fileID: 4600523280764627687, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} m_PrefabInstance: {fileID: 1076335789579091115} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5db33433e61c646458eedb3eb0a5af89, type: 3} + m_Script: {fileID: 11500000, guid: c355ca2df8860b14fb5d4db1f826fe09, type: 3} m_Name: m_EditorClassIdentifier: --- !u!224 &6378735507321483465 stripped @@ -3742,22 +3758,22 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} ---- !u!224 &5187124805331116501 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6976887216763693478, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} - m_PrefabInstance: {fileID: 2823404513867139187} - m_PrefabAsset: {fileID: 0} ---- !u!114 &5998913546545300571 stripped +--- !u!114 &4685213460985605768 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8389875582394272808, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} + m_CorrespondingSourceObject: {fileID: 7362127152242091771, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} m_PrefabInstance: {fileID: 2823404513867139187} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dab48428d68382941a9c50967ca788c6, type: 3} + m_Script: {fileID: 11500000, guid: a0323801ed497de44ab53f18c23cc402, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &5187124805331116501 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6976887216763693478, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} + m_PrefabInstance: {fileID: 2823404513867139187} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2924664401823324489 PrefabInstance: m_ObjectHideFlags: 0 @@ -4770,6 +4786,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7362127152242091771, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} + propertyPath: _content.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7362127152242091771, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} + propertyPath: '_content.Array.data[0]' + value: + objectReference: {fileID: 1938346873105007871} - target: {fileID: 8389875582394272808, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} propertyPath: _content.Array.size value: 1 @@ -4783,22 +4807,22 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} ---- !u!114 &5048678772360475557 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8389875582394272808, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} - m_PrefabInstance: {fileID: 3638435692503924621} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dab48428d68382941a9c50967ca788c6, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!224 &5957329961095632427 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6976887216763693478, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} m_PrefabInstance: {fileID: 3638435692503924621} m_PrefabAsset: {fileID: 0} +--- !u!114 &6076998978558859638 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7362127152242091771, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} + m_PrefabInstance: {fileID: 3638435692503924621} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a0323801ed497de44ab53f18c23cc402, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &3673660849464953255 PrefabInstance: m_ObjectHideFlags: 0 @@ -5872,22 +5896,22 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} ---- !u!114 &5666102442078504690 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8389875582394272808, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} - m_PrefabInstance: {fileID: 4237000229611997914} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dab48428d68382941a9c50967ca788c6, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!224 &6493690075613520764 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6976887216763693478, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} m_PrefabInstance: {fileID: 4237000229611997914} m_PrefabAsset: {fileID: 0} +--- !u!114 &6694423692037876769 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7362127152242091771, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} + m_PrefabInstance: {fileID: 4237000229611997914} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a0323801ed497de44ab53f18c23cc402, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4458270509825951777 PrefabInstance: m_ObjectHideFlags: 0 @@ -6134,9 +6158,9 @@ MonoBehaviour: _enableBlockImage: 1 _inventoryView: {fileID: 3570087040626823091} _itemDetailView: {fileID: 7657801840785021781} - _sectionTabs: {fileID: 74531650346426337} - _menuCategoryTabs: {fileID: 7948590323947572257} - _cookwareCategoryTabs: {fileID: 7764732568729398923} + _sectionTabs: {fileID: 3546512405981124172} + _menuCategoryTabs: {fileID: 6805049896193344908} + _cookwareCategoryTabs: {fileID: 6628923975427483430} _completeBatchFilledImage: {fileID: 2965326806322860544} _holdCompleteTime: 0.5 --- !u!1001 &4530765275021007961 @@ -7986,22 +8010,22 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} ---- !u!114 &3306847272511165935 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8389875582394272808, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} - m_PrefabInstance: {fileID: 6452140351198779847} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dab48428d68382941a9c50967ca788c6, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!224 &4132187363503976545 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6976887216763693478, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} m_PrefabInstance: {fileID: 6452140351198779847} m_PrefabAsset: {fileID: 0} +--- !u!114 &4584977598648368956 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7362127152242091771, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} + m_PrefabInstance: {fileID: 6452140351198779847} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a0323801ed497de44ab53f18c23cc402, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &6548462224101274484 PrefabInstance: m_ObjectHideFlags: 0 @@ -8118,6 +8142,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7362127152242091771, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} + propertyPath: _isEnabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8389875582394272808, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} propertyPath: _isEnabled value: 0 @@ -8127,22 +8155,22 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} ---- !u!114 &3354650480348987228 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8389875582394272808, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} - m_PrefabInstance: {fileID: 6548462224101274484} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dab48428d68382941a9c50967ca788c6, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!224 &4193465089635326674 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6976887216763693478, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} m_PrefabInstance: {fileID: 6548462224101274484} m_PrefabAsset: {fileID: 0} +--- !u!114 &4380674300671890831 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7362127152242091771, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} + m_PrefabInstance: {fileID: 6548462224101274484} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a0323801ed497de44ab53f18c23cc402, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &7036930905034338155 PrefabInstance: m_ObjectHideFlags: 0 @@ -8163,18 +8191,26 @@ PrefabInstance: propertyPath: _tabButtons.Array.size value: 3 objectReference: {fileID: 0} - - target: {fileID: 1145923760353354570, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} + - target: {fileID: 4600523280764627687, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} + propertyPath: _tabButtonType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4600523280764627687, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} + propertyPath: _tabButtons.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4600523280764627687, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} propertyPath: '_tabButtons.Array.data[0]' value: - objectReference: {fileID: 5666102442078504690} - - target: {fileID: 1145923760353354570, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} + objectReference: {fileID: 6694423692037876769} + - target: {fileID: 4600523280764627687, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} propertyPath: '_tabButtons.Array.data[1]' value: - objectReference: {fileID: 8755948678055053439} - - target: {fileID: 1145923760353354570, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} + objectReference: {fileID: 7765951958178177708} + - target: {fileID: 4600523280764627687, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} propertyPath: '_tabButtons.Array.data[2]' value: - objectReference: {fileID: 3306847272511165935} + objectReference: {fileID: 4584977598648368956} - target: {fileID: 6226854956448074850, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -8288,15 +8324,15 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6226854956448074850, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} m_PrefabInstance: {fileID: 7036930905034338155} m_PrefabAsset: {fileID: 0} ---- !u!114 &7948590323947572257 stripped +--- !u!114 &6805049896193344908 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1145923760353354570, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} + m_CorrespondingSourceObject: {fileID: 4600523280764627687, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} m_PrefabInstance: {fileID: 7036930905034338155} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5db33433e61c646458eedb3eb0a5af89, type: 3} + m_Script: {fileID: 11500000, guid: c355ca2df8860b14fb5d4db1f826fe09, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1001 &7161118813591712833 @@ -8401,18 +8437,26 @@ PrefabInstance: propertyPath: _tabButtons.Array.size value: 3 objectReference: {fileID: 0} - - target: {fileID: 1145923760353354570, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} + - target: {fileID: 4600523280764627687, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} + propertyPath: _tabButtonType + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4600523280764627687, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} + propertyPath: _tabButtons.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4600523280764627687, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} propertyPath: '_tabButtons.Array.data[0]' value: - objectReference: {fileID: 5998913546545300571} - - target: {fileID: 1145923760353354570, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} + objectReference: {fileID: 4685213460985605768} + - target: {fileID: 4600523280764627687, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} propertyPath: '_tabButtons.Array.data[1]' value: - objectReference: {fileID: 825907204231041618} - - target: {fileID: 1145923760353354570, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} + objectReference: {fileID: 1815903919823452289} + - target: {fileID: 4600523280764627687, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} propertyPath: '_tabButtons.Array.data[2]' value: - objectReference: {fileID: 8433595979903363086} + objectReference: {fileID: 7444294172908782301} - target: {fileID: 6226854956448074850, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -8526,15 +8570,15 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6226854956448074850, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} m_PrefabInstance: {fileID: 7216733317772545473} m_PrefabAsset: {fileID: 0} ---- !u!114 &7764732568729398923 stripped +--- !u!114 &6628923975427483430 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1145923760353354570, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} + m_CorrespondingSourceObject: {fileID: 4600523280764627687, guid: a284a9a7a57a0a741ad4515b8b6f5e2e, type: 3} m_PrefabInstance: {fileID: 7216733317772545473} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5db33433e61c646458eedb3eb0a5af89, type: 3} + m_Script: {fileID: 11500000, guid: c355ca2df8860b14fb5d4db1f826fe09, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1001 &7237889658343096766 @@ -11091,15 +11135,15 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} ---- !u!114 &825907204231041618 stripped +--- !u!114 &1815903919823452289 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8389875582394272808, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} + m_CorrespondingSourceObject: {fileID: 7362127152242091771, guid: b8766f1471289d74bbcdc2f5ad979e8b, type: 3} m_PrefabInstance: {fileID: 9158322033945550458} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dab48428d68382941a9c50967ca788c6, type: 3} + m_Script: {fileID: 11500000, guid: a0323801ed497de44ab53f18c23cc402, type: 3} m_Name: m_EditorClassIdentifier: --- !u!224 &2290648482536290268 stripped diff --git a/Assets/_DDD/_Addressables/Prefabs/Uis/TabGroup.prefab b/Assets/_DDD/_Addressables/Prefabs/Uis/TabGroup.prefab index 17ea9e941..5578fa277 100644 --- a/Assets/_DDD/_Addressables/Prefabs/Uis/TabGroup.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/Uis/TabGroup.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6226854956448074850} - - component: {fileID: 1145923760353354570} + - component: {fileID: 4600523280764627687} m_Layer: 5 m_Name: TabGroup m_TagString: Untagged @@ -36,7 +36,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1145923760353354570 +--- !u!114 &4600523280764627687 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -45,9 +45,8 @@ MonoBehaviour: m_GameObject: {fileID: 8746605592876565619} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5db33433e61c646458eedb3eb0a5af89, type: 3} + m_Script: {fileID: 11500000, guid: c355ca2df8860b14fb5d4db1f826fe09, type: 3} m_Name: m_EditorClassIdentifier: - _tabGroupType: 0 _tabButtons: [] _tabButtonType: 0 diff --git a/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab index 2e4cf62c7..8ad216b33 100644 --- a/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab +++ b/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab @@ -2075,27 +2075,27 @@ PrefabInstance: m_Modifications: - target: {fileID: 406949708214431379, guid: 0e98ef50b8f3f1544a489a07c7c1e689, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 406949708214431379, guid: 0e98ef50b8f3f1544a489a07c7c1e689, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 406949708214431379, guid: 0e98ef50b8f3f1544a489a07c7c1e689, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 244.5 objectReference: {fileID: 0} - target: {fileID: 406949708214431379, guid: 0e98ef50b8f3f1544a489a07c7c1e689, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 76 objectReference: {fileID: 0} - target: {fileID: 406949708214431379, guid: 0e98ef50b8f3f1544a489a07c7c1e689, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 409.75 objectReference: {fileID: 0} - target: {fileID: 406949708214431379, guid: 0e98ef50b8f3f1544a489a07c7c1e689, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -88 objectReference: {fileID: 0} - target: {fileID: 953076962193729772, guid: 0e98ef50b8f3f1544a489a07c7c1e689, type: 3} propertyPath: m_Name @@ -2103,7 +2103,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4043685483847034266, guid: 0e98ef50b8f3f1544a489a07c7c1e689, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4393723630262666797, guid: 0e98ef50b8f3f1544a489a07c7c1e689, type: 3} propertyPath: m_SizeDelta.x @@ -2111,27 +2111,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5141905932541103990, guid: 0e98ef50b8f3f1544a489a07c7c1e689, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5141905932541103990, guid: 0e98ef50b8f3f1544a489a07c7c1e689, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5141905932541103990, guid: 0e98ef50b8f3f1544a489a07c7c1e689, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 244.5 objectReference: {fileID: 0} - target: {fileID: 5141905932541103990, guid: 0e98ef50b8f3f1544a489a07c7c1e689, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 76 objectReference: {fileID: 0} - target: {fileID: 5141905932541103990, guid: 0e98ef50b8f3f1544a489a07c7c1e689, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 150.25 objectReference: {fileID: 0} - target: {fileID: 5141905932541103990, guid: 0e98ef50b8f3f1544a489a07c7c1e689, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -88 objectReference: {fileID: 0} - target: {fileID: 7437916652043529639, guid: 0e98ef50b8f3f1544a489a07c7c1e689, type: 3} propertyPath: m_Pivot.x @@ -2215,7 +2215,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7713828080625584992, guid: 0e98ef50b8f3f1544a489a07c7c1e689, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/_DDD/_Scripts/GameUi/BasePopupUi.cs b/Assets/_DDD/_Scripts/GameUi/BasePopupUi.cs index c129f25cd..28901bfe2 100644 --- a/Assets/_DDD/_Scripts/GameUi/BasePopupUi.cs +++ b/Assets/_DDD/_Scripts/GameUi/BasePopupUi.cs @@ -19,6 +19,8 @@ protected override void Update() { base.Update(); + if (IsOpenPanel() == false) return; + var currentSelectedGameObject = EventSystem.current.currentSelectedGameObject; if (currentSelectedGameObject == null || currentSelectedGameObject.activeInHierarchy == false) { diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi.cs index 6c1ebfa9a..448195596 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi.cs +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi.cs @@ -74,5 +74,7 @@ public virtual void SetUiInteractable(bool active) _canvasGroup.interactable = active; _canvasGroup.blocksRaycasts = active; } + + public bool IsOpenPanel() => _panel.activeInHierarchy; } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs index 3f9061944..b1167debe 100644 --- a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs +++ b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs @@ -2,7 +2,7 @@ namespace DDD { public interface IItemSlotInteractorStrategy { - void OnAdded(ItemSlotUi itemSlotUi, RestaurantManagementStateSo restaurantManagementStateSo); - void OnRemoved(ItemSlotUi itemSlotUi, RestaurantManagementStateSo restaurantManagementStateSo); + void OnAdded(ItemSlotUi itemSlotUi); + void OnRemoved(ItemSlotUi itemSlotUi); } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs index daf388bab..1059d2c1f 100644 --- a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs +++ b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs @@ -15,7 +15,6 @@ public enum TodayMenuEventType public class ItemSlotInteractor : MonoBehaviour, IInteractableUi { private ItemSlotUi _itemSlotUi; - private RestaurantManagementStateSo restaurantManagementStateSo; private TodayMenuEventType _todayMenuEventType = TodayMenuEventType.None; @@ -30,8 +29,6 @@ public void Initialize(TodayMenuEventType todayMenuEventType, IItemSlotInteracto { _todayMenuEventType = todayMenuEventType; Strategy = strategy; - - restaurantManagementStateSo = RestaurantState.instance.ManagementState; } public void OnInteract() @@ -39,14 +36,13 @@ public void OnInteract() switch (_todayMenuEventType) { case TodayMenuEventType.Add: - Strategy.OnAdded(_itemSlotUi, restaurantManagementStateSo); + Strategy.OnAdded(_itemSlotUi); break; case TodayMenuEventType.Remove: - Strategy.OnRemoved(_itemSlotUi, restaurantManagementStateSo); + Strategy.OnRemoved(_itemSlotUi); break; - case TodayMenuEventType.None: default: - throw new ArgumentOutOfRangeException(); + break; } } } diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/RestaurantManagementUi.cs b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/RestaurantManagementUi.cs index fa8fe5383..63e04787f 100644 --- a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/RestaurantManagementUi.cs +++ b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/RestaurantManagementUi.cs @@ -11,9 +11,9 @@ public class RestaurantManagementUi : PopupUi, IEventHandle { [SerializeField] private InventoryView _inventoryView; [SerializeField] private ItemDetailView _itemDetailView; - [SerializeField] private CommonTabGroupUi _sectionTabs; - [SerializeField] private CommonTabGroupUi _menuCategoryTabs; - [SerializeField] private CommonTabGroupUi _cookwareCategoryTabs; + [SerializeField] private TabGroupUi _sectionTabs; + [SerializeField] private TabGroupUi _menuCategoryTabs; + [SerializeField] private TabGroupUi _cookwareCategoryTabs; [SerializeField] private Image _completeBatchFilledImage; diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/CommonTabButtonUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/CommonTabButtonUi.cs.meta deleted file mode 100644 index 6513da7a2..000000000 --- a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/CommonTabButtonUi.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: dab48428d68382941a9c50967ca788c6 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/CommonTabGroupUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/CommonTabGroupUi.cs.meta deleted file mode 100644 index f09264daa..000000000 --- a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/CommonTabGroupUi.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 5db33433e61c646458eedb3eb0a5af89 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/CommonTabButtonUi.cs b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabButtonUi.cs similarity index 96% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/CommonTabButtonUi.cs rename to Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabButtonUi.cs index 9c1f7d54d..23f8f50d8 100644 --- a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/CommonTabButtonUi.cs +++ b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabButtonUi.cs @@ -28,7 +28,7 @@ public enum InventoryCategoryType /// 공통 탭 버튼 UI 클래스 /// 제네릭 없이 탭을 관리합니다. /// - public class CommonTabButtonUi : MonoBehaviour, IInteractableUi, ITabButton + public class TabButtonUi : MonoBehaviour, IInteractableUi, ITabButton { [SerializeField] private Button _button; [SerializeField] private Animator _animator; @@ -76,6 +76,7 @@ public void SetSelected(bool isSelected) _isSelected = isSelected; SetActiveContents(isSelected); + _button.interactable = _isSelected == false; if (_isSelected == true) { diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabButtonUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabButtonUi.cs.meta new file mode 100644 index 000000000..4685b98c9 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabButtonUi.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a0323801ed497de44ab53f18c23cc402 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/CommonTabGroupUi.cs b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabGroupUi.cs similarity index 97% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/CommonTabGroupUi.cs rename to Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabGroupUi.cs index f9e259e02..c3d68cea3 100644 --- a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/CommonTabGroupUi.cs +++ b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabGroupUi.cs @@ -25,15 +25,15 @@ public enum TabButtonType /// 공통 탭 그룹 UI 클래스 /// 제네릭 없이 탭을 관리합니다. /// - public class CommonTabGroupUi : MonoBehaviour + public class TabGroupUi : MonoBehaviour { [Header("정적 배치된 탭 버튼들")] - [SerializeField] private List _tabButtons = new(); + [SerializeField] private List _tabButtons = new(); [Header("탭 버튼 타입 설정")] [SerializeField] private TabButtonType _tabButtonType = TabButtonType.None; - private Dictionary _tabLookup = new(); + private Dictionary _tabLookup = new(); // 그룹별 기본 허용 값 정의 (List로 통일하여 일관성 확보) private static readonly Dictionary> TabButtonConfig = new() diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabGroupUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabGroupUi.cs.meta new file mode 100644 index 000000000..29535b284 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabGroupUi.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c355ca2df8860b14fb5d4db1f826fe09 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs index 32ec35b4e..5b0739b2a 100644 --- a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs +++ b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs @@ -4,13 +4,13 @@ namespace DDD { public class TodayMenuInteractorStrategy : IItemSlotInteractorStrategy { - public void OnAdded(ItemSlotUi itemSlotUi, RestaurantManagementStateSo restaurantManagementStateSo) + public void OnAdded(ItemSlotUi itemSlotUi) { if (itemSlotUi.Strategy is not InventorySlotUiStrategy inventorySlotUiStrategy) return; if (inventorySlotUiStrategy.CanCrafting(itemSlotUi)) { - restaurantManagementStateSo.TryAddTodayMenu(itemSlotUi.Model); + RestaurantState.instance.ManagementState.TryAddTodayMenu(itemSlotUi.Model); } else { @@ -21,11 +21,11 @@ public void OnAdded(ItemSlotUi itemSlotUi, RestaurantManagementStateSo restauran } } - public void OnRemoved(ItemSlotUi itemSlotUi, RestaurantManagementStateSo restaurantManagementStateSo) + public void OnRemoved(ItemSlotUi itemSlotUi) { if (itemSlotUi.Strategy is InventorySlotUiStrategy) return; - restaurantManagementStateSo.TryRemoveTodayMenu(itemSlotUi.Model); + RestaurantState.instance.ManagementState.TryRemoveTodayMenu(itemSlotUi.Model); } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs index c871e8965..c264c502e 100644 --- a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs +++ b/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs @@ -4,13 +4,13 @@ namespace DDD { public class TodayCookwareInteractorStrategy : IItemSlotInteractorStrategy { - public void OnAdded(ItemSlotUi itemSlotUi, RestaurantManagementStateSo restaurantManagementStateSo) + public void OnAdded(ItemSlotUi itemSlotUi) { if (itemSlotUi.Strategy is not InventorySlotUiStrategy inventorySlotUiStrategy) return; if (inventorySlotUiStrategy.CanCrafting(itemSlotUi)) { - restaurantManagementStateSo.TryAddTodayCookware(itemSlotUi.Model); + RestaurantState.instance.ManagementState.TryAddTodayCookware(itemSlotUi.Model); } else { @@ -21,11 +21,11 @@ public void OnAdded(ItemSlotUi itemSlotUi, RestaurantManagementStateSo restauran } } - public void OnRemoved(ItemSlotUi itemSlotUi, RestaurantManagementStateSo restaurantManagementStateSo) + public void OnRemoved(ItemSlotUi itemSlotUi) { if (itemSlotUi.Strategy is InventorySlotUiStrategy) return; - restaurantManagementStateSo.TryRemoveTodayCookware(itemSlotUi.Model); + RestaurantState.instance.ManagementState.TryRemoveTodayCookware(itemSlotUi.Model); } } } \ No newline at end of file