diff --git a/Assets/_DDD/_Scripts/GameUi/New.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi.meta similarity index 77% rename from Assets/_DDD/_Scripts/GameUi/New.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi.meta index 0034041f1..85121fe5f 100644 --- a/Assets/_DDD/_Scripts/GameUi/New.meta +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b710f3e6683e1e649a6d44dc476b5083 +guid: 90688b2dfbadecf42b7d4633bbdc9451 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/BaseUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/BaseUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/BaseUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/BaseUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseViewModelUi.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/BaseViewModelUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseViewModelUi.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/BaseViewModelUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseViewModelUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/BaseViewModelUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseViewModelUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/BaseViewModelUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/New/ViewModels.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis.meta similarity index 77% rename from Assets/_DDD/_Scripts/GameUi/New/ViewModels.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis.meta index f30e4659d..27eae5121 100644 --- a/Assets/_DDD/_Scripts/GameUi/New/ViewModels.meta +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a394c2737bee3d645a8c74d1449d7176 +guid: 8a9408fd7bfaa164696106050b765904 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_DDD/_Scripts/GameUi/FadeUi.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis/FadeUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/FadeUi.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis/FadeUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/FadeUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis/FadeUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/FadeUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis/FadeUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/GlobalMessageUi.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis/GlobalMessageUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/GlobalMessageUi.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis/GlobalMessageUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/GlobalMessageUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis/GlobalMessageUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/GlobalMessageUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis/GlobalMessageUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/New/ViewModels/Base.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/Huds.meta similarity index 77% rename from Assets/_DDD/_Scripts/GameUi/New/ViewModels/Base.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/Huds.meta index e97d0f1fa..41cecd359 100644 --- a/Assets/_DDD/_Scripts/GameUi/New/ViewModels/Base.meta +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/Huds.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c5e7000232c822247a01c4b7c288a6f4 +guid: 892bf1c5b0ddce84eb50d55ae4e306d3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantHud.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/Huds/RestaurantHud.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantHud.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/Huds/RestaurantHud.cs diff --git a/Assets/_DDD/_Scripts/GameUi/RestaurantHud.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/Huds/RestaurantHud.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/RestaurantHud.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/Huds/RestaurantHud.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/InteractionUis.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/InteractionUis.meta new file mode 100644 index 000000000..2fa71bb80 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/InteractionUis.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fe7299c1d4e6fa14d9b53ea86369fcf5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/GameUi/InteractionMessageUi.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/InteractionUis/InteractionMessageUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/InteractionMessageUi.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/InteractionUis/InteractionMessageUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/InteractionMessageUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/InteractionUis/InteractionMessageUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/InteractionMessageUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/InteractionUis/InteractionMessageUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/BasePopupUi.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/BasePopupUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/BasePopupUi.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/BasePopupUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/BasePopupUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/BasePopupUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/BasePopupUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/BasePopupUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi.meta new file mode 100644 index 000000000..eedea3798 --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d3b54802de866fc4c83854d48dae9a5d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/GameUi/ConfirmUi.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/ConfirmUi.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/ConfirmUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/ConfirmUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/ConfirmViewModel.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmViewModel.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/ConfirmViewModel.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmViewModel.cs diff --git a/Assets/_DDD/_Scripts/GameUi/ConfirmViewModel.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmViewModel.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/ConfirmViewModel.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmViewModel.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUi.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/PopupUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUi.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/PopupUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/PopupUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/PopupUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUiState.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/PopupUiState.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUiState.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/PopupUiState.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUiState.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/PopupUiState.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/PopupUiState.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/PopupUiState.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ChecklistData.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ChecklistData.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ChecklistData.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ChecklistData.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ChecklistData.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ChecklistData.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ChecklistData.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ChecklistData.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ChecklistView.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ChecklistView.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ChecklistView.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ChecklistView.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ChecklistView.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ChecklistView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ChecklistView.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ChecklistView.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/InventoryUi.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/InventoryUi.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/New/Services/InventoryService.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventoryService.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/Services/InventoryService.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventoryService.cs diff --git a/Assets/_DDD/_Scripts/GameUi/New/Services/InventoryService.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventoryService.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/Services/InventoryService.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventoryService.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/InventoryUi/InventoryView.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventoryView.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/InventoryUi/InventoryView.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventoryView.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/InventoryUi/InventoryView.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventoryView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/InventoryUi/InventoryView.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventoryView.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/New/ViewModels/InventoryViewModel.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventoryViewModel.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/ViewModels/InventoryViewModel.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventoryViewModel.cs diff --git a/Assets/_DDD/_Scripts/GameUi/New/ViewModels/InventoryViewModel.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventoryViewModel.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/ViewModels/InventoryViewModel.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventoryViewModel.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemDetailView.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemDetailView.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemDetailView.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemDetailView.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemDetailView.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemDetailView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemDetailView.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemDetailView.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IInteractableUi.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IInteractableUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IInteractableUi.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IInteractableUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IInteractableUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IInteractableUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IInteractableUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IInteractableUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IngredientEntry.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IngredientEntry.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IngredientEntry.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IngredientEntry.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IngredientEntry.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IngredientEntry.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/IngredientEntry.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IngredientEntry.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemSlotUi.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemSlotUi.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemSlotUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemSlotUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemViewModel.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemViewModel.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemViewModel.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemViewModel.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemViewModel.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemViewModel.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemViewModel.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemViewModel.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/RestaurantManagementUi.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/RestaurantManagementUi.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/RestaurantManagementUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/RestaurantManagementUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/New/RestaurantManagementViewModel.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementViewModel.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/RestaurantManagementViewModel.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementViewModel.cs diff --git a/Assets/_DDD/_Scripts/GameUi/New/RestaurantManagementViewModel.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementViewModel.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/RestaurantManagementViewModel.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementViewModel.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/ITabButton.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/ITabButton.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/ITabButton.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/ITabButton.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/ITabButton.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/ITabButton.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/ITabButton.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/ITabButton.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/TabButtonUi.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/TabButtonUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/TabButtonUi.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/TabButtonUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/TabButtonUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/TabButtonUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/TabButtonUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/TabButtonUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/TabGroupUi.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/TabGroupUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/TabGroupUi.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/TabGroupUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/TabGroupUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/TabGroupUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TabUi/TabGroupUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/TabGroupUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TasteHashTagSlotUi.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TasteHashTagSlotUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TasteHashTagSlotUi.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TasteHashTagSlotUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TasteHashTagSlotUi.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TasteHashTagSlotUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TasteHashTagSlotUi.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TasteHashTagSlotUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs diff --git a/Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/PopupUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/New/ViewModels/Base/SimpleViewModel.cs b/Assets/_DDD/_Scripts/GameUi/BaseUi/SimpleViewModel.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/ViewModels/Base/SimpleViewModel.cs rename to Assets/_DDD/_Scripts/GameUi/BaseUi/SimpleViewModel.cs diff --git a/Assets/_DDD/_Scripts/GameUi/New/ViewModels/Base/SimpleViewModel.cs.meta b/Assets/_DDD/_Scripts/GameUi/BaseUi/SimpleViewModel.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/ViewModels/Base/SimpleViewModel.cs.meta rename to Assets/_DDD/_Scripts/GameUi/BaseUi/SimpleViewModel.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/Utils.meta b/Assets/_DDD/_Scripts/GameUi/Utils.meta new file mode 100644 index 000000000..8f4bf41de --- /dev/null +++ b/Assets/_DDD/_Scripts/GameUi/Utils.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd877ec1c5fc1ae498e41bbd1d1d9c66 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Scripts/GameUi/New/Utils.meta b/Assets/_DDD/_Scripts/GameUi/Utils/Binding.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/Utils.meta rename to Assets/_DDD/_Scripts/GameUi/Utils/Binding.meta diff --git a/Assets/_DDD/_Scripts/GameUi/New/Utils/BindingContext.cs b/Assets/_DDD/_Scripts/GameUi/Utils/Binding/BindingContext.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/Utils/BindingContext.cs rename to Assets/_DDD/_Scripts/GameUi/Utils/Binding/BindingContext.cs diff --git a/Assets/_DDD/_Scripts/GameUi/New/Utils/BindingContext.cs.meta b/Assets/_DDD/_Scripts/GameUi/Utils/Binding/BindingContext.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/Utils/BindingContext.cs.meta rename to Assets/_DDD/_Scripts/GameUi/Utils/Binding/BindingContext.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/New/Utils/BindingHelper.cs b/Assets/_DDD/_Scripts/GameUi/Utils/Binding/BindingHelper.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/Utils/BindingHelper.cs rename to Assets/_DDD/_Scripts/GameUi/Utils/Binding/BindingHelper.cs diff --git a/Assets/_DDD/_Scripts/GameUi/New/Utils/BindingHelper.cs.meta b/Assets/_DDD/_Scripts/GameUi/Utils/Binding/BindingHelper.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/Utils/BindingHelper.cs.meta rename to Assets/_DDD/_Scripts/GameUi/Utils/Binding/BindingHelper.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/New/Utils/IBindingTarget.cs b/Assets/_DDD/_Scripts/GameUi/Utils/Binding/IBindingTarget.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/Utils/IBindingTarget.cs rename to Assets/_DDD/_Scripts/GameUi/Utils/Binding/IBindingTarget.cs diff --git a/Assets/_DDD/_Scripts/GameUi/New/Utils/IBindingTarget.cs.meta b/Assets/_DDD/_Scripts/GameUi/Utils/Binding/IBindingTarget.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/Utils/IBindingTarget.cs.meta rename to Assets/_DDD/_Scripts/GameUi/Utils/Binding/IBindingTarget.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/New/Converters.meta b/Assets/_DDD/_Scripts/GameUi/Utils/Converters.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/Converters.meta rename to Assets/_DDD/_Scripts/GameUi/Utils/Converters.meta diff --git a/Assets/_DDD/_Scripts/GameUi/New/Converters/CommonConverters.cs b/Assets/_DDD/_Scripts/GameUi/Utils/Converters/CommonConverters.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/Converters/CommonConverters.cs rename to Assets/_DDD/_Scripts/GameUi/Utils/Converters/CommonConverters.cs diff --git a/Assets/_DDD/_Scripts/GameUi/New/Converters/CommonConverters.cs.meta b/Assets/_DDD/_Scripts/GameUi/Utils/Converters/CommonConverters.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/Converters/CommonConverters.cs.meta rename to Assets/_DDD/_Scripts/GameUi/Utils/Converters/CommonConverters.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/New/Converters/IValueConverter.cs b/Assets/_DDD/_Scripts/GameUi/Utils/Converters/IValueConverter.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/Converters/IValueConverter.cs rename to Assets/_DDD/_Scripts/GameUi/Utils/Converters/IValueConverter.cs diff --git a/Assets/_DDD/_Scripts/GameUi/New/Converters/IValueConverter.cs.meta b/Assets/_DDD/_Scripts/GameUi/Utils/Converters/IValueConverter.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/Converters/IValueConverter.cs.meta rename to Assets/_DDD/_Scripts/GameUi/Utils/Converters/IValueConverter.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/New/Services.meta b/Assets/_DDD/_Scripts/GameUi/Utils/Services.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/Services.meta rename to Assets/_DDD/_Scripts/GameUi/Utils/Services.meta diff --git a/Assets/_DDD/_Scripts/GameUi/New/Services/IService.cs b/Assets/_DDD/_Scripts/GameUi/Utils/Services/IService.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/Services/IService.cs rename to Assets/_DDD/_Scripts/GameUi/Utils/Services/IService.cs diff --git a/Assets/_DDD/_Scripts/GameUi/New/Services/IService.cs.meta b/Assets/_DDD/_Scripts/GameUi/Utils/Services/IService.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/New/Services/IService.cs.meta rename to Assets/_DDD/_Scripts/GameUi/Utils/Services/IService.cs.meta