From cb2970b897d8eff1ec2aed803981eee9f7b115c3 Mon Sep 17 00:00:00 2001 From: NTG Date: Mon, 18 Aug 2025 13:26:18 +0900 Subject: [PATCH 1/8] =?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 From 96aa7567694c5cb6c53167a280953f3b9441caf6 Mon Sep 17 00:00:00 2001 From: NTG Date: Mon, 18 Aug 2025 14:09:56 +0900 Subject: [PATCH 2/8] =?UTF-8?q?RestaurantRunController=20=EC=98=A4?= =?UTF-8?q?=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 --- .../_DDD/_Addressables/So/PopupUiState.asset | 4 +- .../So/RestaurantCustomerStateSo.asset | 3 -- .../So/RestaurantCustomerStateSo.asset.meta | 8 ---- .../So/ManagerDefinitionSo.asset | 2 +- .../_DDD/_Scripts/GameFlow/GameFlowManager.cs | 38 +++++++++---------- .../Conrtollers/RestaurantRunController.cs | 4 +- .../RestaurantState/RestaurantState.cs | 2 + 7 files changed, 26 insertions(+), 35 deletions(-) delete mode 100644 Assets/_DDD/_Addressables/So/RestaurantCustomerStateSo.asset delete mode 100644 Assets/_DDD/_Addressables/So/RestaurantCustomerStateSo.asset.meta diff --git a/Assets/_DDD/_Addressables/So/PopupUiState.asset b/Assets/_DDD/_Addressables/So/PopupUiState.asset index 10268a2da..2283d5b74 100644 --- a/Assets/_DDD/_Addressables/So/PopupUiState.asset +++ b/Assets/_DDD/_Addressables/So/PopupUiState.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd4e291d895647a4d067c88ad56775db752545db471dbcb275f8ebebe7a0e131 -size 1325 +oid sha256:ce0f58b16cd51536806732f34bb1c1c46f59b6ee19b1d85e982978d11c370cee +size 1962 diff --git a/Assets/_DDD/_Addressables/So/RestaurantCustomerStateSo.asset b/Assets/_DDD/_Addressables/So/RestaurantCustomerStateSo.asset deleted file mode 100644 index 46133547f..000000000 --- a/Assets/_DDD/_Addressables/So/RestaurantCustomerStateSo.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f4e00ac56c631cd92403826618ed6a1f8c7529e37f73bd999106cfaf42a117c -size 478 diff --git a/Assets/_DDD/_Addressables/So/RestaurantCustomerStateSo.asset.meta b/Assets/_DDD/_Addressables/So/RestaurantCustomerStateSo.asset.meta deleted file mode 100644 index 40f43b10b..000000000 --- a/Assets/_DDD/_Addressables/So/RestaurantCustomerStateSo.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6a8ae0a4b68a9b94889b9889b63ebacd -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_DDD/_ScriptAssets/So/ManagerDefinitionSo.asset b/Assets/_DDD/_ScriptAssets/So/ManagerDefinitionSo.asset index 407c77947..39efc89d5 100644 --- a/Assets/_DDD/_ScriptAssets/So/ManagerDefinitionSo.asset +++ b/Assets/_DDD/_ScriptAssets/So/ManagerDefinitionSo.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55442c93e950336bb46b13c6fa735c3f10e15c0fe05c5c61481bce1468e4e9c5 +oid sha256:8b96712e0293df2bec2b51abf1b2ec239a4aaae75a3d2cfa311159772391598a size 1504 diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs b/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs index 66a46d856..e3f3887dd 100644 --- a/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs +++ b/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs @@ -13,8 +13,8 @@ public enum GameFlowState : uint RunRestaurant = 1u << 1, SettlementRestaurant = 1u << 2, All = 0xFFFFFFFFu - } - + } + public class GameFlowManager : Singleton, IManager { public GameFlowDataSo GameFlowDataSo; @@ -28,32 +28,32 @@ public void PreInit() public Task Init() { - return Task.CompletedTask;; + return Task.CompletedTask; ; } - public void PostInit() + public async void PostInit() { if (IsGameStarted() == false) { - ChangeFlow(GameFlowState.ReadyForRestaurant); + await ChangeFlow(GameFlowState.ReadyForRestaurant); } } - + private bool IsGameStarted() => GameFlowDataSo.CurrentGameState != GameFlowState.None; - public void ChangeFlow(GameFlowState newFlowState) + public async Task ChangeFlow(GameFlowState newFlowState) { - if (!CanChangeFlow(newFlowState)) + if (CanChangeFlow(newFlowState) == false) { Debug.LogError("Can't change flow"); return; } - - _ = EndCurrentFlow(); - _ = ReadyNewFlow(newFlowState); + await EndCurrentFlow(); + + await ReadyNewFlow(newFlowState); } - + private bool CanChangeFlow(GameFlowState newFlowState) { return true; @@ -62,27 +62,27 @@ private bool CanChangeFlow(GameFlowState newFlowState) private async Task EndCurrentFlow() { var endCurrentFlowState = GameFlowDataSo.CurrentGameState; - + foreach (var handler in FlowHandlers) { await handler.OnExitCurrentFlow(endCurrentFlowState); } } - + private async Task ReadyNewFlow(GameFlowState newFlowState) { GameFlowDataSo.CurrentGameState = newFlowState; - + + await OpenFlowScene(newFlowState); + foreach (var handler in FlowHandlers) { await handler.OnReadyNewFlow(newFlowState); } - - await OpenFlowScene(newFlowState); StartFlow(); } - + private async Task OpenFlowScene(GameFlowState newFlowState) { if (GetFlowScene(newFlowState)) @@ -102,7 +102,7 @@ private bool GetFlowScene(GameFlowState flowState) private void StartFlow() { - + } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantRunController.cs b/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantRunController.cs index eab8fbc18..6972d1e1b 100644 --- a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantRunController.cs +++ b/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantRunController.cs @@ -8,8 +8,8 @@ public class RestaurantRunController : FlowController RestaurantCustomerStateSo _restaurantCustomerStateSo; public override Task InitializeController() { - return Task.CompletedTask; - + _restaurantCustomerStateSo = RestaurantState.instance.CustomerState; + return Task.CompletedTask; } public override Task InitializeState() diff --git a/Assets/_DDD/_Scripts/RestaurantState/RestaurantState.cs b/Assets/_DDD/_Scripts/RestaurantState/RestaurantState.cs index ac6f5fb99..2b74641a5 100644 --- a/Assets/_DDD/_Scripts/RestaurantState/RestaurantState.cs +++ b/Assets/_DDD/_Scripts/RestaurantState/RestaurantState.cs @@ -9,6 +9,7 @@ public class RestaurantState : ScriptableSingleton public RestaurantRunStateSo RunState { get; private set; } public RestaurantEnvironmentStateSo EnvironmentState { get; private set; } public RestaurantPlayerStateSo PlayerState { get; private set; } + public RestaurantCustomerStateSo CustomerState { get; private set; } // TODO : Load from disk(SaveData) private void OnEnable() @@ -17,6 +18,7 @@ private void OnEnable() RunState = CreateInstance(); EnvironmentState = CreateInstance(); PlayerState = CreateInstance(); + CustomerState = CreateInstance(); } } } \ No newline at end of file From 226bada6a6a318300566e006d07535abf56df09b Mon Sep 17 00:00:00 2001 From: NTG Date: Mon, 18 Aug 2025 14:15:13 +0900 Subject: [PATCH 3/8] fixed gitignore --- .gitignore | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 39dc3b158..09557b96f 100644 --- a/.gitignore +++ b/.gitignore @@ -98,7 +98,12 @@ Packages/com.distantlands.cozy.core/Samples~/Legacy Integrations/*.unitypackage. Assets/_DDD/_Addressables/Sprites/* .autosave/ -Assets/AddressableAssetsData/ +*/Assets/AddressableAssetsData/AssetGroups/*.asset +*/Assets/AddressableAssetsData/Android* +*/Assets/AddressableAssetsData/iOS* +*/Assets/AddressableAssetsData/Windows* +*/Assets/AddressableAssetsData/*/*.bin* + ProjectSettings/Packages/com.unity.probuilder/Settings.json *.DotSettings .vsconfig From 56ec16bcf5102e38f5e59fee96d2a78cb0f1f616 Mon Sep 17 00:00:00 2001 From: NTG Date: Mon, 18 Aug 2025 14:15:30 +0900 Subject: [PATCH 4/8] =?UTF-8?q?addressable=20=EB=8F=99=EA=B8=B0=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AddressableAssetGroupSortSettings.asset | 3 +++ .../AddressableAssetGroupSortSettings.asset.meta | 8 ++++++++ .../AddressableAssetsData/AddressableAssetSettings.asset | 3 +++ .../AddressableAssetSettings.asset.meta | 8 ++++++++ Assets/AddressableAssetsData/AssetGroupTemplates.meta | 8 ++++++++ .../AssetGroupTemplates/Packed Assets.asset | 3 +++ .../AssetGroupTemplates/Packed Assets.asset.meta | 8 ++++++++ Assets/AddressableAssetsData/AssetGroups.meta | 8 ++++++++ .../AssetGroups/Default Local Group.asset | 3 +++ .../AssetGroups/Default Local Group.asset.meta | 8 ++++++++ .../AssetGroups/GoogleSheetSo_Group.asset | 3 +++ .../AssetGroups/GoogleSheetSo_Group.asset.meta | 8 ++++++++ .../AssetGroups/Localization-Assets-Shared.asset | 3 +++ .../AssetGroups/Localization-Assets-Shared.asset.meta | 8 ++++++++ .../AssetGroups/Localization-Locales.asset | 3 +++ .../AssetGroups/Localization-Locales.asset.meta | 8 ++++++++ .../Localization-String-Tables-English (en).asset | 3 +++ .../Localization-String-Tables-English (en).asset.meta | 8 ++++++++ .../Localization-String-Tables-Japanese (ja).asset | 3 +++ .../Localization-String-Tables-Japanese (ja).asset.meta | 8 ++++++++ .../Localization-String-Tables-Korean (ko).asset | 3 +++ .../Localization-String-Tables-Korean (ko).asset.meta | 8 ++++++++ Assets/AddressableAssetsData/AssetGroups/Schemas.meta | 8 ++++++++ .../Default Local Group_BundledAssetGroupSchema.asset | 3 +++ ...Default Local Group_BundledAssetGroupSchema.asset.meta | 8 ++++++++ .../Default Local Group_ContentUpdateGroupSchema.asset | 3 +++ ...efault Local Group_ContentUpdateGroupSchema.asset.meta | 8 ++++++++ .../GoogleSheetSo_Group_BundledAssetGroupSchema.asset | 3 +++ ...GoogleSheetSo_Group_BundledAssetGroupSchema.asset.meta | 8 ++++++++ .../GoogleSheetSo_Group_ContentUpdateGroupSchema.asset | 3 +++ ...oogleSheetSo_Group_ContentUpdateGroupSchema.asset.meta | 8 ++++++++ ...calization-Assets-Shared_BundledAssetGroupSchema.asset | 3 +++ ...ation-Assets-Shared_BundledAssetGroupSchema.asset.meta | 8 ++++++++ ...alization-Assets-Shared_ContentUpdateGroupSchema.asset | 3 +++ ...tion-Assets-Shared_ContentUpdateGroupSchema.asset.meta | 8 ++++++++ .../Localization-Locales_BundledAssetGroupSchema.asset | 3 +++ ...ocalization-Locales_BundledAssetGroupSchema.asset.meta | 8 ++++++++ .../Localization-Locales_ContentUpdateGroupSchema.asset | 3 +++ ...calization-Locales_ContentUpdateGroupSchema.asset.meta | 8 ++++++++ ...ring-Tables-English (en)_BundledAssetGroupSchema.asset | 3 +++ ...Tables-English (en)_BundledAssetGroupSchema.asset.meta | 8 ++++++++ ...ing-Tables-English (en)_ContentUpdateGroupSchema.asset | 3 +++ ...ables-English (en)_ContentUpdateGroupSchema.asset.meta | 8 ++++++++ ...ing-Tables-Japanese (ja)_BundledAssetGroupSchema.asset | 3 +++ ...ables-Japanese (ja)_BundledAssetGroupSchema.asset.meta | 8 ++++++++ ...ng-Tables-Japanese (ja)_ContentUpdateGroupSchema.asset | 3 +++ ...bles-Japanese (ja)_ContentUpdateGroupSchema.asset.meta | 8 ++++++++ ...tring-Tables-Korean (ko)_BundledAssetGroupSchema.asset | 3 +++ ...-Tables-Korean (ko)_BundledAssetGroupSchema.asset.meta | 8 ++++++++ ...ring-Tables-Korean (ko)_ContentUpdateGroupSchema.asset | 3 +++ ...Tables-Korean (ko)_ContentUpdateGroupSchema.asset.meta | 8 ++++++++ Assets/AddressableAssetsData/DataBuilders.meta | 8 ++++++++ .../DataBuilders/BuildScriptFastMode.asset | 3 +++ .../DataBuilders/BuildScriptFastMode.asset.meta | 8 ++++++++ .../DataBuilders/BuildScriptPackedMode.asset | 3 +++ .../DataBuilders/BuildScriptPackedMode.asset.meta | 8 ++++++++ .../DataBuilders/BuildScriptPackedPlayMode.asset | 3 +++ .../DataBuilders/BuildScriptPackedPlayMode.asset.meta | 8 ++++++++ Assets/AddressableAssetsData/DefaultObject.asset | 3 +++ Assets/AddressableAssetsData/DefaultObject.asset.meta | 8 ++++++++ Assets/AddressableAssetsData/OSX.meta | 8 ++++++++ .../AddressableAssetsData/ProfileDataSourceSettings.asset | 3 +++ .../ProfileDataSourceSettings.asset.meta | 8 ++++++++ Assets/AddressableAssetsData/Windows.meta | 8 ++++++++ ProjectSettings/EditorBuildSettings.asset | 2 +- 65 files changed, 368 insertions(+), 1 deletion(-) create mode 100644 Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset create mode 100644 Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset.meta create mode 100644 Assets/AddressableAssetsData/AddressableAssetSettings.asset create mode 100644 Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroupTemplates.meta create mode 100644 Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset create mode 100644 Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/GoogleSheetSo_Group.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/GoogleSheetSo_Group.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Localization-Locales.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Localization-Locales.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Japanese (ja).asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Japanese (ja).asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Korean (ko).asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Korean (ko).asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/GoogleSheetSo_Group_BundledAssetGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/GoogleSheetSo_Group_BundledAssetGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/GoogleSheetSo_Group_ContentUpdateGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/GoogleSheetSo_Group_ContentUpdateGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Assets-Shared_BundledAssetGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Assets-Shared_BundledAssetGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Assets-Shared_ContentUpdateGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Assets-Shared_ContentUpdateGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Locales_BundledAssetGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Locales_BundledAssetGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Locales_ContentUpdateGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Locales_ContentUpdateGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English (en)_BundledAssetGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English (en)_BundledAssetGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English (en)_ContentUpdateGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English (en)_ContentUpdateGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Japanese (ja)_BundledAssetGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Japanese (ja)_BundledAssetGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Japanese (ja)_ContentUpdateGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Japanese (ja)_ContentUpdateGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Korean (ko)_BundledAssetGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Korean (ko)_BundledAssetGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Korean (ko)_ContentUpdateGroupSchema.asset create mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Korean (ko)_ContentUpdateGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/DataBuilders.meta create mode 100644 Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset create mode 100644 Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta create mode 100644 Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset create mode 100644 Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta create mode 100644 Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset create mode 100644 Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta create mode 100644 Assets/AddressableAssetsData/DefaultObject.asset create mode 100644 Assets/AddressableAssetsData/DefaultObject.asset.meta create mode 100644 Assets/AddressableAssetsData/OSX.meta create mode 100644 Assets/AddressableAssetsData/ProfileDataSourceSettings.asset create mode 100644 Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta create mode 100644 Assets/AddressableAssetsData/Windows.meta diff --git a/Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset b/Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset new file mode 100644 index 000000000..519076e47 --- /dev/null +++ b/Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7de2c290a9bb457d9dda3c2e73bc718531edf17ca413136486f7a30e1ac801e +size 694 diff --git a/Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset.meta b/Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset.meta new file mode 100644 index 000000000..04aabdab0 --- /dev/null +++ b/Assets/AddressableAssetsData/AddressableAssetGroupSortSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5f7974e57d37b3143b6c1d44c71364db +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset new file mode 100644 index 000000000..753ecab87 --- /dev/null +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:490dddafb57de78c7a125cc1b10dcc43e222036a82abdcd6a64db3c32f589dd5 +size 4825 diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta b/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta new file mode 100644 index 000000000..c1ed32ece --- /dev/null +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d12ffbb6f886d48418efb0b6d15ccb88 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroupTemplates.meta b/Assets/AddressableAssetsData/AssetGroupTemplates.meta new file mode 100644 index 000000000..005866401 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroupTemplates.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aae35240a94dde0429e214ff4f327227 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset b/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset new file mode 100644 index 000000000..b253dac29 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb412cf2483e709ef40517d40ed3b5f8961042b0eb5ef931a8d8285848a47ad5 +size 2554 diff --git a/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta b/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta new file mode 100644 index 000000000..f05a639d4 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f804fe78e7005554f9ba60273aade35b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups.meta b/Assets/AddressableAssetsData/AssetGroups.meta new file mode 100644 index 000000000..b1ffe1b3a --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 012f657ef2322a6499255e9c9c78a5a3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset new file mode 100644 index 000000000..352dec1d1 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60ac667f7f8c14caaf5fdda42dee255a475841eb29cffac5504a2957d012552b +size 21721 diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta new file mode 100644 index 000000000..e87328074 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ccbaa2bf8d0f3b542985c6bc261b1b46 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSo_Group.asset b/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSo_Group.asset new file mode 100644 index 000000000..553e245db --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSo_Group.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8efe3f0ea0e854cd28e5067f4deecf4dd983c61b29777775e7c6d2a52aa4b82f +size 2776 diff --git a/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSo_Group.asset.meta b/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSo_Group.asset.meta new file mode 100644 index 000000000..0c7c09b15 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/GoogleSheetSo_Group.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5b7b9bd594e863849bf5e512f59ba0fc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset b/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset new file mode 100644 index 000000000..8f9209a24 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:114b24c32c53f6e52eced3c710efa4c670cdde773887c7864b899c472301b4ae +size 1756 diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset.meta new file mode 100644 index 000000000..7afd5770b --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9dfa0d89bb3450744b0195c8b19fd072 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-Locales.asset b/Assets/AddressableAssetsData/AssetGroups/Localization-Locales.asset new file mode 100644 index 000000000..e335206cf --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-Locales.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc75c1d1c542fff46d28e5e289959a89e64df155c54dce9a25f7854f939da1dd +size 1305 diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-Locales.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Localization-Locales.asset.meta new file mode 100644 index 000000000..9f902421c --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-Locales.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aa213c00ab7fb904baa2b0c3d1b90adf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset new file mode 100644 index 000000000..d33f335e5 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdda2c03db9d6860d5b7e2be2af2ac41e3666ef5caa1c3aa35cffa3c5c97abde +size 1541 diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset.meta b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset.meta new file mode 100644 index 000000000..51ad5553c --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e1b57f580a1df344d80b1073dcfca317 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Japanese (ja).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Japanese (ja).asset new file mode 100644 index 000000000..abf37eb5e --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Japanese (ja).asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5132c01a994bd1f09ffd7dc960e07ca9f3eec7a9244c9b4665011cb94fe10173 +size 1543 diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Japanese (ja).asset.meta b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Japanese (ja).asset.meta new file mode 100644 index 000000000..6af09cfa8 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Japanese (ja).asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: de41279ce863bfd47bc8c25c6e70d38b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Korean (ko).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Korean (ko).asset new file mode 100644 index 000000000..785d01da6 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Korean (ko).asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1583635965329c9519b665926c1d4ac7e67a52dd7f3c305fe4e9638b01a6adf3 +size 1539 diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Korean (ko).asset.meta b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Korean (ko).asset.meta new file mode 100644 index 000000000..cd3bbc9be --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-Korean (ko).asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 97c26bb69807990449c3b2f9323087a0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas.meta new file mode 100644 index 000000000..db644bdbf --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3c1920f73ace47b4694675ed31a1a112 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset new file mode 100644 index 000000000..5b7784fc9 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e4936600176149faac8a7a7dae48d47a0149b7a52b27bf9109a0f878d518cc1 +size 1611 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..2d8d42ef6 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 54677cac757452b4a89ac5479284ead8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset new file mode 100644 index 000000000..ae5a43f2c --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35d4830b426ee3a5085c1fa5fe4f25b1da45884d4fc85fe60c0fef2570482154 +size 533 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..267a4ddcf --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 664d15868c075ed41a9afd4b7fdf3e4f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/GoogleSheetSo_Group_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/GoogleSheetSo_Group_BundledAssetGroupSchema.asset new file mode 100644 index 000000000..70c8685ef --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/GoogleSheetSo_Group_BundledAssetGroupSchema.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f7aeed2f66b2a696652a688f285f8aba7a98ddd91eebb08719cd74ac572497d +size 1611 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/GoogleSheetSo_Group_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/GoogleSheetSo_Group_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..36f114d2c --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/GoogleSheetSo_Group_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b62ed1f0bfb9f704db4e9af0e9637977 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/GoogleSheetSo_Group_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/GoogleSheetSo_Group_ContentUpdateGroupSchema.asset new file mode 100644 index 000000000..ed5b368d1 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/GoogleSheetSo_Group_ContentUpdateGroupSchema.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c33872901fa582a532afdab53af7f19e0e8609c35873bd190fc16a8891356f44 +size 533 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/GoogleSheetSo_Group_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/GoogleSheetSo_Group_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..95dcc128e --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/GoogleSheetSo_Group_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7bdd4a50a9f431c4ba9120737ec7c9f4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Assets-Shared_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Assets-Shared_BundledAssetGroupSchema.asset new file mode 100644 index 000000000..074c3f643 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Assets-Shared_BundledAssetGroupSchema.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e039b509241b4fbfd2601a14e50262648c6f273f2f0d0372ae949fe29b02c52 +size 1618 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Assets-Shared_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Assets-Shared_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..4402afee3 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Assets-Shared_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1fd7839e70b6ae64a90f35de9d2f0816 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Assets-Shared_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Assets-Shared_ContentUpdateGroupSchema.asset new file mode 100644 index 000000000..b1ea7ee6e --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Assets-Shared_ContentUpdateGroupSchema.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd3317fa7862a9b68e61f663938eea51e0b7370aa276c1059aef5f39525eb20e +size 540 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Assets-Shared_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Assets-Shared_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..7701c8efd --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Assets-Shared_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c56a00ae7a1522f43ab6deadaf605234 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Locales_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Locales_BundledAssetGroupSchema.asset new file mode 100644 index 000000000..6e1425d9c --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Locales_BundledAssetGroupSchema.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:261960b65cb5240498930b715b787b68af1928a0639b837b08bf036870200e1c +size 1612 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Locales_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Locales_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..fd229888d --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Locales_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c0a96693e2d52c4e817ba256542b053 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Locales_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Locales_ContentUpdateGroupSchema.asset new file mode 100644 index 000000000..f898c1816 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Locales_ContentUpdateGroupSchema.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8bb8ed1b19f241fc68c24fd2be784ea6bc9af97091908f9cf109b2a3ef04b576 +size 534 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Locales_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Locales_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..2547e5f74 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-Locales_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f6b12b9a1f788d345a122bd53fb8c854 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English (en)_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English (en)_BundledAssetGroupSchema.asset new file mode 100644 index 000000000..ce154176d --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English (en)_BundledAssetGroupSchema.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2ab11ddff87da18bc1253d99e2a9190112469e6c850bc236f74ff318230ea24 +size 1631 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English (en)_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English (en)_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..62f65f150 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English (en)_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a6ebe5e594db22c47a5ec57d4e9d5561 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English (en)_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English (en)_ContentUpdateGroupSchema.asset new file mode 100644 index 000000000..111db7fb3 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English (en)_ContentUpdateGroupSchema.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c231432cfee4f2540415246addc89e63775c5a9c3fa7fcfa7a4cd4ad710acd78 +size 553 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English (en)_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English (en)_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..d81113920 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-English (en)_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e2dbc665bf8d9ab4996582b40556fdd4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Japanese (ja)_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Japanese (ja)_BundledAssetGroupSchema.asset new file mode 100644 index 000000000..077d1aeca --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Japanese (ja)_BundledAssetGroupSchema.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fbf2acfbc80089593024339f171df9bd95f6661a0bedb7a0e53f08b98fc5b39 +size 1632 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Japanese (ja)_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Japanese (ja)_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..68868838a --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Japanese (ja)_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 507c24bd9b6167c46be04b2d03a7afdc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Japanese (ja)_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Japanese (ja)_ContentUpdateGroupSchema.asset new file mode 100644 index 000000000..8f373b45b --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Japanese (ja)_ContentUpdateGroupSchema.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3ce1ab5c605466d640965a416fb1a41e9f9e939ad1a3b3d9dc2f183a56b7238 +size 554 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Japanese (ja)_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Japanese (ja)_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..b59f0b3b5 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Japanese (ja)_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2f9b8913cc7c497429f8d9b742e2248d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Korean (ko)_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Korean (ko)_BundledAssetGroupSchema.asset new file mode 100644 index 000000000..77385a384 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Korean (ko)_BundledAssetGroupSchema.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a3dd9d728cc83e38cbec2b3893db4b4a4688c7292497dc5a7f6c237ad461ba1 +size 1630 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Korean (ko)_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Korean (ko)_BundledAssetGroupSchema.asset.meta new file mode 100644 index 000000000..a40e40274 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Korean (ko)_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0ae4285925d53be4b9c79fbdbe6fd83f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Korean (ko)_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Korean (ko)_ContentUpdateGroupSchema.asset new file mode 100644 index 000000000..9b54547a0 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Korean (ko)_ContentUpdateGroupSchema.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26f703693924608afb55c6a4e974016e1024fce3e2daf4e0c4769f603b78e8c3 +size 552 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Korean (ko)_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Korean (ko)_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 000000000..affb2ebd0 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Localization-String-Tables-Korean (ko)_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 13d50d1ad4c80aa489b2b5d0bfbd0a43 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/DataBuilders.meta b/Assets/AddressableAssetsData/DataBuilders.meta new file mode 100644 index 000000000..289013819 --- /dev/null +++ b/Assets/AddressableAssetsData/DataBuilders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bc395fca191c52b4ea851fe83a40f16a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset b/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset new file mode 100644 index 000000000..955fb4249 --- /dev/null +++ b/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7ad7a99337b708101af1509e729f69a4a68d0fa2c4971735bcdcfef79031422 +size 810 diff --git a/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta b/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta new file mode 100644 index 000000000..784eb0a63 --- /dev/null +++ b/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 08e47763d1d3ddc49a7fcb10ebe3b33e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset b/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset new file mode 100644 index 000000000..3818a63a5 --- /dev/null +++ b/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1724ade455e3a80c4dc00106bc91fe4216c6476e3abf96f8f8c39a630962bfc +size 812 diff --git a/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta b/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta new file mode 100644 index 000000000..471256fce --- /dev/null +++ b/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b90bfb60ccafb7e4cb8900f9a52b89d7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset b/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset new file mode 100644 index 000000000..45bef73f6 --- /dev/null +++ b/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cff7386b43348b7893b94ba8f9766cf3210227c69b1c9172f4a06259141b4c1b +size 816 diff --git a/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta b/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta new file mode 100644 index 000000000..f27d3db99 --- /dev/null +++ b/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ee9e3ad901c06e43af50dbd33b132b1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/DefaultObject.asset b/Assets/AddressableAssetsData/DefaultObject.asset new file mode 100644 index 000000000..c42825b7d --- /dev/null +++ b/Assets/AddressableAssetsData/DefaultObject.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1e742bb03fa795eed4a15348a668ca87bbabf3d8af5845acad11d4eb6b28d37 +size 469 diff --git a/Assets/AddressableAssetsData/DefaultObject.asset.meta b/Assets/AddressableAssetsData/DefaultObject.asset.meta new file mode 100644 index 000000000..1e012c4ba --- /dev/null +++ b/Assets/AddressableAssetsData/DefaultObject.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8aedbecfee36f6f47b57e6359672a64f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/OSX.meta b/Assets/AddressableAssetsData/OSX.meta new file mode 100644 index 000000000..ff4aa3a8e --- /dev/null +++ b/Assets/AddressableAssetsData/OSX.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7ddc9a444b5824bcc9421fef5212845b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset new file mode 100644 index 000000000..93cfc76a7 --- /dev/null +++ b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ef795dc81990733c43b2430133ce87a30a34d370b340503649e36ad2aa189cc +size 826 diff --git a/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta new file mode 100644 index 000000000..521ac5527 --- /dev/null +++ b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d9a4d86327d0e384886ef63152a4778d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/Windows.meta b/Assets/AddressableAssetsData/Windows.meta new file mode 100644 index 000000000..211577695 --- /dev/null +++ b/Assets/AddressableAssetsData/Windows.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0b182ffdf506f3247a6c27b5196f69c6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index f42d031b3..ed8485fa0 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10b79e5d76db69e9d45852b927655e2ea09ce16b374f8f5e3b8b2809c0ccff93 +oid sha256:f86abe14bf9fc4c7c93dfa96efd110ef0f56c3fb96a952c57e06a723fc87c352 size 1075 From bcf28ee7c3c3c957928f46eea601805d830205c0 Mon Sep 17 00:00:00 2001 From: NTG Date: Mon, 18 Aug 2025 14:29:30 +0900 Subject: [PATCH 5/8] =?UTF-8?q?smart=20string=20=EC=9D=B4=EB=B2=A4?= =?UTF-8?q?=ED=8A=B8=20=ED=98=B8=EC=B6=9C=20=EC=9C=84=EC=B9=98=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FlowStates/RestaurantManagementStateSo.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantManagementStateSo.cs b/Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantManagementStateSo.cs index 8c19ff11c..56e8cebf1 100644 --- a/Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantManagementStateSo.cs +++ b/Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantManagementStateSo.cs @@ -191,7 +191,6 @@ public bool TryRemoveTodayMenu(ItemViewModel model) dirtyEvt.DomainFlags = SmartVariablesDomain.RestaurantToday; EventBus.Broadcast(dirtyEvt); EventBus.Broadcast(removedEvt); - } return removed; @@ -216,10 +215,10 @@ public bool TryAddTodayCookware(ItemViewModel model) } } + var dirtyEvt = GameEvents.SmartVariablesDirtyEvent; + dirtyEvt.DomainFlags = SmartVariablesDomain.RestaurantToday; + EventBus.Broadcast(dirtyEvt); EventBus.Broadcast(RestaurantEvents.TodayMenuAddedEvent); - var dirtyEvt2 = GameEvents.SmartVariablesDirtyEvent; - dirtyEvt2.DomainFlags = SmartVariablesDomain.RestaurantToday; - EventBus.Broadcast(dirtyEvt2); return true; } @@ -234,12 +233,12 @@ public bool TryRemoveTodayCookware(ItemViewModel model) if (_cookwareToRecipeIds.Remove(cookwareId) == false) return false; + var dirtyEvt = GameEvents.SmartVariablesDirtyEvent; + dirtyEvt.DomainFlags = SmartVariablesDomain.RestaurantToday; + EventBus.Broadcast(dirtyEvt); var evt = RestaurantEvents.TodayMenuRemovedEvent; evt.InventoryCategoryType = InventoryCategoryType.Cookware; EventBus.Broadcast(evt); - var dirtyEvt3 = GameEvents.SmartVariablesDirtyEvent; - dirtyEvt3.DomainFlags = SmartVariablesDomain.RestaurantToday; - EventBus.Broadcast(dirtyEvt3); return true; } From 57a7a1bcdde20a3e69ccb2b4b5fa4772e290f53e Mon Sep 17 00:00:00 2001 From: NTG Date: Mon, 18 Aug 2025 16:25:53 +0900 Subject: [PATCH 6/8] =?UTF-8?q?=EC=95=84=ED=8B=80=EB=9D=BC=EC=8A=A4=20?= =?UTF-8?q?=ED=8C=A8=ED=82=B9=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssetPostprocessorSprite.cs | 36 +++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorSprite.cs b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorSprite.cs index 163b83b7c..aa7773680 100644 --- a/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorSprite.cs +++ b/Assets/_DDD/_Scripts/AssetPostprocessors/AssetPostprocessorSprite.cs @@ -234,6 +234,14 @@ public static void CreateAtlas(string path, string destPath) sRGB = true, generateMipMaps = false }; + + // 저장 후 설정 반영을 위해 동기 임포트, 그리고 즉시 패킹 수행 + AssetDatabase.ImportAsset(destPath, ImportAssetOptions.ForceUpdate | ImportAssetOptions.ForceSynchronousImport); + var packedAtlas = AssetDatabase.LoadAssetAtPath(destPath); + if (packedAtlas != null) + { + SpriteAtlasUtility.PackAtlases(new[] { packedAtlas }, EditorUserBuildSettings.activeBuildTarget); + } } public static void CreateSingleAtlas(string path, string destPath) @@ -277,18 +285,34 @@ public static void CreateSingleAtlas(string path, string destPath) sRGB = true, generateMipMaps = false }; + + // 저장 후 설정 반영을 위해 동기 임포트, 그리고 즉시 패킹 수행 + AssetDatabase.ImportAsset(destPath, ImportAssetOptions.ForceUpdate | ImportAssetOptions.ForceSynchronousImport); + var packedAtlas = AssetDatabase.LoadAssetAtPath(destPath); + if (packedAtlas != null) + { + SpriteAtlasUtility.PackAtlases(new[] { packedAtlas }, EditorUserBuildSettings.activeBuildTarget); + } } public static void BuildTarget() { - foreach (var path in TargetPaths) + AssetDatabase.StartAssetEditing(); + try { - CreateAtlas(Utils.FolderPath(path), - Utils.FolderPath(path).Replace(PathConstants.RawFolderPath, PathConstants.AddressablesFolderPath) + - ExtenstionConstants.SpriteAtlasExtenstionLower); + foreach (var path in TargetPaths) + { + CreateAtlas(Utils.FolderPath(path), + Utils.FolderPath(path).Replace(PathConstants.RawFolderPath, PathConstants.AddressablesFolderPath) + + ExtenstionConstants.SpriteAtlasExtenstionLower); + } + } + finally + { + AssetDatabase.StopAssetEditing(); + AssetDatabase.Refresh(); + TargetPaths.Clear(); } - - TargetPaths.Clear(); } } } From d7c190fccff788a6698629aa693df57fab264fc3 Mon Sep 17 00:00:00 2001 From: NTG Date: Mon, 18 Aug 2025 16:26:16 +0900 Subject: [PATCH 7/8] =?UTF-8?q?=EA=B2=8C=EC=9E=84=20=EB=A7=A4=EB=8B=88?= =?UTF-8?q?=EC=A0=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/_DDD/_Scripts/GameFramework/GameManager.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Assets/_DDD/_Scripts/GameFramework/GameManager.cs b/Assets/_DDD/_Scripts/GameFramework/GameManager.cs index ffe6dc34b..38950be6a 100644 --- a/Assets/_DDD/_Scripts/GameFramework/GameManager.cs +++ b/Assets/_DDD/_Scripts/GameFramework/GameManager.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Threading.Tasks; using UnityEngine; @@ -11,13 +12,20 @@ public class GameManager : Singleton private List _managerInstances; - protected override void OnAwake() + protected override async void OnAwake() { base.OnAwake(); EventBus.ClearAll(); - _ = Initialize(); + try + { + await Initialize(); + } + catch (Exception e) + { + Debug.LogError(e); + } } private async Task Initialize() From a6ef8f9f8dca9da9c2937244e37110164db95bbc Mon Sep 17 00:00:00 2001 From: NTG Date: Mon, 18 Aug 2025 16:26:33 +0900 Subject: [PATCH 8/8] =?UTF-8?q?DDD=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8?= =?UTF-8?q?=20=EC=9D=BC=EA=B4=84=20=EC=84=A4=EC=A0=95=20=EA=B8=B0=EB=8A=A5?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/_DDD/Editor.meta | 8 +++ Assets/_DDD/Editor/ProjectDDD_Setup.cs | 61 +++++++++++++++++++++ Assets/_DDD/Editor/ProjectDDD_Setup.cs.meta | 2 + Assets/_DDD/Editor/ProjectSetupMenu.cs | 46 ++++++++++++++++ Assets/_DDD/Editor/ProjectSetupMenu.cs.meta | 2 + Assets/_DDD/ProjectDDD_Setup.asset | 3 + Assets/_DDD/ProjectDDD_Setup.asset.meta | 8 +++ 7 files changed, 130 insertions(+) create mode 100644 Assets/_DDD/Editor.meta create mode 100644 Assets/_DDD/Editor/ProjectDDD_Setup.cs create mode 100644 Assets/_DDD/Editor/ProjectDDD_Setup.cs.meta create mode 100644 Assets/_DDD/Editor/ProjectSetupMenu.cs create mode 100644 Assets/_DDD/Editor/ProjectSetupMenu.cs.meta create mode 100644 Assets/_DDD/ProjectDDD_Setup.asset create mode 100644 Assets/_DDD/ProjectDDD_Setup.asset.meta diff --git a/Assets/_DDD/Editor.meta b/Assets/_DDD/Editor.meta new file mode 100644 index 000000000..39fb3a247 --- /dev/null +++ b/Assets/_DDD/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c79b29ca9ae5a34458d2e83f21e6e2e9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/Editor/ProjectDDD_Setup.cs b/Assets/_DDD/Editor/ProjectDDD_Setup.cs new file mode 100644 index 000000000..3628da1ee --- /dev/null +++ b/Assets/_DDD/Editor/ProjectDDD_Setup.cs @@ -0,0 +1,61 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using Sirenix.OdinInspector; +using UnityEditor; +using UnityEngine; + +namespace DDD +{ + [CreateAssetMenu(menuName = "DDD/Project Setup Config", fileName = "ProjectDDD_Setup")] + public sealed class ProjectDDD_Setup : ScriptableObject + { + // 로그 프리픽스는 상수로 관리 + private const string LogPrefix = "[DDD]"; + + public List DefaultAssets = new(); + public GoogleSheetManager GoogleSheetManager; + + [Button("프로젝트 동기화")] + public async Task SyncProject() + { + Debug.Log($"{LogPrefix} 프로젝트 동기화 시작"); + + foreach (var asset in DefaultAssets) + { + // 해당 폴더 reimport 하고 완료될 때까지 대기 + if (asset != null) + { + string assetPath = AssetDatabase.GetAssetPath(asset); + Debug.Log($"{LogPrefix} 에셋 재임포트 시작: {asset.name}"); + + // 폴더의 경우 수동 Reimport와 동일하게 재귀 옵션을 추가하고 + // 동기식 강제 임포트로 Import가 완료될 때까지 대기하도록 처리 + var importOptions = ImportAssetOptions.ForceUpdate | ImportAssetOptions.ForceSynchronousImport; + if (AssetDatabase.IsValidFolder(assetPath)) + { + importOptions |= ImportAssetOptions.ImportRecursive; + } + AssetDatabase.ImportAsset(assetPath, importOptions); + + Debug.Log($"{LogPrefix} 에셋 재임포트 완료: {asset.name}"); + } + } + + Debug.Log($"{LogPrefix} Google Sheet 동기화 시작"); + if (GoogleSheetManager != null) + { + await GoogleSheetManager.SyncSoOnlyFromCurrentJson(); + } + else + { + Debug.LogWarning($"{LogPrefix} GoogleSheetManager가 설정되어 있지 않습니다. Google Sheet 동기화를 건너뜁니다."); + } + Debug.Log($"{LogPrefix} Google Sheet 동기화 완료"); + + // 에셋 데이터베이스 최신화 보장 (수동 Reimport 후 상태와 유사하게 유지) + AssetDatabase.Refresh(); + + Debug.Log($"{LogPrefix} 프로젝트 동기화 완료"); + } + } +} \ No newline at end of file diff --git a/Assets/_DDD/Editor/ProjectDDD_Setup.cs.meta b/Assets/_DDD/Editor/ProjectDDD_Setup.cs.meta new file mode 100644 index 000000000..fa16e9c0d --- /dev/null +++ b/Assets/_DDD/Editor/ProjectDDD_Setup.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e5612e4bef4a5cf44b52eaa2739bbe33 \ No newline at end of file diff --git a/Assets/_DDD/Editor/ProjectSetupMenu.cs b/Assets/_DDD/Editor/ProjectSetupMenu.cs new file mode 100644 index 000000000..5e4ab12bd --- /dev/null +++ b/Assets/_DDD/Editor/ProjectSetupMenu.cs @@ -0,0 +1,46 @@ +using System.Linq; +using UnityEditor; +using UnityEngine; + +namespace DDD +{ + public static class ProjectSetupMenu + { + private const string MenuPath = "Tools/Project Setup"; + + [MenuItem(MenuPath)] + public static void OpenSetupByType() + { + var guids = AssetDatabase.FindAssets("t:" + nameof(ProjectDDD_Setup)); + if (guids == null || guids.Length == 0) + { + EditorUtility.DisplayDialog( + "Project Setup", + $"타입 '{nameof(ProjectDDD_Setup)}'의 자산을 찾을 수 없습니다.\n" + + "아래 메뉴로 새 자산을 생성하고 원하는 위치에 보관하세요:\n" + + $"Create > {GetCreateMenuName()}", + "확인"); + return; + } + + var path = AssetDatabase.GUIDToAssetPath(guids.First()); + var asset = AssetDatabase.LoadAssetAtPath(path); + Selection.activeObject = asset; + EditorGUIUtility.PingObject(asset); + } + + private static string GetCreateMenuName() + { + var attributes = typeof(ProjectDDD_Setup).GetCustomAttributes(typeof(CreateAssetMenuAttribute), false); + if (attributes != null && attributes.Length > 0) + { + var attr = (CreateAssetMenuAttribute)attributes[0]; + return string.IsNullOrEmpty(attr.menuName) ? typeof(ProjectDDD_Setup).Name : attr.menuName; + } + + return typeof(ProjectDDD_Setup).Name; + } + } +} + + diff --git a/Assets/_DDD/Editor/ProjectSetupMenu.cs.meta b/Assets/_DDD/Editor/ProjectSetupMenu.cs.meta new file mode 100644 index 000000000..54b78bdc0 --- /dev/null +++ b/Assets/_DDD/Editor/ProjectSetupMenu.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ab18775a9a68dee4c8326f7a3fdccf48 \ No newline at end of file diff --git a/Assets/_DDD/ProjectDDD_Setup.asset b/Assets/_DDD/ProjectDDD_Setup.asset new file mode 100644 index 000000000..5011bbcff --- /dev/null +++ b/Assets/_DDD/ProjectDDD_Setup.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:046d16969d2d5c1cbedb87c69d7ae9c4897f086f5874c9180585105723d21b07 +size 731 diff --git a/Assets/_DDD/ProjectDDD_Setup.asset.meta b/Assets/_DDD/ProjectDDD_Setup.asset.meta new file mode 100644 index 000000000..4f5001036 --- /dev/null +++ b/Assets/_DDD/ProjectDDD_Setup.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 259a2f6a47e3c5746af8c65f213597a0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: