From cb2970b897d8eff1ec2aed803981eee9f7b115c3 Mon Sep 17 00:00:00 2001 From: NTG Date: Mon, 18 Aug 2025 13:26:18 +0900 Subject: [PATCH] =?UTF-8?q?UiManager=20PopupState=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PopupUis/RestaurantManagementUi.prefab | 47 +- .../_DDD/_Addressables/So/PopupUiState.asset | 3 + .../_Addressables/So/PopupUiState.asset.meta | 8 + .../_ScriptAssets/Prefabs/UiManager.prefab | 590 +----------------- Assets/_DDD/_Scripts/GameUi/PopupUi.meta | 8 + .../GameUi/{ => PopupUi}/BasePopupUi.cs | 0 .../GameUi/{ => PopupUi}/BasePopupUi.cs.meta | 0 .../_Scripts/GameUi/{ => PopupUi}/PopupUi.cs | 8 +- .../GameUi/{ => PopupUi}/PopupUi.cs.meta | 0 .../_Scripts/GameUi/PopupUi/PopupUiState.cs | 196 ++++++ .../GameUi/PopupUi/PopupUiState.cs.meta | 2 + .../{ => PopupUi}/RestaurantManagementUi.meta | 0 .../RestaurantManagementUi/ChecklistData.cs | 0 .../ChecklistData.cs.meta | 0 .../RestaurantManagementUi/ChecklistView.cs | 0 .../ChecklistView.cs.meta | 0 .../RestaurantManagementUi/ExtensionsUi.meta | 0 .../ExtensionsUi/CraftingHelper.cs | 0 .../ExtensionsUi/CraftingHelper.cs.meta | 0 .../ExtensionsUi/DrinkDataExtensions.cs | 0 .../ExtensionsUi/DrinkDataExtensions.cs.meta | 0 .../ExtensionsUi/FoodDataExtensions.cs | 0 .../ExtensionsUi/FoodDataExtensions.cs.meta | 0 .../RestaurantManagementUi/InventoryUi.meta | 0 .../InventoryUi/InventorySlotUiStrategy.cs | 0 .../InventorySlotUiStrategy.cs.meta | 0 .../InventoryUi/InventoryView.cs | 0 .../InventoryUi/InventoryView.cs.meta | 0 .../RestaurantManagementUi/ItemDetailView.cs | 0 .../ItemDetailView.cs.meta | 0 .../RestaurantManagementUi/ItemUi.meta | 0 .../ItemUi/IInteractableUi.cs | 0 .../ItemUi/IInteractableUi.cs.meta | 0 .../ItemUi/IItemSlotInteractorStrategy.cs | 0 .../IItemSlotInteractorStrategy.cs.meta | 0 .../ItemUi/IItemSlotUiStrategy.cs | 0 .../ItemUi/IItemSlotUiStrategy.cs.meta | 0 .../ItemUi/IngredientEntry.cs | 0 .../ItemUi/IngredientEntry.cs.meta | 0 .../ItemUi/ItemSlotInteractor.cs | 0 .../ItemUi/ItemSlotInteractor.cs.meta | 0 .../ItemUi/ItemSlotUi.cs | 0 .../ItemUi/ItemSlotUi.cs.meta | 0 .../ItemUi/ItemViewModel.cs | 0 .../ItemUi/ItemViewModel.cs.meta | 0 .../ItemUi/ItemViewModelFactory.cs | 0 .../ItemUi/ItemViewModelFactory.cs.meta | 0 .../RestaurantManagementUi.cs | 4 + .../RestaurantManagementUi.cs.meta | 0 .../RestaurantManagementUi/TabUi.meta | 0 .../TabUi/ITabButton.cs | 0 .../TabUi/ITabButton.cs.meta | 0 .../TabUi/TabButtonUi.cs | 0 .../TabUi/TabButtonUi.cs.meta | 0 .../TabUi/TabGroupUi.cs | 0 .../TabUi/TabGroupUi.cs.meta | 0 .../TasteHashTagSlotUi.cs | 0 .../TasteHashTagSlotUi.cs.meta | 0 .../RestaurantManagementUi/TodayMenuUi.meta | 0 .../TodayMenuInteractorStrategy.cs | 0 .../TodayMenuInteractorStrategy.cs.meta | 0 .../TodayMenuUi/TodayMenuSlotUiStrategy.cs | 0 .../TodayMenuSlotUiStrategy.cs.meta | 0 .../TodayMenuUi/TodayMenuView.cs | 7 +- .../TodayMenuUi/TodayMenuView.cs.meta | 0 .../TodayRestaurantStateUi.meta | 0 .../TodayCookwareInteractorStrategy.cs | 0 .../TodayCookwareInteractorStrategy.cs.meta | 0 .../TodayCookwareSlotUiStrategy.cs | 0 .../TodayCookwareSlotUiStrategy.cs.meta | 0 .../TodayRestaurantStateView.cs | 7 +- .../TodayRestaurantStateView.cs.meta | 0 .../TodayWorkerSlotUiStrategy.cs | 0 .../TodayWorkerSlotUiStrategy.cs.meta | 0 Assets/_DDD/_Scripts/GameUi/UiManager.cs | 158 +---- 75 files changed, 273 insertions(+), 765 deletions(-) create mode 100644 Assets/_DDD/_Addressables/So/PopupUiState.asset create mode 100644 Assets/_DDD/_Addressables/So/PopupUiState.asset.meta create mode 100644 Assets/_DDD/_Scripts/GameUi/PopupUi.meta rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/BasePopupUi.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/BasePopupUi.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/PopupUi.cs (93%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/PopupUi.cs.meta (100%) create mode 100644 Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUiState.cs create mode 100644 Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUiState.cs.meta rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ChecklistData.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ChecklistData.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ChecklistView.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ChecklistView.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ExtensionsUi.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/InventoryUi.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/InventoryUi/InventoryView.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/InventoryUi/InventoryView.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ItemDetailView.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ItemDetailView.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ItemUi.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ItemUi/IInteractableUi.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ItemUi/IInteractableUi.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ItemUi/IngredientEntry.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ItemUi/IngredientEntry.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ItemUi/ItemSlotUi.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ItemUi/ItemSlotUi.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ItemUi/ItemViewModel.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ItemUi/ItemViewModel.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/RestaurantManagementUi.cs (97%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/RestaurantManagementUi.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TabUi.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TabUi/ITabButton.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TabUi/ITabButton.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TabUi/TabButtonUi.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TabUi/TabButtonUi.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TabUi/TabGroupUi.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TabUi/TabGroupUi.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TasteHashTagSlotUi.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TasteHashTagSlotUi.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TodayMenuUi.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs (97%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TodayRestaurantStateUi.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs (97%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs.meta (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs (100%) rename Assets/_DDD/_Scripts/GameUi/{ => PopupUi}/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs.meta (100%) diff --git a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/RestaurantManagementUi.prefab b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/RestaurantManagementUi.prefab index 4f6884314..e5af66f89 100644 --- a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/RestaurantManagementUi.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/RestaurantManagementUi.prefab @@ -208,9 +208,9 @@ RectTransform: - {fileID: 4147204719077067979} m_Father: {fileID: 8461276653178463723} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 57, y: -180} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -903, y: -180} m_SizeDelta: {x: 434, y: 196} m_Pivot: {x: 0, y: 1} --- !u!114 &7075966153492927588 @@ -225,10 +225,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e765c62d234d09447bff001041f3dea6, type: 3} m_Name: m_EditorClassIdentifier: - _checklistDatas: - - {fileID: 3908811868213848487} - - {fileID: 4812873435592921710} - - {fileID: 9187649107023762485} --- !u!1 &4608547885265804944 GameObject: m_ObjectHideFlags: 0 @@ -1825,17 +1821,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 316b8444431f7a1428ed2909a24101af, type: 3} ---- !u!114 &3908811868213848487 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4231722110417992964, guid: 316b8444431f7a1428ed2909a24101af, type: 3} - m_PrefabInstance: {fileID: 902122324790531235} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 41c34de536bd056418be66a7c5899017, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!224 &7963895422363572388 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7062079384609475591, guid: 316b8444431f7a1428ed2909a24101af, type: 3} @@ -6343,9 +6328,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _enableBlockImage: 1 - _checklistView: {fileID: 0} + _checklistView: {fileID: 7075966153492927588} _inventoryView: {fileID: 3570087040626823091} _itemDetailView: {fileID: 7657801840785021781} + _todayMenuView: {fileID: 6989931530457575163} + _todayRestaurantStateView: {fileID: 6416358001397717619} _sectionTabs: {fileID: 3546512405981124172} _menuCategoryTabs: {fileID: 6805049896193344908} _cookwareCategoryTabs: {fileID: 6628923975427483430} @@ -6690,17 +6677,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 7062079384609475591, guid: 316b8444431f7a1428ed2909a24101af, type: 3} m_PrefabInstance: {fileID: 4988597479058925873} m_PrefabAsset: {fileID: 0} ---- !u!114 &9187649107023762485 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4231722110417992964, guid: 316b8444431f7a1428ed2909a24101af, type: 3} - m_PrefabInstance: {fileID: 4988597479058925873} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 41c34de536bd056418be66a7c5899017, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &5072949612917133830 PrefabInstance: m_ObjectHideFlags: 0 @@ -11169,17 +11145,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 7062079384609475591, guid: 316b8444431f7a1428ed2909a24101af, type: 3} m_PrefabInstance: {fileID: 8678676404970155882} m_PrefabAsset: {fileID: 0} ---- !u!114 &4812873435592921710 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4231722110417992964, guid: 316b8444431f7a1428ed2909a24101af, type: 3} - m_PrefabInstance: {fileID: 8678676404970155882} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 41c34de536bd056418be66a7c5899017, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &8730773236163191470 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/_DDD/_Addressables/So/PopupUiState.asset b/Assets/_DDD/_Addressables/So/PopupUiState.asset new file mode 100644 index 000000000..10268a2da --- /dev/null +++ b/Assets/_DDD/_Addressables/So/PopupUiState.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd4e291d895647a4d067c88ad56775db752545db471dbcb275f8ebebe7a0e131 +size 1325 diff --git a/Assets/_DDD/_Addressables/So/PopupUiState.asset.meta b/Assets/_DDD/_Addressables/So/PopupUiState.asset.meta new file mode 100644 index 000000000..e332490c3 --- /dev/null +++ b/Assets/_DDD/_Addressables/So/PopupUiState.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd182535820ec034b9d5a0315f93fa26 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab b/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab index 012183a13..ea691fd7e 100644 --- a/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab +++ b/Assets/_DDD/_ScriptAssets/Prefabs/UiManager.prefab @@ -218,6 +218,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _persistent: 1 + _popupUiState: + m_AssetGUID: dd182535820ec034b9d5a0315f93fa26 + m_SubObjectName: + m_SubObjectType: + m_SubObjectGUID: + m_EditorAssetChanged: 1 + _popupUiRoot: {fileID: 4347279445921954555} --- !u!1001 &3271462863832123862 PrefabInstance: m_ObjectHideFlags: 0 @@ -376,62 +383,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4347279445921954555} m_Modifications: - - target: {fileID: 80291878783711167, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 80291878783711167, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 80291878783711167, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 80291878783711167, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 80291878783711167, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128646933511594824, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 128646933511594824, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 281332789337621687, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 281332789337621687, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 331473022111874833, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 331473022111874833, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 331473022111874833, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 226.01 - objectReference: {fileID: 0} - - target: {fileID: 331473022111874833, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.y - value: 29.39 - objectReference: {fileID: 0} - - target: {fileID: 331473022111874833, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.y - value: -67.085 - objectReference: {fileID: 0} - target: {fileID: 402610462582345468, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -456,30 +407,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 521207274081471369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 521207274081471369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 521207274081471369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 521207274081471369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 521207274081471369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 521207274081471369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 530867332548447273, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_Size value: 1 @@ -492,18 +419,6 @@ PrefabInstance: propertyPath: m_Navigation.m_Mode value: 0 objectReference: {fileID: 0} - - target: {fileID: 672796584591173111, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 672796584591173111, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 672796584591173111, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 692316267265679943, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_SizeDelta.y value: 0 @@ -580,58 +495,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -21.5 objectReference: {fileID: 0} - - target: {fileID: 1274207396512113243, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1274207396512113243, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1274207396512113243, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1274207396512113243, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1318707529086154565, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1318707529086154565, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1318707529086154565, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1318707529086154565, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1318707529086154565, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1406630130673764320, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1406630130673764320, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1406630130673764320, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1406630130673764320, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1691720683980765368, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -712,30 +575,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1968542374183748313, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1968542374183748313, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1968542374183748313, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1968542374183748313, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1968542374183748313, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1968542374183748313, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1977031121477196991, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -784,50 +623,6 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2387625080349049651, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2387625080349049651, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2387625080349049651, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2387625080349049651, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2387625080349049651, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2387625080349049651, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2417708160092588282, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2417708160092588282, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2417708160092588282, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2417708160092588282, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2438716745211137680, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: _checklistView - value: - objectReference: {fileID: 6757749603460973033} - target: {fileID: 2533972730564147638, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -896,38 +691,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3026271604112601182, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3026271604112601182, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3026271604112601182, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3128855240455720927, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3128855240455720927, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3128855240455720927, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 116.35 - objectReference: {fileID: 0} - - target: {fileID: 3128855240455720927, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 58.175 - objectReference: {fileID: 0} - - target: {fileID: 3128855240455720927, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.y - value: -2 - objectReference: {fileID: 0} - target: {fileID: 3416312790082446483, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -952,30 +715,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -24.5 objectReference: {fileID: 0} - - target: {fileID: 3523979255206053824, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3523979255206053824, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3523979255206053824, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3523979255206053824, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3523979255206053824, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3523979255206053824, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3640084576764429812, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1084,22 +823,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4036711961197890410, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4036711961197890410, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4036711961197890410, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4036711961197890410, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4077787401175619061, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1216,14 +939,6 @@ PrefabInstance: propertyPath: m_Navigation.m_Mode value: 0 objectReference: {fileID: 0} - - target: {fileID: 4350667809177241520, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4350667809177241520, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4362623042029436051, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1264,30 +979,6 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4679813713314604769, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4679813713314604769, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4679813713314604769, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4679813713314604769, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4679813713314604769, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4679813713314604769, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5033948862314120186, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1424,30 +1115,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -25 objectReference: {fileID: 0} - - target: {fileID: 5583958938396664818, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5583958938396664818, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5583958938396664818, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5583958938396664818, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5583958938396664818, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5583958938396664818, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5646014643746221419, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1536,26 +1203,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5881650120089621552, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5881650120089621552, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5881650120089621552, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 66.4 - objectReference: {fileID: 0} - - target: {fileID: 5881650120089621552, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 115.600006 - objectReference: {fileID: 0} - - target: {fileID: 5881650120089621552, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.y - value: -21.5 - objectReference: {fileID: 0} - target: {fileID: 5957329961095632427, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1608,14 +1255,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6331095795691694274, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6331095795691694274, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6344275985555570161, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_text value: Q @@ -1728,26 +1367,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6670211813776540580, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6670211813776540580, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6670211813776540580, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6670211813776540580, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6670211813776540580, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6707899588539731142, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1804,26 +1423,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 6979582802728932958, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6979582802728932958, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6979582802728932958, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 24 - objectReference: {fileID: 0} - - target: {fileID: 6979582802728932958, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.y - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 6979582802728932958, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 73.08 - objectReference: {fileID: 0} - target: {fileID: 7030673648259409502, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -1860,26 +1459,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7112215723407477130, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7112215723407477130, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7112215723407477130, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7112215723407477130, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7112215723407477130, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7157700339803392859, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1924,38 +1503,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -4.6550007 objectReference: {fileID: 0} - - target: {fileID: 7307821376800175486, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7307821376800175486, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7307821376800175486, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7307821376800175486, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7307821376800175486, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7307821376800175486, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7355900029339508008, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_Size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7355900029339508008, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_Value - value: 0.022801302 - objectReference: {fileID: 0} - target: {fileID: 7484059388139300099, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2004,10 +1551,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7552805847435424582, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 293.1596 - objectReference: {fileID: 0} - target: {fileID: 7598092264476464056, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -2080,50 +1623,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7984765781074194439, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7984765781074194439, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7984765781074194439, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7984765781074194439, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7984765781074194439, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8041121093090562143, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8041121093090562143, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8041121093090562143, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8041121093090562143, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8041121093090562143, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8041121093090562143, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8106125910961152496, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2148,30 +1647,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8217971899783076871, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8217971899783076871, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8217971899783076871, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8217971899783076871, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8217971899783076871, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8217971899783076871, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8305100377523793440, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -2248,46 +1723,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -21.5 objectReference: {fileID: 0} - - target: {fileID: 8732577632134111369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8732577632134111369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8732577632134111369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.x - value: 45.14 - objectReference: {fileID: 0} - - target: {fileID: 8732577632134111369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_SizeDelta.y - value: 45 - objectReference: {fileID: 0} - - target: {fileID: 8732577632134111369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 22.57 - objectReference: {fileID: 0} - - target: {fileID: 8732577632134111369, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8752052237749703284, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8752052237749703284, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8752052237749703284, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8752052237749703284, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8773288080417041969, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -2323,17 +1758,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 4003376255966605935, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} m_PrefabInstance: {fileID: 4610200355667842445} m_PrefabAsset: {fileID: 0} ---- !u!114 &6757749603460973033 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7075966153492927588, guid: 1804d4a9b5156fb4fab4ef0464ee226b, type: 3} - m_PrefabInstance: {fileID: 4610200355667842445} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e765c62d234d09447bff001041f3dea6, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &5373576770822278816 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi.meta new file mode 100644 index 000000000..daa98e3ac --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/PopupUi.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 563e491da99f98d4784895535548d23d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/GameUi/BasePopupUi.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/BasePopupUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BasePopupUi.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/BasePopupUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BasePopupUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/BasePopupUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BasePopupUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/BasePopupUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUi.cs similarity index 93% rename from Assets/_DDD/_Scripts/GameUi/PopupUi.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUi.cs index 8b7fb5018..3e0377e2c 100644 --- a/Assets/_DDD/_Scripts/GameUi/PopupUi.cs +++ b/Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUi.cs @@ -24,7 +24,7 @@ public abstract class PopupUi : BasePopupUi where T : Enum protected readonly List<(InputAction action, Action handler)> _registeredHandlers = new(); public override InputActionMaps InputActionMaps => _baseUiActionsInputBindingSo.InputActionMaps; - private bool _isTopPopup => UiManager.Instance.IsTopPopup(this); + private bool _isTopPopup => UiManager.Instance.PopupUiState.IsTopPopup(this); private const string InputBindingSo = "InputBindingSo"; @@ -32,7 +32,7 @@ protected override async void TryRegister() { base.TryRegister(); - UiManager.Instance.RegisterPopupUI(this); + UiManager.Instance?.PopupUiState?.RegisterPopupUI(this); string addressableKey = $"{GetType().Name}_{typeof(T).Name}_{InputBindingSo}"; _baseUiActionsInputBindingSo = await AssetManager.LoadAsset>(addressableKey); @@ -73,7 +73,7 @@ protected override async void TryRegister() protected override void TryUnregister() { base.TryUnregister(); - UiManager.Instance.UnregisterPopupUI(this); + UiManager.Instance?.PopupUiState?.UnregisterPopupUI(this); foreach (var (action, handler) in _registeredHandlers) { @@ -94,7 +94,7 @@ public override void Open(OpenPopupUiEvent evt) transform.SetAsLastSibling(); - if (UiManager.Instance.IsTopPopup(this)) + if (UiManager.Instance.PopupUiState.IsTopPopup(this)) { InputManager.Instance.SwitchCurrentActionMap(_baseUiActionsInputBindingSo.InputActionMaps); } diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUiState.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUiState.cs new file mode 100644 index 000000000..6b737267c --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUiState.cs @@ -0,0 +1,196 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace DDD +{ + [CreateAssetMenu(fileName = "PopupUiState", menuName = "GameUi/PopupUiState")] + public class PopupUiState : SerializedScriptableObject, IEventHandler, IEventHandler + { + public Dictionary> FlowToPopupUiMapping = new(); + + [Title("디버그")] + [ReadOnly, ShowInInspector] private readonly Dictionary _popupUis = new(); + [ReadOnly, ShowInInspector] private readonly Stack _popupUiStack = new(); + [ReadOnly, SerializeField] private InputActionMaps _previousActionMap = InputActionMaps.None; + + private void OnDisable() + { + EventBus.Unregister(this); + EventBus.Unregister(this); + } + + public void Initialize() + { + EventBus.Register(this); + EventBus.Register(this); + + _popupUis.Clear(); + _popupUiStack.Clear(); + } + + public void RegisterPopupUI(BasePopupUi ui) + { + var type = ui.GetType(); + _popupUis.TryAdd(type, ui); + } + + public void UnregisterPopupUI(BasePopupUi ui) + { + var type = ui.GetType(); + if (_popupUis.TryGetValue(type, out var registered) && registered == ui) + { + _popupUis.Remove(type); + } + } + + public void Invoke(OpenPopupUiEvent evt) + { + if (_popupUis.TryGetValue(evt.UiType, out var popup)) + { + if (!popup.IsOpen) + { + PushPopup(popup); + popup.Open(evt); + + if (popup.IsBlockingTime) + { + var timeScaleChangeEvent = GameEvents.RequestTimeScaleChangeEvent; + timeScaleChangeEvent.Requester = popup; + timeScaleChangeEvent.NewTimeScale = 0f; + EventBus.Broadcast(timeScaleChangeEvent); + } + } + } + } + + public void Invoke(ClosePopupUiEvent evt) + { + if (_popupUis.TryGetValue(evt.UiType, out var popup)) + { + if (popup.IsOpen) + { + popup.ClosePanel(); + PopPopup(popup); + + if (popup.IsBlockingTime) + { + var timeScaleChangeEvent = GameEvents.RequestTimeScaleChangeEvent; + timeScaleChangeEvent.Requester = popup; + timeScaleChangeEvent.NewTimeScale = 1f; + EventBus.Broadcast(timeScaleChangeEvent); + } + } + } + } + + public void CreatePopup(BasePopupUi popup, Transform parent) + { + if (_popupUis.TryGetValue(popup.GetType(), out var registered) && registered == popup) return; + + var instance = Instantiate(popup, parent); + instance.name = popup.name; + } + + public void DestroyPopup(BasePopupUi popup) + { + if (_popupUis.TryGetValue(popup.GetType(), out var registered) == false || registered != popup) return; + + Destroy(popup.gameObject); + } + + public List GetMatchingPopupUis(GameFlowState flowState) + { + return FlowToPopupUiMapping + .Where(keyValuePair => (keyValuePair.Key & flowState) != 0) + .SelectMany(keyValuePair => keyValuePair.Value) + .ToList(); + } + + public bool HasMatchingPopupUis(GameFlowState flowState) + { + return FlowToPopupUiMapping.Any(keyValuePair => (keyValuePair.Key & flowState) != 0); + } + + public void CreateMatchingPopupUis(GameFlowState flowState, Transform parent) + { + var matchingPopupUis = GetMatchingPopupUis(flowState); + foreach (var popupUi in matchingPopupUis) + { + CreatePopup(popupUi, parent); + } + } + + public void DestroyMatchingPopupUis(GameFlowState flowState) + { + var matchingPopupUis = GetMatchingPopupUis(flowState); + foreach (var popupUi in matchingPopupUis) + { + DestroyPopup(popupUi); + } + } + + public bool IsTopPopup(BasePopupUi popup) + { + return _popupUiStack.Count > 0 && _popupUiStack.Peek() == popup; + } + + public void PushPopup(BasePopupUi popup) + { + if (_popupUiStack.Contains(popup)) return; + + if (_popupUiStack.Count == 0) + { + _previousActionMap = InputManager.Instance.GetCurrentActionMap(); + } + + _popupUiStack.Push(popup); + + UpdatePopupCanvasGroups(); + } + + public void PopPopup(BasePopupUi popup) + { + if (_popupUiStack.Count == 0) return; + + if (_popupUiStack.Peek() == popup) + { + _popupUiStack.Pop(); + } + else + { + var temp = _popupUiStack.Reverse().Where(p => p != popup).Reverse().ToList(); + _popupUiStack.Clear(); + foreach (var p in temp) + { + _popupUiStack.Push(p); + } + } + + if (_popupUiStack.TryPeek(out var topPopup) && topPopup.IsOpen) + { + InputManager.Instance.SwitchCurrentActionMap(topPopup.InputActionMaps); + } + else + { + InputManager.Instance.SwitchCurrentActionMap(_previousActionMap); + } + + UpdatePopupCanvasGroups(); + } + + private void UpdatePopupCanvasGroups() + { + if (_popupUiStack.Count == 0) return; + + foreach (var popupUi in _popupUiStack) + { + bool isTop = IsTopPopup(popupUi); + popupUi.SetUiInteractable(isTop); + } + } + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUiState.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUiState.cs.meta new file mode 100644 index 000000000..18c76cb3e --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUiState.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 795c2a281d8cab44ea9cd5f2c33eb1b1 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ChecklistData.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ChecklistData.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ChecklistData.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ChecklistData.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ChecklistData.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ChecklistData.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ChecklistData.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ChecklistData.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ChecklistView.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ChecklistView.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ChecklistView.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ChecklistView.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ChecklistView.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ChecklistView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ChecklistView.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ChecklistView.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ExtensionsUi.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ExtensionsUi.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/InventoryUi.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/InventoryUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/InventoryUi.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/InventoryUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/InventoryUi/InventoryView.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/InventoryUi/InventoryView.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/InventoryUi/InventoryView.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/InventoryUi/InventoryView.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/InventoryUi/InventoryView.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/InventoryUi/InventoryView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/InventoryUi/InventoryView.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/InventoryUi/InventoryView.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemDetailView.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemDetailView.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemDetailView.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemDetailView.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemDetailView.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemDetailView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemDetailView.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemDetailView.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/IInteractableUi.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IInteractableUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/IInteractableUi.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IInteractableUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/IInteractableUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IInteractableUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/IInteractableUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IInteractableUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/IngredientEntry.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IngredientEntry.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/IngredientEntry.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IngredientEntry.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/IngredientEntry.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IngredientEntry.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/IngredientEntry.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IngredientEntry.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/ItemSlotUi.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemSlotUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/ItemSlotUi.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemSlotUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/ItemSlotUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemSlotUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/ItemSlotUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemSlotUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/ItemViewModel.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemViewModel.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/ItemViewModel.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemViewModel.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/ItemViewModel.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemViewModel.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/ItemViewModel.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemViewModel.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/RestaurantManagementUi.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/RestaurantManagementUi.cs similarity index 97% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/RestaurantManagementUi.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/RestaurantManagementUi.cs index 2c65ddfe7..b094e25b9 100644 --- a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/RestaurantManagementUi.cs +++ b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/RestaurantManagementUi.cs @@ -13,6 +13,8 @@ public class RestaurantManagementUi : PopupUi, IEventHandle [SerializeField] private ChecklistView _checklistView; [SerializeField] private InventoryView _inventoryView; [SerializeField] private ItemDetailView _itemDetailView; + [SerializeField] private TodayMenuView _todayMenuView; + [SerializeField] private TodayRestaurantStateView _todayRestaurantStateView; [SerializeField] private TabGroupUi _sectionTabs; [SerializeField] private TabGroupUi _menuCategoryTabs; [SerializeField] private TabGroupUi _cookwareCategoryTabs; @@ -113,6 +115,8 @@ private void InitializeViews() { _checklistView.Initalize(); _inventoryView.Initialize(); + _todayMenuView.Initialize(); + _todayRestaurantStateView.Initialize(); } /// diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/RestaurantManagementUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/RestaurantManagementUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/RestaurantManagementUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/RestaurantManagementUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/ITabButton.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/ITabButton.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/ITabButton.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/ITabButton.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/ITabButton.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/ITabButton.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/ITabButton.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/ITabButton.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabButtonUi.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/TabButtonUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabButtonUi.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/TabButtonUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabButtonUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/TabButtonUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabButtonUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/TabButtonUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabGroupUi.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/TabGroupUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabGroupUi.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/TabGroupUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabGroupUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/TabGroupUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TabUi/TabGroupUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/TabGroupUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TasteHashTagSlotUi.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TasteHashTagSlotUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TasteHashTagSlotUi.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TasteHashTagSlotUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TasteHashTagSlotUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TasteHashTagSlotUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TasteHashTagSlotUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TasteHashTagSlotUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayMenuUi.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayMenuUi.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs similarity index 97% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs index df9e75ccc..7d6c74aa7 100644 --- a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs +++ b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs @@ -15,18 +15,13 @@ public class TodayMenuView : MonoBehaviour, IEventHandler, private RestaurantManagementStateSo restaurantManagementStateSo; private RestaurantManagementDataSo restaurantManagementDataSo; - private void Start() - { - Initialize(); - } - private void OnDestroy() { EventBus.Unregister(this); EventBus.Unregister(this); } - private void Initialize() + public void Initialize() { restaurantManagementStateSo = RestaurantState.instance.ManagementState; restaurantManagementDataSo = RestaurantDataSo.instance.ManagementData; diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs similarity index 97% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs index ba3e3e383..70f0a82b1 100644 --- a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs +++ b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs @@ -14,11 +14,6 @@ public class TodayRestaurantStateView : MonoBehaviour, IEventHandler(this); } - private void Initialize() + public void Initialize() { restaurantManagementStateSo = RestaurantState.instance.ManagementState; restaurantManagementDataSo = RestaurantDataSo.instance.ManagementData; diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/UiManager.cs b/Assets/_DDD/_Scripts/GameUi/UiManager.cs index 21d28a412..270be7fd5 100644 --- a/Assets/_DDD/_Scripts/GameUi/UiManager.cs +++ b/Assets/_DDD/_Scripts/GameUi/UiManager.cs @@ -1,154 +1,62 @@ -using System; -using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; -using Sirenix.OdinInspector; +using UnityEngine; +using UnityEngine.AddressableAssets; namespace DDD { - public class UiManager : Singleton, IManager, IEventHandler, IEventHandler + public class UiManager : Singleton, IManager, IGameFlowHandler { - private readonly Dictionary _popupUIs = new(); - [ReadOnly, ShowInInspector] private readonly Stack _popupStack = new(); - private InputActionMaps _previousActionMap = InputActionMaps.None; + [SerializeField] private AssetReference _popupUiState; + [SerializeField] private Transform _popupUiRoot; - private readonly object _uiPauseRequester = new(); + public PopupUiState PopupUiState { get; private set; } + + private void OnDestroy() + { + GameFlowManager.Instance?.FlowHandlers?.Remove(this); + } public void PreInit() { - EventBus.Register(this); - EventBus.Register(this); + GameFlowManager.Instance.FlowHandlers.Add(this); + + foreach (Transform child in _popupUiRoot) + { + Destroy(child.gameObject); + } } - - public Task Init() + + public async Task Init() { - return Task.CompletedTask; + await LoadData(); } public void PostInit() { - + } - private void OnDestroy() + public Task OnReadyNewFlow(GameFlowState newFlowState) { - EventBus.Unregister(this); - EventBus.Unregister(this); + PopupUiState.CreateMatchingPopupUis(newFlowState, _popupUiRoot); + return Task.CompletedTask; } - public void RegisterPopupUI(BasePopupUi ui) + public Task OnExitCurrentFlow(GameFlowState exitingFlowState) { - var type = ui.GetType(); - _popupUIs.TryAdd(type, ui); + PopupUiState.DestroyMatchingPopupUis(exitingFlowState); + return Task.CompletedTask; } - public void UnregisterPopupUI(BasePopupUi ui) + private async Task LoadData() { - var type = ui.GetType(); - if (_popupUIs.TryGetValue(type, out var registered) && registered == ui) - { - _popupUIs.Remove(type); - } - } + var handle = _popupUiState.LoadAssetAsync(); + await handle.Task; + PopupUiState = handle.Result; - public void Invoke(OpenPopupUiEvent evt) - { - if (_popupUIs.TryGetValue(evt.UiType, out var popup)) - { - if (!popup.IsOpen) - { - PushPopup(popup); - popup.Open(evt); + Debug.Assert(PopupUiState != null, "PopupUiState is null"); - if (popup.IsBlockingTime) - { - var timeScaleChangeEvent = GameEvents.RequestTimeScaleChangeEvent; - timeScaleChangeEvent.Requester = popup; - timeScaleChangeEvent.NewTimeScale = 0f; - EventBus.Broadcast(timeScaleChangeEvent); - } - } - } - } - - public void Invoke(ClosePopupUiEvent evt) - { - if (_popupUIs.TryGetValue(evt.UiType, out var popup)) - { - if (popup.IsOpen) - { - popup.ClosePanel(); - PopPopup(popup); - - if (popup.IsBlockingTime) - { - var timeScaleChangeEvent = GameEvents.RequestTimeScaleChangeEvent; - timeScaleChangeEvent.Requester = popup; - timeScaleChangeEvent.NewTimeScale = 1f; - EventBus.Broadcast(timeScaleChangeEvent); - } - } - } - } - - public bool IsTopPopup(BasePopupUi popup) - { - return _popupStack.Count > 0 && _popupStack.Peek() == popup; - } - - public void PushPopup(BasePopupUi popup) - { - if (_popupStack.Contains(popup)) return; - - if (_popupStack.Count == 0) - { - _previousActionMap = InputManager.Instance.GetCurrentActionMap(); - } - - _popupStack.Push(popup); - - UpdatePopupCanvasGroups(); - } - - public void PopPopup(BasePopupUi popup) - { - if (_popupStack.Count == 0) return; - - if (_popupStack.Peek() == popup) - { - _popupStack.Pop(); - } - else - { - var temp = _popupStack.Reverse().Where(p => p != popup).Reverse().ToList(); - _popupStack.Clear(); - foreach (var p in temp) - { - _popupStack.Push(p); - } - } - - if (_popupStack.TryPeek(out var topPopup) && topPopup.IsOpen) - { - InputManager.Instance.SwitchCurrentActionMap(topPopup.InputActionMaps); - } - else - { - InputManager.Instance.SwitchCurrentActionMap(_previousActionMap); - } - - UpdatePopupCanvasGroups(); - } - - private void UpdatePopupCanvasGroups() - { - if (_popupStack.Count == 0) return; - - foreach (var popupUi in _popupStack) - { - bool isTop = IsTopPopup(popupUi); - popupUi.SetUiInteractable(isTop); - } + PopupUiState.Initialize(); } } } \ No newline at end of file