diff --git a/.gitattributes b/.gitattributes index 06142afe7..dcf545082 100644 --- a/.gitattributes +++ b/.gitattributes @@ -72,3 +72,19 @@ *.asmdef text *.sbs filter=lfs diff=lfs merge=lfs -text *.bytes filter=lfs diff=lfs merge=lfs -text + +# --- Review에서 패치 숨기기(소스코드 외 파일) --- +# 아래 규칙은 기존 text/merge/eol 속성은 유지하면서, PR에서 패치(diff) 표시만 숨깁니다. +*.meta -diff +*.prefab -diff +*.unity -diff +*.mat -diff +*.anim -diff +*.controller -diff +*.overrideController -diff +*.mask -diff +*.lighting -diff +*.renderTexture -diff +*.timeline -diff +*.playable -diff +*.spriteatlasv2 -diff diff --git a/Assets/_DDD/_Addressables/AI/Customer/Subtree/CustomerDefault.asset b/Assets/_DDD/_Addressables/AI/Customer/Subtree/CustomerDefault.asset index 0ea95f8d3..db1314a20 100644 --- a/Assets/_DDD/_Addressables/AI/Customer/Subtree/CustomerDefault.asset +++ b/Assets/_DDD/_Addressables/AI/Customer/Subtree/CustomerDefault.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a7ca4b40dc25f4a6ff14a7cbdb2a8be04431ba958038b899fd700df86c4f9618 -size 87312 +oid sha256:af9dba1f3a650104808ecdbc956ad4af8327efcf0fe782348b231eb103f7469b +size 66226 diff --git a/Assets/_DDD/_Addressables/AI/Customer/Subtree/OrderSubtree.asset b/Assets/_DDD/_Addressables/AI/Customer/Subtree/OrderSubtree.asset index 8434d7b80..8e6a2bf26 100644 --- a/Assets/_DDD/_Addressables/AI/Customer/Subtree/OrderSubtree.asset +++ b/Assets/_DDD/_Addressables/AI/Customer/Subtree/OrderSubtree.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:817cecbbecbe8a6519225bc1d0fce376c0dfb14a240c248e3fbdc8a93f585f72 -size 20385 +oid sha256:1e863335f3752df069447ebc0fee597d6f366d88edd12d70db68b45923a4f87c +size 20475 diff --git a/Assets/_DDD/_Scripts/Game.meta b/Assets/_DDD/_Scripts/Game.meta new file mode 100644 index 000000000..72a1c55ab --- /dev/null +++ b/Assets/_DDD/_Scripts/Game.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c82c9604b41d4755b70d679f3a0a3947 +timeCreated: 1756279729 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameCharacter.meta b/Assets/_DDD/_Scripts/Game/GameCharacter.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameCharacter.meta rename to Assets/_DDD/_Scripts/Game/GameCharacter.meta diff --git a/Assets/_DDD/_Scripts/GameCharacter/IGameCharacter.cs b/Assets/_DDD/_Scripts/Game/GameCharacter/IGameCharacter.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameCharacter/IGameCharacter.cs rename to Assets/_DDD/_Scripts/Game/GameCharacter/IGameCharacter.cs diff --git a/Assets/_DDD/_Scripts/GameCharacter/IGameCharacter.cs.meta b/Assets/_DDD/_Scripts/Game/GameCharacter/IGameCharacter.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameCharacter/IGameCharacter.cs.meta rename to Assets/_DDD/_Scripts/Game/GameCharacter/IGameCharacter.cs.meta diff --git a/Assets/_DDD/_Scripts/GameCharacter/IMovementConstraint.cs b/Assets/_DDD/_Scripts/Game/GameCharacter/IMovementConstraint.cs similarity index 72% rename from Assets/_DDD/_Scripts/GameCharacter/IMovementConstraint.cs rename to Assets/_DDD/_Scripts/Game/GameCharacter/IMovementConstraint.cs index 6e290b4e9..064721ade 100644 --- a/Assets/_DDD/_Scripts/GameCharacter/IMovementConstraint.cs +++ b/Assets/_DDD/_Scripts/Game/GameCharacter/IMovementConstraint.cs @@ -1,4 +1,4 @@ -namespace DDD +namespace DDD.Restaurant { public interface IMovementConstraint { diff --git a/Assets/_DDD/_Scripts/GameCharacter/IMovementConstraint.cs.meta b/Assets/_DDD/_Scripts/Game/GameCharacter/IMovementConstraint.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameCharacter/IMovementConstraint.cs.meta rename to Assets/_DDD/_Scripts/Game/GameCharacter/IMovementConstraint.cs.meta diff --git a/Assets/_DDD/_Scripts/GameCharacter/SpineController.cs b/Assets/_DDD/_Scripts/Game/GameCharacter/SpineController.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameCharacter/SpineController.cs rename to Assets/_DDD/_Scripts/Game/GameCharacter/SpineController.cs diff --git a/Assets/_DDD/_Scripts/GameCharacter/SpineController.cs.meta b/Assets/_DDD/_Scripts/Game/GameCharacter/SpineController.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameCharacter/SpineController.cs.meta rename to Assets/_DDD/_Scripts/Game/GameCharacter/SpineController.cs.meta diff --git a/Assets/_DDD/_Scripts/GameController.meta b/Assets/_DDD/_Scripts/Game/GameController.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameController.meta rename to Assets/_DDD/_Scripts/Game/GameController.meta diff --git a/Assets/_DDD/_Scripts/GameController/GameController.cs b/Assets/_DDD/_Scripts/Game/GameController/GameController.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameController/GameController.cs rename to Assets/_DDD/_Scripts/Game/GameController/GameController.cs diff --git a/Assets/_DDD/_Scripts/GameController/GameController.cs.meta b/Assets/_DDD/_Scripts/Game/GameController/GameController.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameController/GameController.cs.meta rename to Assets/_DDD/_Scripts/Game/GameController/GameController.cs.meta diff --git a/Assets/_DDD/_Scripts/GameData.meta b/Assets/_DDD/_Scripts/Game/GameData.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameData.meta rename to Assets/_DDD/_Scripts/Game/GameData.meta diff --git a/Assets/_DDD/_Scripts/GameData/DataManager.cs b/Assets/_DDD/_Scripts/Game/GameData/DataManager.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameData/DataManager.cs rename to Assets/_DDD/_Scripts/Game/GameData/DataManager.cs diff --git a/Assets/_DDD/_Scripts/GameData/DataManager.cs.meta b/Assets/_DDD/_Scripts/Game/GameData/DataManager.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameData/DataManager.cs.meta rename to Assets/_DDD/_Scripts/Game/GameData/DataManager.cs.meta diff --git a/Assets/_DDD/_Scripts/GameData/DataSo.cs b/Assets/_DDD/_Scripts/Game/GameData/DataSo.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameData/DataSo.cs rename to Assets/_DDD/_Scripts/Game/GameData/DataSo.cs diff --git a/Assets/_DDD/_Scripts/GameData/DataSo.cs.meta b/Assets/_DDD/_Scripts/Game/GameData/DataSo.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameData/DataSo.cs.meta rename to Assets/_DDD/_Scripts/Game/GameData/DataSo.cs.meta diff --git a/Assets/_DDD/_Scripts/GameData/GameData.cs b/Assets/_DDD/_Scripts/Game/GameData/GameData.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameData/GameData.cs rename to Assets/_DDD/_Scripts/Game/GameData/GameData.cs diff --git a/Assets/_DDD/_Scripts/GameData/GameData.cs.meta b/Assets/_DDD/_Scripts/Game/GameData/GameData.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameData/GameData.cs.meta rename to Assets/_DDD/_Scripts/Game/GameData/GameData.cs.meta diff --git a/Assets/_DDD/_Scripts/GameData/GameLocalizationData.cs b/Assets/_DDD/_Scripts/Game/GameData/GameLocalizationData.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameData/GameLocalizationData.cs rename to Assets/_DDD/_Scripts/Game/GameData/GameLocalizationData.cs diff --git a/Assets/_DDD/_Scripts/GameData/GameLocalizationData.cs.meta b/Assets/_DDD/_Scripts/Game/GameData/GameLocalizationData.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameData/GameLocalizationData.cs.meta rename to Assets/_DDD/_Scripts/Game/GameData/GameLocalizationData.cs.meta diff --git a/Assets/_DDD/_Scripts/GameData/IId.cs b/Assets/_DDD/_Scripts/Game/GameData/IId.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameData/IId.cs rename to Assets/_DDD/_Scripts/Game/GameData/IId.cs diff --git a/Assets/_DDD/_Scripts/GameData/IId.cs.meta b/Assets/_DDD/_Scripts/Game/GameData/IId.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameData/IId.cs.meta rename to Assets/_DDD/_Scripts/Game/GameData/IId.cs.meta diff --git a/Assets/_DDD/_Scripts/GameData/PopupUiData.cs b/Assets/_DDD/_Scripts/Game/GameData/PopupUiData.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameData/PopupUiData.cs rename to Assets/_DDD/_Scripts/Game/GameData/PopupUiData.cs diff --git a/Assets/_DDD/_Scripts/GameData/PopupUiData.cs.meta b/Assets/_DDD/_Scripts/Game/GameData/PopupUiData.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameData/PopupUiData.cs.meta rename to Assets/_DDD/_Scripts/Game/GameData/PopupUiData.cs.meta diff --git a/Assets/_DDD/_Scripts/GameEvent.meta b/Assets/_DDD/_Scripts/Game/GameEvent.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameEvent.meta rename to Assets/_DDD/_Scripts/Game/GameEvent.meta diff --git a/Assets/_DDD/_Scripts/GameEvent/GameEvents.cs b/Assets/_DDD/_Scripts/Game/GameEvent/GameEvents.cs similarity index 83% rename from Assets/_DDD/_Scripts/GameEvent/GameEvents.cs rename to Assets/_DDD/_Scripts/Game/GameEvent/GameEvents.cs index f1242308e..a899de9f8 100644 --- a/Assets/_DDD/_Scripts/GameEvent/GameEvents.cs +++ b/Assets/_DDD/_Scripts/Game/GameEvent/GameEvents.cs @@ -18,13 +18,6 @@ public static class GameEvents public static InventoryChangedEvent InventoryChangedEvent = new(); public static SmartVariablesDirtyEvent SmartVariablesDirtyEvent = new(); } - - public static class RestaurantEvents - { - public static ItemSlotSelectedEvent ItemSlotSelectedEvent = new(); - public static TodayMenuAddedEvent TodayMenuAddedEvent = new(); - public static TodayMenuRemovedEvent TodayMenuRemovedEvent = new(); - } // public static class VoyageEvents // { @@ -105,20 +98,4 @@ public class SmartVariablesDirtyEvent : IEvent { public SmartVariablesDomain DomainFlags; } - - #region RestaurantInteractionEvents - - public class ItemSlotSelectedEvent : IEvent - { - public ItemModel Model; - } - - public class TodayMenuAddedEvent : IEvent {} - - public class TodayMenuRemovedEvent : IEvent - { - public InventoryCategoryType InventoryCategoryType; - } - - #endregion } diff --git a/Assets/_DDD/_Scripts/GameEvent/GameEvents.cs.meta b/Assets/_DDD/_Scripts/Game/GameEvent/GameEvents.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameEvent/GameEvents.cs.meta rename to Assets/_DDD/_Scripts/Game/GameEvent/GameEvents.cs.meta diff --git a/Assets/_DDD/_Scripts/GameEvent/IInteractable.cs b/Assets/_DDD/_Scripts/Game/GameEvent/IInteractable.cs similarity index 96% rename from Assets/_DDD/_Scripts/GameEvent/IInteractable.cs rename to Assets/_DDD/_Scripts/Game/GameEvent/IInteractable.cs index 7e3ab45d0..c386e8e2a 100644 --- a/Assets/_DDD/_Scripts/GameEvent/IInteractable.cs +++ b/Assets/_DDD/_Scripts/Game/GameEvent/IInteractable.cs @@ -41,7 +41,7 @@ public interface IInteractable { bool CanInteract(); bool IsInteractionHidden(); - bool OnInteracted(IInteractor interactor, ScriptableObject causerPayload = null); + void OnInteracted(IInteractor interactor, ScriptableObject causerPayload = null); InteractionType GetInteractionType(); GameObject GetInteractableGameObject(); void InitializeInteraction(InteractionType interactionType); diff --git a/Assets/_DDD/_Scripts/GameEvent/IInteractable.cs.meta b/Assets/_DDD/_Scripts/Game/GameEvent/IInteractable.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameEvent/IInteractable.cs.meta rename to Assets/_DDD/_Scripts/Game/GameEvent/IInteractable.cs.meta diff --git a/Assets/_DDD/_Scripts/GameEvent/InteractionSubsystem.cs b/Assets/_DDD/_Scripts/Game/GameEvent/InteractionSubsystem.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameEvent/InteractionSubsystem.cs rename to Assets/_DDD/_Scripts/Game/GameEvent/InteractionSubsystem.cs diff --git a/Assets/_DDD/_Scripts/GameEvent/InteractionSubsystem.cs.meta b/Assets/_DDD/_Scripts/Game/GameEvent/InteractionSubsystem.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameEvent/InteractionSubsystem.cs.meta rename to Assets/_DDD/_Scripts/Game/GameEvent/InteractionSubsystem.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFlow.meta b/Assets/_DDD/_Scripts/Game/GameFlow.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFlow.meta rename to Assets/_DDD/_Scripts/Game/GameFlow.meta diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowDataSo.cs b/Assets/_DDD/_Scripts/Game/GameFlow/GameFlowDataSo.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameFlow/GameFlowDataSo.cs rename to Assets/_DDD/_Scripts/Game/GameFlow/GameFlowDataSo.cs diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowDataSo.cs.meta b/Assets/_DDD/_Scripts/Game/GameFlow/GameFlowDataSo.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFlow/GameFlowDataSo.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFlow/GameFlowDataSo.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs b/Assets/_DDD/_Scripts/Game/GameFlow/GameFlowManager.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs rename to Assets/_DDD/_Scripts/Game/GameFlow/GameFlowManager.cs diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs.meta b/Assets/_DDD/_Scripts/Game/GameFlow/GameFlowManager.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFlow/GameFlowManager.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFlow/GameFlowManager.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowSceneMappingSo.cs b/Assets/_DDD/_Scripts/Game/GameFlow/GameFlowSceneMappingSo.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameFlow/GameFlowSceneMappingSo.cs rename to Assets/_DDD/_Scripts/Game/GameFlow/GameFlowSceneMappingSo.cs diff --git a/Assets/_DDD/_Scripts/GameFlow/GameFlowSceneMappingSo.cs.meta b/Assets/_DDD/_Scripts/Game/GameFlow/GameFlowSceneMappingSo.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFlow/GameFlowSceneMappingSo.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFlow/GameFlowSceneMappingSo.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFlow/IGameFlowHandler.cs b/Assets/_DDD/_Scripts/Game/GameFlow/IGameFlowHandler.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameFlow/IGameFlowHandler.cs rename to Assets/_DDD/_Scripts/Game/GameFlow/IGameFlowHandler.cs diff --git a/Assets/_DDD/_Scripts/GameFlow/IGameFlowHandler.cs.meta b/Assets/_DDD/_Scripts/Game/GameFlow/IGameFlowHandler.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFlow/IGameFlowHandler.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFlow/IGameFlowHandler.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFramework.meta b/Assets/_DDD/_Scripts/Game/GameFramework.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework.meta rename to Assets/_DDD/_Scripts/Game/GameFramework.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/EventBus.meta b/Assets/_DDD/_Scripts/Game/GameFramework/EventBus.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/EventBus.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/EventBus.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/EventBus/EventBus.cs b/Assets/_DDD/_Scripts/Game/GameFramework/EventBus/EventBus.cs similarity index 96% rename from Assets/_DDD/_Scripts/GameFramework/EventBus/EventBus.cs rename to Assets/_DDD/_Scripts/Game/GameFramework/EventBus/EventBus.cs index 56ea0f779..cfc7a6420 100644 --- a/Assets/_DDD/_Scripts/GameFramework/EventBus/EventBus.cs +++ b/Assets/_DDD/_Scripts/Game/GameFramework/EventBus/EventBus.cs @@ -39,7 +39,7 @@ public static void Broadcast(T evt) where T : IEvent { foreach (var handler in list.Cast>()) { - handler.Invoke(evt); + handler.HandleEvent(evt); } } } diff --git a/Assets/_DDD/_Scripts/GameFramework/EventBus/EventBus.cs.meta b/Assets/_DDD/_Scripts/Game/GameFramework/EventBus/EventBus.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/EventBus/EventBus.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/EventBus/EventBus.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/EventBus/IEvent.cs b/Assets/_DDD/_Scripts/Game/GameFramework/EventBus/IEvent.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/EventBus/IEvent.cs rename to Assets/_DDD/_Scripts/Game/GameFramework/EventBus/IEvent.cs diff --git a/Assets/_DDD/_Scripts/GameFramework/EventBus/IEvent.cs.meta b/Assets/_DDD/_Scripts/Game/GameFramework/EventBus/IEvent.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/EventBus/IEvent.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/EventBus/IEvent.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/EventBus/IEventHandler.cs b/Assets/_DDD/_Scripts/Game/GameFramework/EventBus/IEventHandler.cs similarity index 72% rename from Assets/_DDD/_Scripts/GameFramework/EventBus/IEventHandler.cs rename to Assets/_DDD/_Scripts/Game/GameFramework/EventBus/IEventHandler.cs index 2239da7c0..03ce3f4b8 100644 --- a/Assets/_DDD/_Scripts/GameFramework/EventBus/IEventHandler.cs +++ b/Assets/_DDD/_Scripts/Game/GameFramework/EventBus/IEventHandler.cs @@ -2,6 +2,6 @@ namespace DDD { public interface IEventHandler where T : IEvent { - void Invoke(T evt); + void HandleEvent(T evt); } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameFramework/EventBus/IEventHandler.cs.meta b/Assets/_DDD/_Scripts/Game/GameFramework/EventBus/IEventHandler.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/EventBus/IEventHandler.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/EventBus/IEventHandler.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/GameManager.cs b/Assets/_DDD/_Scripts/Game/GameFramework/GameManager.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/GameManager.cs rename to Assets/_DDD/_Scripts/Game/GameFramework/GameManager.cs diff --git a/Assets/_DDD/_Scripts/GameFramework/GameManager.cs.meta b/Assets/_DDD/_Scripts/Game/GameFramework/GameManager.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/GameManager.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/GameManager.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/IManager.cs b/Assets/_DDD/_Scripts/Game/GameFramework/IManager.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/IManager.cs rename to Assets/_DDD/_Scripts/Game/GameFramework/IManager.cs diff --git a/Assets/_DDD/_Scripts/GameFramework/IManager.cs.meta b/Assets/_DDD/_Scripts/Game/GameFramework/IManager.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/IManager.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/IManager.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/Localization.meta b/Assets/_DDD/_Scripts/Game/GameFramework/Localization.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Localization.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/Localization.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/Localization/GoogleSheetData.cs b/Assets/_DDD/_Scripts/Game/GameFramework/Localization/GoogleSheetData.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Localization/GoogleSheetData.cs rename to Assets/_DDD/_Scripts/Game/GameFramework/Localization/GoogleSheetData.cs diff --git a/Assets/_DDD/_Scripts/GameFramework/Localization/GoogleSheetData.cs.meta b/Assets/_DDD/_Scripts/Game/GameFramework/Localization/GoogleSheetData.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Localization/GoogleSheetData.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/Localization/GoogleSheetData.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/Localization/GoogleSheetWebClient.cs b/Assets/_DDD/_Scripts/Game/GameFramework/Localization/GoogleSheetWebClient.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Localization/GoogleSheetWebClient.cs rename to Assets/_DDD/_Scripts/Game/GameFramework/Localization/GoogleSheetWebClient.cs diff --git a/Assets/_DDD/_Scripts/GameFramework/Localization/GoogleSheetWebClient.cs.meta b/Assets/_DDD/_Scripts/Game/GameFramework/Localization/GoogleSheetWebClient.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Localization/GoogleSheetWebClient.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/Localization/GoogleSheetWebClient.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationExporter.cs b/Assets/_DDD/_Scripts/Game/GameFramework/Localization/LocalizationExporter.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationExporter.cs rename to Assets/_DDD/_Scripts/Game/GameFramework/Localization/LocalizationExporter.cs diff --git a/Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationExporter.cs.meta b/Assets/_DDD/_Scripts/Game/GameFramework/Localization/LocalizationExporter.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationExporter.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/Localization/LocalizationExporter.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationImporter.cs b/Assets/_DDD/_Scripts/Game/GameFramework/Localization/LocalizationImporter.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationImporter.cs rename to Assets/_DDD/_Scripts/Game/GameFramework/Localization/LocalizationImporter.cs diff --git a/Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationImporter.cs.meta b/Assets/_DDD/_Scripts/Game/GameFramework/Localization/LocalizationImporter.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationImporter.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/Localization/LocalizationImporter.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationManager.cs b/Assets/_DDD/_Scripts/Game/GameFramework/Localization/LocalizationManager.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationManager.cs rename to Assets/_DDD/_Scripts/Game/GameFramework/Localization/LocalizationManager.cs diff --git a/Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationManager.cs.meta b/Assets/_DDD/_Scripts/Game/GameFramework/Localization/LocalizationManager.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationManager.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/Localization/LocalizationManager.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationSyncTool.cs b/Assets/_DDD/_Scripts/Game/GameFramework/Localization/LocalizationSyncTool.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationSyncTool.cs rename to Assets/_DDD/_Scripts/Game/GameFramework/Localization/LocalizationSyncTool.cs diff --git a/Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationSyncTool.cs.meta b/Assets/_DDD/_Scripts/Game/GameFramework/Localization/LocalizationSyncTool.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Localization/LocalizationSyncTool.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/Localization/LocalizationSyncTool.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/Localization/SmartStringVariables.cs b/Assets/_DDD/_Scripts/Game/GameFramework/Localization/SmartStringVariables.cs similarity index 98% rename from Assets/_DDD/_Scripts/GameFramework/Localization/SmartStringVariables.cs rename to Assets/_DDD/_Scripts/Game/GameFramework/Localization/SmartStringVariables.cs index 0dbf0df71..cb58e35e0 100644 --- a/Assets/_DDD/_Scripts/GameFramework/Localization/SmartStringVariables.cs +++ b/Assets/_DDD/_Scripts/Game/GameFramework/Localization/SmartStringVariables.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using DDD.Restaurant; using UnityEngine; using UnityEngine.Localization.SmartFormat.PersistentVariables; @@ -71,7 +72,7 @@ public void PostInit() EventBus.Register(this); } - public void Invoke(SmartVariablesDirtyEvent evt) + public void HandleEvent(SmartVariablesDirtyEvent evt) { var flags = evt.DomainFlags; if (flags == SmartVariablesDomain.All) diff --git a/Assets/_DDD/_Scripts/GameFramework/Localization/SmartStringVariables.cs.meta b/Assets/_DDD/_Scripts/Game/GameFramework/Localization/SmartStringVariables.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Localization/SmartStringVariables.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/Localization/SmartStringVariables.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/ManagerDefinitionSo.cs b/Assets/_DDD/_Scripts/Game/GameFramework/ManagerDefinitionSo.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/ManagerDefinitionSo.cs rename to Assets/_DDD/_Scripts/Game/GameFramework/ManagerDefinitionSo.cs diff --git a/Assets/_DDD/_Scripts/GameFramework/ManagerDefinitionSo.cs.meta b/Assets/_DDD/_Scripts/Game/GameFramework/ManagerDefinitionSo.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/ManagerDefinitionSo.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/ManagerDefinitionSo.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/PlayerManager.cs b/Assets/_DDD/_Scripts/Game/GameFramework/PlayerManager.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/PlayerManager.cs rename to Assets/_DDD/_Scripts/Game/GameFramework/PlayerManager.cs diff --git a/Assets/_DDD/_Scripts/GameFramework/PlayerManager.cs.meta b/Assets/_DDD/_Scripts/Game/GameFramework/PlayerManager.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/PlayerManager.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/PlayerManager.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/Scene.meta b/Assets/_DDD/_Scripts/Game/GameFramework/Scene.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Scene.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/Scene.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs b/Assets/_DDD/_Scripts/Game/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs rename to Assets/_DDD/_Scripts/Game/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs diff --git a/Assets/_DDD/_Scripts/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs.meta b/Assets/_DDD/_Scripts/Game/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/Scene/FadeSceneTransitionHandlerSo.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/Scene/SceneManager.cs b/Assets/_DDD/_Scripts/Game/GameFramework/Scene/SceneManager.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Scene/SceneManager.cs rename to Assets/_DDD/_Scripts/Game/GameFramework/Scene/SceneManager.cs diff --git a/Assets/_DDD/_Scripts/GameFramework/Scene/SceneManager.cs.meta b/Assets/_DDD/_Scripts/Game/GameFramework/Scene/SceneManager.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Scene/SceneManager.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/Scene/SceneManager.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandler.cs b/Assets/_DDD/_Scripts/Game/GameFramework/Scene/SceneTransitionHandler.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandler.cs rename to Assets/_DDD/_Scripts/Game/GameFramework/Scene/SceneTransitionHandler.cs diff --git a/Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandler.cs.meta b/Assets/_DDD/_Scripts/Game/GameFramework/Scene/SceneTransitionHandler.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandler.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/Scene/SceneTransitionHandler.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandlerSo.cs b/Assets/_DDD/_Scripts/Game/GameFramework/Scene/SceneTransitionHandlerSo.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandlerSo.cs rename to Assets/_DDD/_Scripts/Game/GameFramework/Scene/SceneTransitionHandlerSo.cs diff --git a/Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandlerSo.cs.meta b/Assets/_DDD/_Scripts/Game/GameFramework/Scene/SceneTransitionHandlerSo.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/Scene/SceneTransitionHandlerSo.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/Scene/SceneTransitionHandlerSo.cs.meta diff --git a/Assets/_DDD/_Scripts/GameFramework/TimeManager.cs b/Assets/_DDD/_Scripts/Game/GameFramework/TimeManager.cs similarity index 97% rename from Assets/_DDD/_Scripts/GameFramework/TimeManager.cs rename to Assets/_DDD/_Scripts/Game/GameFramework/TimeManager.cs index 536e4bcb0..6ea575988 100644 --- a/Assets/_DDD/_Scripts/GameFramework/TimeManager.cs +++ b/Assets/_DDD/_Scripts/Game/GameFramework/TimeManager.cs @@ -68,7 +68,7 @@ private void UpdateTimeScale() public bool IsPaused => Mathf.Approximately(CurrentTimeScale, 0f); - public void Invoke(TimeScaleChangeEvent evt) + public void HandleEvent(TimeScaleChangeEvent evt) { if (evt.NewTimeScale < 1f) { diff --git a/Assets/_DDD/_Scripts/GameFramework/TimeManager.cs.meta b/Assets/_DDD/_Scripts/Game/GameFramework/TimeManager.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameFramework/TimeManager.cs.meta rename to Assets/_DDD/_Scripts/Game/GameFramework/TimeManager.cs.meta diff --git a/Assets/_DDD/_Scripts/GameState.meta b/Assets/_DDD/_Scripts/Game/GameState.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameState.meta rename to Assets/_DDD/_Scripts/Game/GameState.meta diff --git a/Assets/_DDD/_Scripts/GameState/GameLevelState.cs b/Assets/_DDD/_Scripts/Game/GameState/GameLevelState.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameState/GameLevelState.cs rename to Assets/_DDD/_Scripts/Game/GameState/GameLevelState.cs diff --git a/Assets/_DDD/_Scripts/GameState/GameLevelState.cs.meta b/Assets/_DDD/_Scripts/Game/GameState/GameLevelState.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameState/GameLevelState.cs.meta rename to Assets/_DDD/_Scripts/Game/GameState/GameLevelState.cs.meta diff --git a/Assets/_DDD/_Scripts/GameState/GameState.cs b/Assets/_DDD/_Scripts/Game/GameState/GameState.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameState/GameState.cs rename to Assets/_DDD/_Scripts/Game/GameState/GameState.cs diff --git a/Assets/_DDD/_Scripts/GameState/GameState.cs.meta b/Assets/_DDD/_Scripts/Game/GameState/GameState.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameState/GameState.cs.meta rename to Assets/_DDD/_Scripts/Game/GameState/GameState.cs.meta diff --git a/Assets/_DDD/_Scripts/GameState/InventoryItemData.cs b/Assets/_DDD/_Scripts/Game/GameState/InventoryItemData.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameState/InventoryItemData.cs rename to Assets/_DDD/_Scripts/Game/GameState/InventoryItemData.cs diff --git a/Assets/_DDD/_Scripts/GameState/InventoryItemData.cs.meta b/Assets/_DDD/_Scripts/Game/GameState/InventoryItemData.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameState/InventoryItemData.cs.meta rename to Assets/_DDD/_Scripts/Game/GameState/InventoryItemData.cs.meta diff --git a/Assets/_DDD/_Scripts/GameState/InventoryManager.cs b/Assets/_DDD/_Scripts/Game/GameState/InventoryManager.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameState/InventoryManager.cs rename to Assets/_DDD/_Scripts/Game/GameState/InventoryManager.cs diff --git a/Assets/_DDD/_Scripts/GameState/InventoryManager.cs.meta b/Assets/_DDD/_Scripts/Game/GameState/InventoryManager.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameState/InventoryManager.cs.meta rename to Assets/_DDD/_Scripts/Game/GameState/InventoryManager.cs.meta diff --git a/Assets/_DDD/_Scripts/GameState/InventoryTestDataSo.cs b/Assets/_DDD/_Scripts/Game/GameState/InventoryTestDataSo.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameState/InventoryTestDataSo.cs rename to Assets/_DDD/_Scripts/Game/GameState/InventoryTestDataSo.cs diff --git a/Assets/_DDD/_Scripts/GameState/InventoryTestDataSo.cs.meta b/Assets/_DDD/_Scripts/Game/GameState/InventoryTestDataSo.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameState/InventoryTestDataSo.cs.meta rename to Assets/_DDD/_Scripts/Game/GameState/InventoryTestDataSo.cs.meta diff --git a/Assets/_DDD/_Scripts/GameState/TestInventoryEditorTool.cs b/Assets/_DDD/_Scripts/Game/GameState/TestInventoryEditorTool.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameState/TestInventoryEditorTool.cs rename to Assets/_DDD/_Scripts/Game/GameState/TestInventoryEditorTool.cs diff --git a/Assets/_DDD/_Scripts/GameState/TestInventoryEditorTool.cs.meta b/Assets/_DDD/_Scripts/Game/GameState/TestInventoryEditorTool.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameState/TestInventoryEditorTool.cs.meta rename to Assets/_DDD/_Scripts/Game/GameState/TestInventoryEditorTool.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi.meta b/Assets/_DDD/_Scripts/Game/GameUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi.meta rename to Assets/_DDD/_Scripts/Game/GameUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi.meta b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi.meta rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/BaseUi.cs b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/BaseUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/BaseUi.cs rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/BaseUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/BaseUi.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/BaseUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/BaseUi.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/BaseUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/BaseViewModelUi.cs b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/BaseViewModelUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/BaseViewModelUi.cs rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/BaseViewModelUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/BaseViewModelUi.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/BaseViewModelUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/BaseViewModelUi.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/BaseViewModelUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis.meta b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/CommonUis.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis.meta rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/CommonUis.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis/FadeUi.cs b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/CommonUis/FadeUi.cs similarity index 93% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis/FadeUi.cs rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/CommonUis/FadeUi.cs index e9ea42a6f..6cb05137b 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis/FadeUi.cs +++ b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/CommonUis/FadeUi.cs @@ -23,12 +23,12 @@ protected override void OnCreatedInitialize() EventBus.Register(this); } - public void Invoke(FadeInEvent evt) + public void HandleEvent(FadeInEvent evt) { _ = FadeInAsync(evt); } - public void Invoke(FadeOutEvent evt) + public void HandleEvent(FadeOutEvent evt) { _ = FadeOutAsync(evt); } diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis/FadeUi.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/CommonUis/FadeUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis/FadeUi.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/CommonUis/FadeUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis/GlobalMessageUi.cs b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/CommonUis/GlobalMessageUi.cs similarity index 97% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis/GlobalMessageUi.cs rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/CommonUis/GlobalMessageUi.cs index 7dc140664..11ff40751 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis/GlobalMessageUi.cs +++ b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/CommonUis/GlobalMessageUi.cs @@ -31,7 +31,7 @@ protected override void OnCreatedInitialize() EventBus.Register(this); } - public void Invoke(ShowGlobalMessageEvent evt) + public void HandleEvent(ShowGlobalMessageEvent evt) { _messageQueue.Enqueue(evt); TryDisplayNext(); diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis/GlobalMessageUi.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/CommonUis/GlobalMessageUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/CommonUis/GlobalMessageUi.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/CommonUis/GlobalMessageUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/Huds.meta b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/Huds.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/Huds.meta rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/Huds.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/Huds/RestaurantHud.cs b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/Huds/RestaurantHud.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/Huds/RestaurantHud.cs rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/Huds/RestaurantHud.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/Huds/RestaurantHud.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/Huds/RestaurantHud.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/Huds/RestaurantHud.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/Huds/RestaurantHud.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/InteractionUis.meta b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/InteractionUis.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/InteractionUis.meta rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/InteractionUis.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/InteractionUis/InteractionMessageUi.cs b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/InteractionUis/InteractionMessageUi.cs similarity index 94% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/InteractionUis/InteractionMessageUi.cs rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/InteractionUis/InteractionMessageUi.cs index fa5191a46..9062a088b 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/InteractionUis/InteractionMessageUi.cs +++ b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/InteractionUis/InteractionMessageUi.cs @@ -35,12 +35,12 @@ protected override void OnCreatedInitialize() EventBus.Register(this); } - public void Invoke(ShowInteractionUiEvent evt) + public void HandleEvent(ShowInteractionUiEvent evt) { ShowInteractionUiEvent(evt); } - public void Invoke(HideInteractionUiEvent evt) + public void HandleEvent(HideInteractionUiEvent evt) { HideInteractionUiEvent(evt); } diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/InteractionUis/InteractionMessageUi.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/InteractionUis/InteractionMessageUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/InteractionUis/InteractionMessageUi.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/InteractionUis/InteractionMessageUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis.meta b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis.meta rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/BasePopupUi.cs b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/BasePopupUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/BasePopupUi.cs rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/BasePopupUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/BasePopupUi.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/BasePopupUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/BasePopupUi.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/BasePopupUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi.meta b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/ConfirmUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi.meta rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/ConfirmUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmUi.cs b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmUi.cs rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmUi.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmUi.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmViewModel.cs b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmViewModel.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmViewModel.cs rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmViewModel.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmViewModel.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmViewModel.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmViewModel.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/ConfirmUi/ConfirmViewModel.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/PopupUi.cs b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/PopupUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/PopupUi.cs rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/PopupUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/PopupUi.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/PopupUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/PopupUi.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/PopupUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/UiState.cs b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/UiState.cs similarity index 98% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/UiState.cs rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/UiState.cs index ecb2e0bc5..5070d8a98 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/UiState.cs +++ b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/UiState.cs @@ -62,7 +62,7 @@ public void UnregisterPopupUI(BasePopupUi ui) } } - public void Invoke(OpenPopupUiEvent evt) + public void HandleEvent(OpenPopupUiEvent evt) { if (_popupUis.TryGetValue(evt.UiType, out var popup)) { @@ -82,7 +82,7 @@ public void Invoke(OpenPopupUiEvent evt) } } - public void Invoke(ClosePopupUiEvent evt) + public void HandleEvent(ClosePopupUiEvent evt) { if (_popupUis.TryGetValue(evt.UiType, out var popup)) { diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/UiState.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/UiState.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/UiState.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/PopupUis/UiState.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/SimpleViewModel.cs b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/SimpleViewModel.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/SimpleViewModel.cs rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/SimpleViewModel.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/SimpleViewModel.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/BaseUi/SimpleViewModel.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/SimpleViewModel.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/BaseUi/SimpleViewModel.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/CommonButton.cs b/Assets/_DDD/_Scripts/Game/GameUi/CommonButton.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/CommonButton.cs rename to Assets/_DDD/_Scripts/Game/GameUi/CommonButton.cs diff --git a/Assets/_DDD/_Scripts/GameUi/CommonButton.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/CommonButton.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/CommonButton.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/CommonButton.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/ScrollViewUi.meta b/Assets/_DDD/_Scripts/Game/GameUi/ScrollViewUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/ScrollViewUi.meta rename to Assets/_DDD/_Scripts/Game/GameUi/ScrollViewUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/ScrollViewUi/AutoScrollToSelected.cs b/Assets/_DDD/_Scripts/Game/GameUi/ScrollViewUi/AutoScrollToSelected.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/ScrollViewUi/AutoScrollToSelected.cs rename to Assets/_DDD/_Scripts/Game/GameUi/ScrollViewUi/AutoScrollToSelected.cs diff --git a/Assets/_DDD/_Scripts/GameUi/ScrollViewUi/AutoScrollToSelected.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/ScrollViewUi/AutoScrollToSelected.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/ScrollViewUi/AutoScrollToSelected.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/ScrollViewUi/AutoScrollToSelected.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/ScrollViewUi/IAutoScrollItem.cs b/Assets/_DDD/_Scripts/Game/GameUi/ScrollViewUi/IAutoScrollItem.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/ScrollViewUi/IAutoScrollItem.cs rename to Assets/_DDD/_Scripts/Game/GameUi/ScrollViewUi/IAutoScrollItem.cs diff --git a/Assets/_DDD/_Scripts/GameUi/ScrollViewUi/IAutoScrollItem.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/ScrollViewUi/IAutoScrollItem.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/ScrollViewUi/IAutoScrollItem.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/ScrollViewUi/IAutoScrollItem.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/UiManager.cs b/Assets/_DDD/_Scripts/Game/GameUi/UiManager.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/UiManager.cs rename to Assets/_DDD/_Scripts/Game/GameUi/UiManager.cs diff --git a/Assets/_DDD/_Scripts/GameUi/UiManager.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/UiManager.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/UiManager.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/UiManager.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/Utils.meta b/Assets/_DDD/_Scripts/Game/GameUi/Utils.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/Utils.meta rename to Assets/_DDD/_Scripts/Game/GameUi/Utils.meta diff --git a/Assets/_DDD/_Scripts/GameUi/Utils/Binding.meta b/Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/Utils/Binding.meta rename to Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding.meta diff --git a/Assets/_DDD/_Scripts/GameUi/Utils/Binding/BindingContext.cs b/Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding/BindingContext.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/Utils/Binding/BindingContext.cs rename to Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding/BindingContext.cs diff --git a/Assets/_DDD/_Scripts/GameUi/Utils/Binding/BindingContext.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding/BindingContext.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/Utils/Binding/BindingContext.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding/BindingContext.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/Utils/Binding/BindingHelper.cs b/Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding/BindingHelper.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/Utils/Binding/BindingHelper.cs rename to Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding/BindingHelper.cs diff --git a/Assets/_DDD/_Scripts/GameUi/Utils/Binding/BindingHelper.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding/BindingHelper.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/Utils/Binding/BindingHelper.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding/BindingHelper.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/Utils/Binding/BindingPath.cs b/Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding/BindingPath.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/Utils/Binding/BindingPath.cs rename to Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding/BindingPath.cs diff --git a/Assets/_DDD/_Scripts/GameUi/Utils/Binding/BindingPath.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding/BindingPath.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/Utils/Binding/BindingPath.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding/BindingPath.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/Utils/Binding/IBindingTarget.cs b/Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding/IBindingTarget.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/Utils/Binding/IBindingTarget.cs rename to Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding/IBindingTarget.cs diff --git a/Assets/_DDD/_Scripts/GameUi/Utils/Binding/IBindingTarget.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding/IBindingTarget.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/Utils/Binding/IBindingTarget.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/Utils/Binding/IBindingTarget.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/Utils/Converters.meta b/Assets/_DDD/_Scripts/Game/GameUi/Utils/Converters.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/Utils/Converters.meta rename to Assets/_DDD/_Scripts/Game/GameUi/Utils/Converters.meta diff --git a/Assets/_DDD/_Scripts/GameUi/Utils/Converters/CommonConverters.cs b/Assets/_DDD/_Scripts/Game/GameUi/Utils/Converters/CommonConverters.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/Utils/Converters/CommonConverters.cs rename to Assets/_DDD/_Scripts/Game/GameUi/Utils/Converters/CommonConverters.cs diff --git a/Assets/_DDD/_Scripts/GameUi/Utils/Converters/CommonConverters.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/Utils/Converters/CommonConverters.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/Utils/Converters/CommonConverters.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/Utils/Converters/CommonConverters.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/Utils/Converters/IValueConverter.cs b/Assets/_DDD/_Scripts/Game/GameUi/Utils/Converters/IValueConverter.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/Utils/Converters/IValueConverter.cs rename to Assets/_DDD/_Scripts/Game/GameUi/Utils/Converters/IValueConverter.cs diff --git a/Assets/_DDD/_Scripts/GameUi/Utils/Converters/IValueConverter.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/Utils/Converters/IValueConverter.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/Utils/Converters/IValueConverter.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/Utils/Converters/IValueConverter.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/Utils/IUiView.cs b/Assets/_DDD/_Scripts/Game/GameUi/Utils/IUiView.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/Utils/IUiView.cs rename to Assets/_DDD/_Scripts/Game/GameUi/Utils/IUiView.cs diff --git a/Assets/_DDD/_Scripts/GameUi/Utils/IUiView.cs.meta b/Assets/_DDD/_Scripts/Game/GameUi/Utils/IUiView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/Utils/IUiView.cs.meta rename to Assets/_DDD/_Scripts/Game/GameUi/Utils/IUiView.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant.meta b/Assets/_DDD/_Scripts/Restaurant.meta new file mode 100644 index 000000000..dcded6900 --- /dev/null +++ b/Assets/_DDD/_Scripts/Restaurant.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8abdb2bb619b4d76941689e4589aa80f +timeCreated: 1756279736 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter.meta b/Assets/_DDD/_Scripts/Restaurant/Character.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter.meta rename to Assets/_DDD/_Scripts/Restaurant/Character.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Common.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Common.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Common.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Common/Actions.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Actions.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Common/Actions.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Actions.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Common/Actions/LookAtInteractionTarget.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Actions/LookAtInteractionTarget.cs similarity index 92% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Common/Actions/LookAtInteractionTarget.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Actions/LookAtInteractionTarget.cs index 8abdaabe7..e00335603 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Common/Actions/LookAtInteractionTarget.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Actions/LookAtInteractionTarget.cs @@ -2,7 +2,7 @@ using Opsive.BehaviorDesigner.Runtime.Tasks.Actions; using UnityEngine; -namespace DDD +namespace DDD.Restaurant { /// /// 인터랙션 타겟을 바라보도록 시각(Spine/애니메이션) 컴포넌트에 위임하는 액션의 껍데기/골격. @@ -13,8 +13,6 @@ public class LookAtInteractionTarget : Action [Header("Target Settings")] [Tooltip("InteractionPoints를 사용해 가장 적절한 지점을 바라봄")] [SerializeField] private bool useInteractionPoints = true; - [Tooltip("타겟이 없을 때 즉시 실패할지 여부")] - [SerializeField] private bool failIfNoTarget = true; [Header("Update Settings")] [Tooltip("프레임마다 갱신하여 지속적으로 바라볼지 (Running 반환) 여부. 비활성화 시 1회만 시도하고 성공 처리")] @@ -55,7 +53,7 @@ public override TaskStatus OnUpdate() visual?.EndLookAt(); isLooking = false; } - return failIfNoTarget ? TaskStatus.Failure : TaskStatus.Success; + return TaskStatus.Success; } currentLookPosition = CalculateLookPosition(target); @@ -91,14 +89,14 @@ private GameObject GetTarget() return cachedTarget; // 블랙보드에서 타겟 검색 - cachedTarget = gameObject.GetComponentInParent() + cachedTarget = gameObject.GetComponent() ?.GetCurrentInteractionTarget(); if (IsValidTarget(cachedTarget)) return cachedTarget; // Interactor의 포커스된 타겟 검색 - var interactor = gameObject.GetComponentInParent(); + var interactor = gameObject.GetComponent(); var focusedInteractable = interactor?.GetFocusedInteractable(); cachedTarget = focusedInteractable?.GetInteractableGameObject(); diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Common/Actions/LookAtInteractionTarget.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Actions/LookAtInteractionTarget.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Common/Actions/LookAtInteractionTarget.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Actions/LookAtInteractionTarget.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Common/Actions/MoveToInteractionTarget.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Actions/MoveToInteractionTarget.cs similarity index 59% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Common/Actions/MoveToInteractionTarget.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Actions/MoveToInteractionTarget.cs index 828782504..58a3ce5a7 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Common/Actions/MoveToInteractionTarget.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Actions/MoveToInteractionTarget.cs @@ -2,7 +2,7 @@ using Opsive.BehaviorDesigner.Runtime.Tasks.Actions; using UnityEngine; -namespace DDD +namespace DDD.Restaurant { /// /// IAiMovement를 이용해 인터랙션 타겟으로 이동하는 액션 @@ -12,8 +12,6 @@ public class MoveToInteractionTarget : Action [Header("Target Settings")] [Tooltip("InteractionPoints를 사용해 가장 가까운 지점으로 이동")] [SerializeField] private bool useInteractionPoints = true; - [Tooltip("타겟이 없을 때 즉시 실패할지 여부")] - [SerializeField] private bool failIfNoTarget = true; [Header("Movement Settings")] [Tooltip("목적지 도달 거리")] @@ -21,34 +19,36 @@ public class MoveToInteractionTarget : Action [Tooltip("목적지 재계산 주기(초), 0 이하면 비활성화")] [SerializeField] private float repathInterval = 0.5f; - private IAiMovement movement; - private float repathTimer; - private Vector3 currentDestination; - private bool isMoving; - private GameObject cachedTarget; + private IAiMovement _movement; + private float _repathTimer; + private Vector3 _currentDestination; + private bool _isMoving; public override void OnStart() { - if (cachedTarget != null) return; - movement = gameObject.GetComponentInParent(); - repathTimer = 0f; - isMoving = false; - cachedTarget = null; + _movement = gameObject.GetComponent(); + _repathTimer = 0f; + _isMoving = false; + + Debug.Log($"MoveToInteractionTarget - GameObject: {gameObject.name}"); } public override TaskStatus OnUpdate() { - if (movement == null) + if (_movement == null) return TaskStatus.Failure; var target = GetTarget(); if (target == null) - return failIfNoTarget ? TaskStatus.Failure : TaskStatus.Success; + { + return TaskStatus.Running; // If has no target, stuck in this state + } + Debug.Log(target.name); if (ShouldUpdateDestination()) { - currentDestination = CalculateDestination(target); + _currentDestination = CalculateDestination(target); StartOrUpdateMovement(); } @@ -58,42 +58,26 @@ public override TaskStatus OnUpdate() public override void OnEnd() { StopMovement(); - cachedTarget = null; } private GameObject GetTarget() { - // 캐시된 타겟이 유효하면 재사용 - if (IsValidTarget(cachedTarget)) - return cachedTarget; - - // 블랙보드에서 타겟 검색 - cachedTarget = gameObject.GetComponentInParent() - ?.GetCurrentInteractionTarget(); - - if (IsValidTarget(cachedTarget)) - return cachedTarget; - // Interactor의 포커스된 타겟 검색 - var interactor = gameObject.GetComponentInParent(); + var interactor = gameObject.GetComponent(); var focusedInteractable = interactor?.GetFocusedInteractable(); - cachedTarget = focusedInteractable?.GetInteractableGameObject(); - - return cachedTarget; + if (focusedInteractable != null) return focusedInteractable.GetInteractableGameObject(); + return null; } - private bool IsValidTarget(GameObject target) => - target != null && target; - private bool ShouldUpdateDestination() { - repathTimer -= Time.deltaTime; - return !isMoving || (repathInterval > 0f && repathTimer <= 0f); + _repathTimer -= Time.deltaTime; + return !_isMoving || (repathInterval > 0f && _repathTimer <= 0f); } private Vector3 CalculateDestination(GameObject target) { - repathTimer = repathInterval; + _repathTimer = repathInterval; if (!useInteractionPoints) return target.transform.position; @@ -128,27 +112,27 @@ private Vector3 GetNearestInteractionPoint(RestaurantInteractionComponent ric) private void StartOrUpdateMovement() { - if (!isMoving) + if (!_isMoving) { - if (movement.TryMoveToPosition(currentDestination)) + if (_movement.TryMoveToPosition(_currentDestination)) { - movement.EnableMove(); - movement.PlayMove(); - isMoving = true; + _movement.EnableMove(); + _movement.PlayMove(); + _isMoving = true; } } else { - movement.TryMoveToPosition(currentDestination); + _movement.TryMoveToPosition(_currentDestination); } } private TaskStatus CheckMovementCompletion() { - var distanceSqr = (GetAgentPosition() - currentDestination).sqrMagnitude; + var distanceSqr = (GetAgentPosition() - _currentDestination).sqrMagnitude; var stoppingDistanceSqr = stoppingDistance * stoppingDistance; - if (distanceSqr <= stoppingDistanceSqr || movement.HasReachedDestination()) + if (distanceSqr <= stoppingDistanceSqr || _movement.HasReachedDestination()) { StopMovement(); return TaskStatus.Success; @@ -159,15 +143,15 @@ private TaskStatus CheckMovementCompletion() private void StopMovement() { - if (movement != null && isMoving) + if (_movement != null && _isMoving) { - movement.StopMove(); - movement.DisableMove(); - isMoving = false; + _movement.StopMove(); + _movement.DisableMove(); + _isMoving = false; } } private Vector3 GetAgentPosition() => - movement?.CurrentPosition ?? transform.position; + _movement?.CurrentPosition ?? transform.position; } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Common/Actions/MoveToInteractionTarget.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Actions/MoveToInteractionTarget.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Common/Actions/MoveToInteractionTarget.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Actions/MoveToInteractionTarget.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Common/Decorator.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Decorator.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Common/Decorator.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Decorator.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Common/Decorator/TimeLimiter.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Decorator/TimeLimiter.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Common/Decorator/TimeLimiter.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Decorator/TimeLimiter.cs diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Common/Decorator/TimeLimiter.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Decorator/TimeLimiter.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Common/Decorator/TimeLimiter.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Decorator/TimeLimiter.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Actions.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Actions.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Actions/ContinueRestaurantOrder.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/ContinueRestaurantOrder.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Actions/ContinueRestaurantOrder.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/ContinueRestaurantOrder.cs diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Actions/ContinueRestaurantOrder.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/ContinueRestaurantOrder.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Actions/ContinueRestaurantOrder.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/ContinueRestaurantOrder.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Actions/StartRestaurantOrder.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/StartRestaurantOrder.cs similarity index 68% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Actions/StartRestaurantOrder.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/StartRestaurantOrder.cs index bf6f0544b..16216526e 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Actions/StartRestaurantOrder.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/StartRestaurantOrder.cs @@ -2,7 +2,7 @@ using Opsive.BehaviorDesigner.Runtime.Tasks.Actions; using UnityEngine; -namespace DDD +namespace DDD.Restaurant { public class StartRestaurantOrder : Action { @@ -25,7 +25,6 @@ public override void OnStart() public override TaskStatus OnUpdate() { - // TODO : 아래 타겟 찾기가 RestaurantOrderAvailable과 동일해야 함, 동일하면 중복될 필요 없으니 스태틱 유틸 함수정도로 만들어서 공유하기. // 레스토랑 주문 인터랙션 후보를 가져옴 TaskStatus targetSearchSuccess = RestaurantOrderAvailable.FindAvailableOrderInteractable(_requireCanInteract, _targetOrderType, out var outInteractable); @@ -34,34 +33,21 @@ public override TaskStatus OnUpdate() return TaskStatus.Failure; } - // TODO : 아래 상호작용 수행 로직이 우리 프로젝트의 권장하는 방식이 아님. 플레이어가 오브젝트에 인터랙션하는 것과 비슷한 흐름으로 NPC가 오브젝트에 인터랙션하게 만들 것. // 상호작용 수행: 액션이 붙은 에이전트를 Interactor로 사용 if (!_isGetInteractor || !_interactor.CanInteractTo(outInteractable)) { return TaskStatus.Failure; } + // TODO : 아래 상호작용 수행 로직이 우리 프로젝트의 권장하는 방식이 아님. 플레이어가 오브젝트에 인터랙션하는 것과 비슷한 흐름으로 NPC가 오브젝트에 인터랙션하게 만들 것. // TODO : 이벤트 통해서 인터랙션. 직접 호출하지 말 것! - var interacted = outInteractable.OnInteracted(_interactor); - if (!interacted) - { - return TaskStatus.Failure; - } + outInteractable.OnInteracted(_interactor); if (_registerOnBlackboard) { - // 공용 블랙보드 우선 - var shared = gameObject.GetComponentInChildren(); - if (shared != null) - { - shared.SetCurrentInteractionTarget(outInteractable.gameObject); - } - else - { - // 하위 호환: 고객 전용 블랙보드 지원 - var customerBb = gameObject.GetComponentInParent(); - customerBb?.SetCurrentInteractionTarget(outInteractable.gameObject); - } + // 하위 호환: 고객 전용 블랙보드 지원 + var customerBlackboard = gameObject.GetComponent(); + customerBlackboard?.SetCurrentInteractionTarget(outInteractable.gameObject); } return TaskStatus.Success; diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Actions/StartRestaurantOrder.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/StartRestaurantOrder.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Actions/StartRestaurantOrder.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/StartRestaurantOrder.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Actions/WaitForPlayerInteraction.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/WaitForPlayerInteraction.cs similarity index 99% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Actions/WaitForPlayerInteraction.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/WaitForPlayerInteraction.cs index 220788be6..b8da8cbf0 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Actions/WaitForPlayerInteraction.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/WaitForPlayerInteraction.cs @@ -2,7 +2,7 @@ using Opsive.BehaviorDesigner.Runtime.Tasks.Actions; using UnityEngine; -namespace DDD +namespace DDD.Restaurant { //범용적으로 사용할 수 있을 것 같음 //차후 제네릭으로 변경 가능성 있음 diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Actions/WaitForPlayerInteraction.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/WaitForPlayerInteraction.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Actions/WaitForPlayerInteraction.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/WaitForPlayerInteraction.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Conditionals.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Conditionals.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Conditionals.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Conditionals.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Conditionals/RestaurantOrderAvailable.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Conditionals/RestaurantOrderAvailable.cs similarity index 99% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Conditionals/RestaurantOrderAvailable.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Conditionals/RestaurantOrderAvailable.cs index b10254f84..1e99b0ba5 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Conditionals/RestaurantOrderAvailable.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Conditionals/RestaurantOrderAvailable.cs @@ -5,7 +5,7 @@ using UnityEngine; using DDD; -namespace DDD +namespace DDD.Restaurant { public class RestaurantOrderAvailable : Conditional { diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Conditionals/RestaurantOrderAvailable.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Conditionals/RestaurantOrderAvailable.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/Conditionals/RestaurantOrderAvailable.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Conditionals/RestaurantOrderAvailable.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/RestaurantCustomerAiComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerAiComponent.cs similarity index 77% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/RestaurantCustomerAiComponent.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerAiComponent.cs index 6206ce2fb..89593be6d 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/RestaurantCustomerAiComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerAiComponent.cs @@ -5,26 +5,26 @@ using UnityEngine; using UnityEngine.AddressableAssets; -namespace DDD +namespace DDD.Restaurant { [RequireComponent(typeof(BehaviorTree))] - [RequireComponent(typeof(RestaurantCustomerBlackboardComponent))] - public class RestaurantCustomerAiComponent : MonoBehaviour, IRestaurantCustomerAi + [RequireComponent(typeof(CustomerBlackboardComponent))] + public class CustomerAiComponent : MonoBehaviour, ICustomerAi { protected BehaviorTree _behaviorTree; - protected RestaurantCustomerBlackboardComponent _blackboardComponent; + protected CustomerBlackboardComponent _blackboardComponent; private void Awake() { _behaviorTree = GetComponent(); - _blackboardComponent = GetComponent(); + _blackboardComponent = GetComponent(); } - public void InitializeAi(CustomerData inCustomerData) + public async Task InitializeAi(CustomerData inCustomerData) { try { - InitializeAiInternal(inCustomerData); + await InitializeAiInternal(inCustomerData); } catch (Exception e) { diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/RestaurantCustomerAiComponent.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerAiComponent.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/RestaurantCustomerAiComponent.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerAiComponent.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/RestaurantCustomerBlackboardComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerBlackboardComponent.cs similarity index 91% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/RestaurantCustomerBlackboardComponent.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerBlackboardComponent.cs index 98112000e..d23f14605 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/RestaurantCustomerBlackboardComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerBlackboardComponent.cs @@ -3,7 +3,7 @@ namespace DDD { - public class RestaurantCustomerBlackboardComponent : MonoBehaviour, IRestaurantCustomerBlackboard, IAISharedBlackboard + public class CustomerBlackboardComponent : MonoBehaviour, ICustomerBlackboard, IAISharedBlackboard { private Subtree _subtree; private GameObject _currentInteractionTarget; diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/RestaurantCustomerBlackboardComponent.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerBlackboardComponent.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/AI/Customer/RestaurantCustomerBlackboardComponent.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerBlackboardComponent.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Core.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Core.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Core.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Core.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterAnimation.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterAnimation.cs similarity index 89% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterAnimation.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterAnimation.cs index 88058c404..03a4d5a4c 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterAnimation.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterAnimation.cs @@ -3,7 +3,7 @@ namespace DDD { [RequireComponent(typeof(SpineController))] - public class RestaurantCharacterAnimation : MonoBehaviour + public class CharacterAnimation : MonoBehaviour { protected SpineController _spineController; diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterAnimation.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterAnimation.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterAnimation.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterAnimation.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterInteraction.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterInteraction.cs similarity index 50% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterInteraction.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterInteraction.cs index 3db7a4412..d6b1530a5 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterInteraction.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterInteraction.cs @@ -2,9 +2,9 @@ using Sirenix.OdinInspector; using UnityEngine; -namespace DDD +namespace DDD.Restaurant { - public class RestaurantCharacterInteraction : MonoBehaviour, IInteractor, IEventHandler + public class CharacterInteraction : MonoBehaviour, IInteractor, IEventHandler { [EnumToggleButtons, SerializeField] protected InteractionType _availableInteractions; [SerializeField, ReadOnly] protected Collider[] _nearColliders = new Collider[10]; @@ -14,96 +14,36 @@ public class RestaurantCharacterInteraction : MonoBehaviour, IInteractor, IEvent protected IInteractable _nearestInteractable; protected IInteractable _previousInteractable; protected IInteractable _interactingTarget; - - protected float _interactHeldTime; - protected bool _isInteracting; protected float _interactionRadius = 1f; protected LayerMask _interactionLayerMask = (LayerMask)(-1); private Dictionary _cachedSolvers = new(); - protected virtual void Start() { } - - protected virtual void Update() + protected virtual void Start() { - _nearestInteractable = GetNearestInteractable(); - - if (_nearestInteractable != _previousInteractable) - { - _previousInteractable = _nearestInteractable; - OnNearestInteractableChanged(_nearestInteractable); - } - - if (_isInteracting) - { - if (_nearestInteractable != _interactingTarget || CanInteractTo(_interactingTarget) == false) - { - ResetInteractionState(); - return; - } - - _interactHeldTime += Time.deltaTime; - - float requiredHoldTime = _interactingTarget.GetExecutionParameters().HoldTime; - float ratio = Mathf.Clamp01(_interactHeldTime / requiredHoldTime); - - if (_interactHeldTime >= requiredHoldTime) - { - OnInteractionHoldProgress(1f); - _isInteracting = false; - _interactingTarget.OnInteracted(this); - _interactingTarget = null; - OnInteractionCompleted(); - } - - OnInteractionHoldProgress(ratio); - } } - - protected virtual void OnDestroy() { } - - protected virtual void OnNearestInteractableChanged(IInteractable newTarget) { } - protected virtual void OnInteractionHoldProgress(float ratio) { } + + protected virtual void OnDestroy() + { + } + protected virtual void OnInteractionCompleted() { } - - protected void ResetInteractionState() + + public virtual void HandleEvent(RestaurantInteractionEvent evt) { - _isInteracting = false; - _interactingTarget = null; - _interactHeldTime = 0f; - OnInteractionHoldProgress(0f); + Debug.Log($"Event handled : {evt.ToString()}"); } - protected IInteractable GetNearestInteractable() - { - int colliderCount = Physics.OverlapSphereNonAlloc(transform.position, _interactionRadius, _nearColliders, _interactionLayerMask, QueryTriggerInteraction.Collide); - float closestDistance = float.MaxValue; - IInteractable closest = null; - - for (int i = 0; i < colliderCount; i++) - { - var col = _nearColliders[i]; - if (col.TryGetComponent(out var interactable) == false) continue; - - var type = interactable.GetInteractionType(); - if (interactable.IsInteractionHidden()) continue; - if (CanSolveInteractionType(type) == false) continue; - - float distance = Vector3.Distance(transform.position, col.transform.position); - if (distance < closestDistance) - { - closestDistance = distance; - closest = interactable; - } - } - - return closest; - } - - public virtual void Invoke(RestaurantInteractionEvent evt) { } - public GameObject GetInteractorGameObject() => gameObject; + protected void TryInteraction(IInteractable interactable, ScriptableObject payload = null) + { + var causer = gameObject; + var target = interactable.GetInteractableGameObject(); + var interactionType = _nearestInteractable.GetInteractionType(); + RestaurantEvents.InteractionEvent.RequestInteraction(causer, target, interactionType, payload); + } + public IInteractionSolver GetInteractionSolver(InteractionType interactionType) { TryGetSolverForType(interactionType, out var solver); diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterInteraction.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterInteraction.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterInteraction.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterInteraction.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterMovement.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterMovement.cs similarity index 55% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterMovement.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterMovement.cs index 19920b0b2..a7f326db4 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterMovement.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterMovement.cs @@ -2,18 +2,18 @@ namespace DDD { - public class RestaurantCharacterMovement : MonoBehaviour + public class CharacterMovement : MonoBehaviour { - private RestaurantCharacterMovementConstraint _constraint; + private CharacterMovementConstraint _constraint; protected virtual void Awake() { - _constraint = gameObject.AddComponent(); + _constraint = gameObject.AddComponent(); } public virtual bool CanMove() { - // Get all components implements IRestaurantMovementConstraint - var constraints = GetComponents(); + // Get all components implements IMovementConstraint + var constraints = GetComponents(); // TODO : Maybe need optimize GetComponents? foreach (var movementConstraint in constraints) { diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterMovement.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterMovement.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterMovement.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterMovement.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterMovementConstraint.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterMovementConstraint.cs new file mode 100644 index 000000000..076264ed4 --- /dev/null +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterMovementConstraint.cs @@ -0,0 +1,18 @@ +using UnityEngine; + +namespace DDD +{ + [RequireComponent(typeof(CharacterAnimation))] + public class CharacterMovementConstraint : MonoBehaviour, IMovementConstraint + { + public bool IsBlockingMovement() + { + if (GetComponent().IsPlayingAnimation()) + { + return true; + } + + return false; + } + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterMovementConstraint.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterMovementConstraint.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterMovementConstraint.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterMovementConstraint.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterVisual.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterVisual.cs similarity index 93% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterVisual.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterVisual.cs index 13b6bfa02..5b866df48 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterVisual.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterVisual.cs @@ -2,7 +2,7 @@ namespace DDD { - public class RestaurantCharacterVisual : MonoBehaviour + public class CharacterVisual : MonoBehaviour { private ICurrentDirection _iCurrentDirection; diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterVisual.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterVisual.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterVisual.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterVisual.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacter.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Core/RestaurantCharacter.cs similarity index 87% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacter.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Core/RestaurantCharacter.cs index 892a2bbfe..42105fd49 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacter.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Core/RestaurantCharacter.cs @@ -1,18 +1,18 @@ using Sirenix.OdinInspector; using UnityEngine; -namespace DDD +namespace DDD.Restaurant { - [RequireComponent(typeof(RestaurantCharacterInteraction))] + [RequireComponent(typeof(CharacterInteraction))] [RequireComponent(typeof(SpineController))] public class RestaurantCharacter : MonoBehaviour, IGameCharacter, IInteractor { - RestaurantCharacterInteraction _interactionComponent; + CharacterInteraction _interactionComponent; protected SpineController _spineController; protected virtual void Awake() { - _interactionComponent = GetComponent(); + _interactionComponent = GetComponent(); _spineController = GetComponent(); foreach (var typeToSolver in RestaurantInteractionEventSolvers.TypeToSolver) { diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacter.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Core/RestaurantCharacter.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacter.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Core/RestaurantCharacter.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Interfaces.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/IAiMovement.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/IAiMovement.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/IAiMovement.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/IAiMovement.cs diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/IAiMovement.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/IAiMovement.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/IAiMovement.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/IAiMovement.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/ICurrentDirection.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICurrentDirection.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/ICurrentDirection.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICurrentDirection.cs diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/ICurrentDirection.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICurrentDirection.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/ICurrentDirection.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICurrentDirection.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerAi.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerAi.cs new file mode 100644 index 000000000..6fc7ad64f --- /dev/null +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerAi.cs @@ -0,0 +1,9 @@ +using System.Threading.Tasks; + +namespace DDD +{ + public interface ICustomerAi + { + Task InitializeAi(CustomerData inCustomerData); + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/IRestaurantCustomerAi.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerAi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/IRestaurantCustomerAi.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerAi.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/IRestaurantCustomerBlackboard.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerBlackboard.cs similarity index 88% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/IRestaurantCustomerBlackboard.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerBlackboard.cs index 51859cddf..3f811c8a3 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/IRestaurantCustomerBlackboard.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerBlackboard.cs @@ -9,7 +9,7 @@ public enum RestaurantCustomerBlackboardKey CurrentInteractionTarget, } - public interface IRestaurantCustomerBlackboard + public interface ICustomerBlackboard { void SetCustomerData(CustomerData inCustomerData); void SetCurrentInteractionTarget(GameObject targetGameObject); diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/IRestaurantCustomerBlackboard.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerBlackboard.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/IRestaurantCustomerBlackboard.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerBlackboard.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/IRestaurantMovementConstraint.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/IMovementConstraint.cs similarity index 58% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/IRestaurantMovementConstraint.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/IMovementConstraint.cs index 462d87b94..5bb57d976 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/IRestaurantMovementConstraint.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/IMovementConstraint.cs @@ -1,6 +1,6 @@ namespace DDD { - public interface IRestaurantMovementConstraint + public interface IMovementConstraint { public bool IsBlockingMovement(); } diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/IRestaurantMovementConstraint.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/IMovementConstraint.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/IRestaurantMovementConstraint.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/IMovementConstraint.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Npc.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Npc.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Npc.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Npc.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/Customer.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Npc/Customer.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/Customer/CustomerCharacter.cs similarity index 58% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Npc/Customer/CustomerCharacter.cs index bba008853..6dc164fa9 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/Customer/CustomerCharacter.cs @@ -3,24 +3,24 @@ using UnityEngine; using UnityEngine.AddressableAssets; -namespace DDD +namespace DDD.Restaurant { - [RequireComponent(typeof(RestaurantCustomerAiComponent))] - public class CustomerCharacter : RestaurantNpcCharacter, ICustomerInitializer + [RequireComponent(typeof(CustomerAiComponent))] + public class CustomerCharacter : NpcCharacter, ICustomerInitializer { private CustomerData _customerData; - protected IRestaurantCustomerAi restaurantCustomerAi; + protected ICustomerAi _customerAi; protected override void Awake() { base.Awake(); - restaurantCustomerAi = GetComponent(); + _customerAi = GetComponent(); } public void Initialize(CustomerData customerData) { _customerData = customerData; - restaurantCustomerAi.InitializeAi(_customerData); + _customerAi.InitializeAi(_customerData); // 스킨 설정 _spineController.SetSkin(_customerData.SpineSkinKey); diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/Customer/CustomerCharacter.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Npc/Customer/CustomerCharacter.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/RestaurantNpcCharacter.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcCharacter.cs similarity index 55% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Npc/RestaurantNpcCharacter.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcCharacter.cs index 0b55d5293..10e29bd62 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/RestaurantNpcCharacter.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcCharacter.cs @@ -1,10 +1,10 @@ using Opsive.BehaviorDesigner.Runtime; using UnityEngine; -namespace DDD +namespace DDD.Restaurant { - [RequireComponent(typeof(RestaurantNpcMovement))] - public class RestaurantNpcCharacter : RestaurantCharacter + [RequireComponent(typeof(NpcMovement))] + public class NpcCharacter : RestaurantCharacter { protected override void Awake() { diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/RestaurantNpcCharacter.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcCharacter.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Npc/RestaurantNpcCharacter.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcCharacter.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/RestaurantNpcMovement.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcMovement.cs similarity index 98% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Npc/RestaurantNpcMovement.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcMovement.cs index e73acf69f..4248d0aa1 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/RestaurantNpcMovement.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcMovement.cs @@ -4,7 +4,7 @@ namespace DDD { [RequireComponent(typeof(AIPath))] - public class RestaurantNpcMovement : RestaurantCharacterMovement, IAiMovement, ICurrentDirection + public class NpcMovement : CharacterMovement, IAiMovement, ICurrentDirection { private IAstarAI _iAstarAi; private Vector3 _lastDirection = Vector3.forward; diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Npc/RestaurantNpcMovement.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcMovement.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Npc/RestaurantNpcMovement.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcMovement.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Player.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Player.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Player.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Player.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerAnimation.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerAnimation.cs similarity index 56% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerAnimation.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerAnimation.cs index 603944132..8ae579f6d 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerAnimation.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerAnimation.cs @@ -1,35 +1,35 @@ using UnityEngine; -namespace DDD +namespace DDD.Restaurant { - [RequireComponent(typeof(RestaurantPlayerMovement))] - public class RestaurantPlayerAnimation : RestaurantCharacterAnimation + [RequireComponent(typeof(PlayerMovement))] + public class PlayerAnimation : CharacterAnimation { - private RestaurantPlayerMovement _restaurantPlayerMovement; + private PlayerMovement _playerMovement; protected override void Awake() { base.Awake(); - _restaurantPlayerMovement = GetComponent(); + _playerMovement = GetComponent(); } protected override void Start() { base.Start(); - _restaurantPlayerMovement.OnMoving += OnMove; - _restaurantPlayerMovement.OnDashing += OnDash; + _playerMovement.OnMoving += OnMove; + _playerMovement.OnDashing += OnDash; } protected override void OnDestroy() { base.OnDestroy(); - if (_restaurantPlayerMovement) + if (_playerMovement) { - _restaurantPlayerMovement.OnMoving -= OnMove; - _restaurantPlayerMovement.OnDashing -= OnDash; + _playerMovement.OnMoving -= OnMove; + _playerMovement.OnDashing -= OnDash; } } diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerAnimation.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerAnimation.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerAnimation.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerAnimation.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerCharacter.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerCharacter.cs similarity index 69% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerCharacter.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerCharacter.cs index 7dad4869f..1abe46f50 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerCharacter.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerCharacter.cs @@ -1,11 +1,11 @@ using UnityEngine; -namespace DDD +namespace DDD.Restaurant { - [RequireComponent(typeof(RestaurantPlayerMovement))] - public class RestaurantPlayerCharacter : RestaurantCharacter + [RequireComponent(typeof(PlayerMovement))] + public class PlayerCharacter : RestaurantCharacter { - protected override async void Awake() + protected override void Awake() { base.Awake(); diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerCharacter.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerCharacter.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerCharacter.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerCharacter.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerInput.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInput.cs similarity index 93% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerInput.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInput.cs index dc22b7dcb..3d158502a 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerInput.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInput.cs @@ -1,9 +1,9 @@ using UnityEngine; using UnityEngine.InputSystem; -namespace DDD +namespace DDD.Restaurant { - public class RestaurantPlayerInput : MonoBehaviour + public class PlayerInput : MonoBehaviour { private RestaurantPlayerData _playerDataSo; diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerInput.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInput.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerInput.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInput.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerInteraction.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInteraction.cs similarity index 51% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerInteraction.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInteraction.cs index a86e19447..4162945a1 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerInteraction.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInteraction.cs @@ -2,12 +2,15 @@ using UnityEngine; using UnityEngine.InputSystem; -namespace DDD +namespace DDD.Restaurant { - public class RestaurantPlayerInteraction : RestaurantCharacterInteraction + public class PlayerInteraction : CharacterInteraction { private RestaurantPlayerData _restaurantPlayerDataSo; + private float _interactHeldTime; + private bool _isInteracting; + protected override void Start() { base.Start(); @@ -44,6 +47,45 @@ protected override void OnDestroy() EventBus.Unregister(this); } + + protected virtual void Update() + { + _nearestInteractable = GetNearestInteractable(); + + if (_nearestInteractable != _previousInteractable) + { + _previousInteractable = _nearestInteractable; + OnNearestInteractableChanged(_nearestInteractable); + } + + if (_isInteracting) + { + if (_nearestInteractable != _interactingTarget || CanInteractTo(_interactingTarget) == false) + { + ResetInteractionState(); + return; + } + + _interactHeldTime += Time.deltaTime; + + float requiredHoldTime = _interactingTarget.GetExecutionParameters().HoldTime; + float ratio = Mathf.Clamp01(_interactHeldTime / requiredHoldTime); + + if (_interactHeldTime >= requiredHoldTime) + { + TryInteraction(_nearestInteractable); + OnInteractionCompleted(); + + ResetInteractionState(); + OnInteractionHoldProgress(0f); + } + else + { + OnInteractionHoldProgress(ratio); + } + } + } + private void OnInteractPerformed(InputAction.CallbackContext context) { @@ -53,7 +95,7 @@ private void OnInteractPerformed(InputAction.CallbackContext context) if (requiredHoldTime <= 0f) { - _nearestInteractable.OnInteracted(this); + TryInteraction(_nearestInteractable); } else { @@ -69,7 +111,7 @@ private void OnInteractCanceled(InputAction.CallbackContext context) ResetInteractionState(); } - protected override void OnNearestInteractableChanged(IInteractable newTarget) + protected void OnNearestInteractableChanged(IInteractable newTarget) { if (newTarget != null) { @@ -81,7 +123,7 @@ protected override void OnNearestInteractableChanged(IInteractable newTarget) } } - protected override void OnInteractionHoldProgress(float ratio) + protected void OnInteractionHoldProgress(float ratio) { if (_interactingTarget != null) { @@ -102,5 +144,42 @@ private void BroadcastShowUi(IInteractable interactable, bool canInteract, float evt.HoldProgress = ratio; EventBus.Broadcast(evt); } + + protected void ResetInteractionState() + { + _interactingTarget = null; + + // Hold Progress + _isInteracting = false; + _interactingTarget = null; + _interactHeldTime = 0f; + OnInteractionHoldProgress(0f); + } + + protected IInteractable GetNearestInteractable() + { + int colliderCount = Physics.OverlapSphereNonAlloc(transform.position, _interactionRadius, _nearColliders, _interactionLayerMask, QueryTriggerInteraction.Collide); + float closestDistance = float.MaxValue; + IInteractable closest = null; + + for (int i = 0; i < colliderCount; i++) + { + var col = _nearColliders[i]; + if (col.TryGetComponent(out var interactable) == false) continue; + + var type = interactable.GetInteractionType(); + if (interactable.IsInteractionHidden()) continue; + if (CanSolveInteractionType(type) == false) continue; + + float distance = Vector3.Distance(transform.position, col.transform.position); + if (distance < closestDistance) + { + closestDistance = distance; + closest = interactable; + } + } + + return closest; + } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerInteraction.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInteraction.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerInteraction.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInteraction.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerMovement.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerMovement.cs similarity index 99% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerMovement.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerMovement.cs index 8a313c1d8..98a911da5 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerMovement.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerMovement.cs @@ -5,11 +5,11 @@ using Vector2 = UnityEngine.Vector2; using Vector3 = UnityEngine.Vector3; -namespace DDD +namespace DDD.Restaurant { [RequireComponent(typeof(Rigidbody))] [RequireComponent(typeof(BoxCollider))] - public class RestaurantPlayerMovement : RestaurantCharacterMovement, ICurrentDirection + public class PlayerMovement : CharacterMovement, ICurrentDirection { #region Fields diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerMovement.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerMovement.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerMovement.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerMovement.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController.meta b/Assets/_DDD/_Scripts/Restaurant/Controller.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantEnvironmentController.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/EnvironmentController.cs similarity index 94% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantEnvironmentController.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/EnvironmentController.cs index b45a751c0..32c5be4f2 100644 --- a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantEnvironmentController.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/EnvironmentController.cs @@ -1,9 +1,9 @@ using System.Threading.Tasks; using UnityEngine; -namespace DDD +namespace DDD.Restaurant { - public class RestaurantEnvironmentController : FlowController + public class EnvironmentController : FlowController { private RestaurantEnvironmentState _environmentState; public override Task InitializeController() diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantEnvironmentController.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/EnvironmentController.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantEnvironmentController.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/EnvironmentController.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantGlobalMessageController.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/GlobalMessageController.cs similarity index 94% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantGlobalMessageController.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/GlobalMessageController.cs index e43fa0310..1eb99f053 100644 --- a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantGlobalMessageController.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/GlobalMessageController.cs @@ -3,7 +3,7 @@ namespace DDD { - public class RestaurantGlobalMessageController : FlowController + public class GlobalMessageController : FlowController { private const string ReadyForRestaurantMessageKey = "ready_for_restaurant_message"; private const string RunRestaurantMessageKey = "run_restaurnat_message"; diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantGlobalMessageController.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/GlobalMessageController.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantGlobalMessageController.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/GlobalMessageController.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantManagementController.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/ManagementController.cs similarity index 89% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantManagementController.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/ManagementController.cs index 0237687fd..c395c5858 100644 --- a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantManagementController.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/ManagementController.cs @@ -1,9 +1,9 @@ using System.Threading.Tasks; using UnityEngine; -namespace DDD +namespace DDD.Restaurant { - public class RestaurantManagementController : FlowController + public class ManagementController : FlowController { public override Task InitializeController() { diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantManagementController.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/ManagementController.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantManagementController.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/ManagementController.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantPlayerController.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/PlayerController.cs similarity index 93% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantPlayerController.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/PlayerController.cs index 364b53b91..76ab29331 100644 --- a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantPlayerController.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/PlayerController.cs @@ -2,9 +2,9 @@ using System.Threading.Tasks; using UnityEngine; -namespace DDD +namespace DDD.Restaurant { - public class RestaurantPlayerController : FlowController + public class PlayerController : FlowController { public override Task InitializeController() { diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantPlayerController.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/PlayerController.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantPlayerController.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/PlayerController.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/CustomerFactory.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/CustomerFactory.cs similarity index 98% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/CustomerFactory.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/CustomerFactory.cs index c2fe54ce6..a19fc2565 100644 --- a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/CustomerFactory.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/CustomerFactory.cs @@ -3,7 +3,7 @@ using UnityEngine.AddressableAssets; using UnityEngine.ResourceManagement.AsyncOperations; -namespace DDD +namespace DDD.Restaurant { public interface ICustomerFactory { diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/CustomerFactory.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/CustomerFactory.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/CustomerFactory.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/CustomerFactory.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/RandomSpawnScheduleBuilder.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/RandomSpawnScheduleBuilder.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/RandomSpawnScheduleBuilder.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/RandomSpawnScheduleBuilder.cs diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/RandomSpawnScheduleBuilder.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/RandomSpawnScheduleBuilder.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/RandomSpawnScheduleBuilder.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/RandomSpawnScheduleBuilder.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/RegularSpawnScheduleBuilder.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/RegularSpawnScheduleBuilder.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/RegularSpawnScheduleBuilder.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/RegularSpawnScheduleBuilder.cs diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/RegularSpawnScheduleBuilder.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/RegularSpawnScheduleBuilder.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/RegularSpawnScheduleBuilder.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/RegularSpawnScheduleBuilder.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/SpawnPointProvider.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/SpawnPointProvider.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/SpawnPointProvider.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/SpawnPointProvider.cs diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/SpawnPointProvider.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/SpawnPointProvider.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/SpawnPointProvider.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/SpawnPointProvider.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/SpawnSchedule.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/SpawnSchedule.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/SpawnSchedule.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/SpawnSchedule.cs diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/SpawnSchedule.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/SpawnSchedule.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/SpawnSchedule.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/SpawnSchedule.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/SpawnScheduleUtils.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/SpawnScheduleUtils.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/SpawnScheduleUtils.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/SpawnScheduleUtils.cs diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/SpawnScheduleUtils.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/SpawnScheduleUtils.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Run/Customer/SpawnScheduleUtils.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/SpawnScheduleUtils.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantRunController.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/RunController.cs similarity index 97% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantRunController.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/RunController.cs index 6bbc05bc3..20074746e 100644 --- a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantRunController.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/RunController.cs @@ -5,9 +5,9 @@ using System.Threading.Tasks; using UnityEngine; -namespace DDD +namespace DDD.Restaurant { - public class RestaurantRunController : FlowController + public class RunController : FlowController { private RestaurantCustomerState _restaurantCustomerStateSo; private RestaurantRunState _restaurantRunStateSo; @@ -130,8 +130,8 @@ await _iCustomerFactory.CreateAsync(new CustomerSpawnArgs Parent = null }); } - - await Task.Delay(TimeSpan.FromSeconds(wait), token); + + await Awaitable.WaitForSecondsAsync(wait, token); } } diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantRunController.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/RunController.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantRunController.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/RunController.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Tasks.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Tasks.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Tasks/CreateRestaurantEnvironment.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks/CreateRestaurantEnvironment.cs similarity index 96% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Tasks/CreateRestaurantEnvironment.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks/CreateRestaurantEnvironment.cs index e8372b8ad..d63885208 100644 --- a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Tasks/CreateRestaurantEnvironment.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks/CreateRestaurantEnvironment.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using UnityEngine; -namespace DDD +namespace DDD.Restaurant { public class CreateRestaurantEnvironment : RestaurantFlowTask { diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Tasks/CreateRestaurantEnvironment.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks/CreateRestaurantEnvironment.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Tasks/CreateRestaurantEnvironment.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks/CreateRestaurantEnvironment.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Tasks/CreateRestaurantPlayer.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks/CreateRestaurantPlayer.cs similarity index 97% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Tasks/CreateRestaurantPlayer.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks/CreateRestaurantPlayer.cs index f5ac043ea..3f87d4edd 100644 --- a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Tasks/CreateRestaurantPlayer.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks/CreateRestaurantPlayer.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using UnityEngine; -namespace DDD +namespace DDD.Restaurant { public class CreateRestaurantPlayer : RestaurantFlowTask { diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Tasks/CreateRestaurantPlayer.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks/CreateRestaurantPlayer.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Tasks/CreateRestaurantPlayer.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks/CreateRestaurantPlayer.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController/FlowController.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/FlowController.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/FlowController.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/FlowController.cs diff --git a/Assets/_DDD/_Scripts/RestaurantController/FlowController.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/FlowController.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/FlowController.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/FlowController.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController/RestaurantController.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantController.cs similarity index 92% rename from Assets/_DDD/_Scripts/RestaurantController/RestaurantController.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantController.cs index 0069fff33..079143c8c 100644 --- a/Assets/_DDD/_Scripts/RestaurantController/RestaurantController.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantController.cs @@ -4,7 +4,7 @@ using UnityEngine; using UnityEngine.AddressableAssets; -namespace DDD +namespace DDD.Restaurant { public class RestaurantController : Singleton, IManager, IGameFlowHandler { @@ -18,11 +18,11 @@ public class RestaurantController : Singleton, IManager, I // static definitions private static readonly List RestaurantFlowControllerTypes = new() { - typeof(RestaurantPlayerController), - typeof(RestaurantEnvironmentController), - typeof(RestaurantManagementController), - typeof(RestaurantRunController), - typeof(RestaurantGlobalMessageController) + typeof(PlayerController), + typeof(EnvironmentController), + typeof(ManagementController), + typeof(RunController), + typeof(GlobalMessageController) }; public void PreInit() diff --git a/Assets/_DDD/_Scripts/RestaurantController/RestaurantController.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantController.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/RestaurantController.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantController.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController/RestaurantControllerDataSo.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantControllerDataSo.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/RestaurantControllerDataSo.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantControllerDataSo.cs diff --git a/Assets/_DDD/_Scripts/RestaurantController/RestaurantControllerDataSo.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantControllerDataSo.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/RestaurantControllerDataSo.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantControllerDataSo.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantController/RestaurantFlowTask.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantFlowTask.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/RestaurantFlowTask.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantFlowTask.cs diff --git a/Assets/_DDD/_Scripts/RestaurantController/RestaurantFlowTask.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantFlowTask.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantController/RestaurantFlowTask.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantFlowTask.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantData.meta b/Assets/_DDD/_Scripts/Restaurant/Data.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantData.meta rename to Assets/_DDD/_Scripts/Restaurant/Data.meta diff --git a/Assets/_DDD/_Scripts/RestaurantData/DataObjects.meta b/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantData/DataObjects.meta rename to Assets/_DDD/_Scripts/Restaurant/Data/DataObjects.meta diff --git a/Assets/_DDD/_Scripts/RestaurantData/DataObjects/RestaurantCustomerData.cs b/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantCustomerData.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantData/DataObjects/RestaurantCustomerData.cs rename to Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantCustomerData.cs diff --git a/Assets/_DDD/_Scripts/RestaurantData/DataObjects/RestaurantCustomerData.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantCustomerData.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantData/DataObjects/RestaurantCustomerData.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantCustomerData.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantData/DataObjects/RestaurantManagementData.cs b/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantManagementData.cs similarity index 97% rename from Assets/_DDD/_Scripts/RestaurantData/DataObjects/RestaurantManagementData.cs rename to Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantManagementData.cs index 4d9cc6968..205cd272a 100644 --- a/Assets/_DDD/_Scripts/RestaurantData/DataObjects/RestaurantManagementData.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantManagementData.cs @@ -1,7 +1,7 @@ using Sirenix.OdinInspector; using UnityEngine; -namespace DDD +namespace DDD.Restaurant { [CreateAssetMenu(fileName = "RestaurantManagementData", menuName = "RestaurantData/RestaurantManagementData")] public class RestaurantManagementData : ScriptableObject diff --git a/Assets/_DDD/_Scripts/RestaurantData/DataObjects/RestaurantManagementData.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantManagementData.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantData/DataObjects/RestaurantManagementData.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantManagementData.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantData/DataObjects/RestaurantPlayerData.cs b/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantPlayerData.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantData/DataObjects/RestaurantPlayerData.cs rename to Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantPlayerData.cs diff --git a/Assets/_DDD/_Scripts/RestaurantData/DataObjects/RestaurantPlayerData.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantPlayerData.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantData/DataObjects/RestaurantPlayerData.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantPlayerData.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantData/DataObjects/RestaurantRunData.cs b/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantRunData.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantData/DataObjects/RestaurantRunData.cs rename to Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantRunData.cs diff --git a/Assets/_DDD/_Scripts/RestaurantData/DataObjects/RestaurantRunData.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantRunData.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantData/DataObjects/RestaurantRunData.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantRunData.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantData/RestaurantData.cs b/Assets/_DDD/_Scripts/Restaurant/Data/RestaurantData.cs similarity index 98% rename from Assets/_DDD/_Scripts/RestaurantData/RestaurantData.cs rename to Assets/_DDD/_Scripts/Restaurant/Data/RestaurantData.cs index e17b1dd3d..775911e83 100644 --- a/Assets/_DDD/_Scripts/RestaurantData/RestaurantData.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Data/RestaurantData.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.AddressableAssets; -namespace DDD +namespace DDD.Restaurant { [CreateAssetMenu(fileName = "RestaurantData", menuName = "RestaurantData/RestaurantData", order = 0)] public class RestaurantData : ScriptSingleton diff --git a/Assets/_DDD/_Scripts/RestaurantData/RestaurantData.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Data/RestaurantData.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantData/RestaurantData.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Data/RestaurantData.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEnvironment.meta b/Assets/_DDD/_Scripts/Restaurant/Environment.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEnvironment.meta rename to Assets/_DDD/_Scripts/Restaurant/Environment.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEnvironment/IInteractionSubsystemOwner.cs b/Assets/_DDD/_Scripts/Restaurant/Environment/IInteractionSubsystemOwner.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEnvironment/IInteractionSubsystemOwner.cs rename to Assets/_DDD/_Scripts/Restaurant/Environment/IInteractionSubsystemOwner.cs diff --git a/Assets/_DDD/_Scripts/RestaurantEnvironment/IInteractionSubsystemOwner.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Environment/IInteractionSubsystemOwner.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEnvironment/IInteractionSubsystemOwner.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Environment/IInteractionSubsystemOwner.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions.meta b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions.meta rename to Assets/_DDD/_Scripts/Restaurant/Environment/Interactions.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantCookInteractionSubsystem.cs b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Cook.cs similarity index 88% rename from Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantCookInteractionSubsystem.cs rename to Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Cook.cs index 8853c91ae..c599b2af8 100644 --- a/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantCookInteractionSubsystem.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Cook.cs @@ -9,7 +9,7 @@ public enum RestaurantCookType : uint OpenCookUi = 0, } - public class RestaurantCookInteractionSubsystem : MonoBehaviour, IInteractionSubsystemObject + public class InteractionSubsystem_Cook : MonoBehaviour, IInteractionSubsystemObject { [SerializeField] protected RestaurantCookType _cookType = RestaurantCookType.OpenCookUi; diff --git a/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantCookInteractionSubsystem.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Cook.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantCookInteractionSubsystem.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Cook.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantManagementInteractionSubsystem.cs b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Management.cs similarity index 88% rename from Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantManagementInteractionSubsystem.cs rename to Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Management.cs index 0c7dd033c..0bab205bb 100644 --- a/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantManagementInteractionSubsystem.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Management.cs @@ -10,7 +10,7 @@ public enum RestaurantManagementType : uint StartRestaurant = 1, } - public class RestaurantManagementInteractionSubsystem : MonoBehaviour, IInteractionSubsystemObject + public class InteractionSubsystem_Management : MonoBehaviour, IInteractionSubsystemObject { [SerializeField] protected RestaurantManagementType _managementType = RestaurantManagementType.OpenRestaurantMenu; diff --git a/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantManagementInteractionSubsystem.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Management.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantManagementInteractionSubsystem.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Management.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantMealInteractionSubsystem.cs b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Meal.cs similarity index 93% rename from Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantMealInteractionSubsystem.cs rename to Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Meal.cs index d018dc86b..25433d327 100644 --- a/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantMealInteractionSubsystem.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Meal.cs @@ -9,7 +9,7 @@ public enum RestaurantMealType : uint WaitForOrder = 1u, WaitForServe = 1u << 1 } - public class RestaurantMealInteractionSubsystem : MonoBehaviour, IInteractionSubsystemObject + public class InteractionSubsystem_Meal : MonoBehaviour, IInteractionSubsystemObject { private RestaurantMealType _currentRestaurantMealType; private void Awake() diff --git a/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantMealInteractionSubsystem.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Meal.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantMealInteractionSubsystem.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Meal.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantOrderInteractionSubsystem.cs b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Order.cs similarity index 73% rename from Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantOrderInteractionSubsystem.cs rename to Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Order.cs index fd6260925..eebb1f995 100644 --- a/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantOrderInteractionSubsystem.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Order.cs @@ -1,5 +1,6 @@ using System; using UnityEngine; +using UnityEngine.Serialization; namespace DDD { @@ -13,14 +14,14 @@ public enum RestaurantOrderType : uint Dirty = 1u << 4, } - public class RestaurantOrderInteractionSubsystem : MonoBehaviour, IInteractionSubsystemObject + public class InteractionSubsystem_Order : MonoBehaviour, IInteractionSubsystemObject { - [SerializeField] protected RestaurantOrderType orderType = RestaurantOrderType.Wait; - private RestaurantOrderType currentRestaurantOrderType; + [FormerlySerializedAs("orderType")] [SerializeField] protected RestaurantOrderType _orderType = RestaurantOrderType.Wait; + private RestaurantOrderType _currentRestaurantOrderType; private void Start() { - currentRestaurantOrderType = orderType; + _currentRestaurantOrderType = _orderType; } public bool CanInteract() @@ -35,8 +36,8 @@ public bool CanInteract() public bool OnInteracted(IInteractor interactor, ScriptableObject payloadSo = null) { // 간단한 상태 전이: 현재 상태에서 다음 상태로 이동 - var prev = currentRestaurantOrderType; - currentRestaurantOrderType = GetNextState(prev); + var prev = _currentRestaurantOrderType; + _currentRestaurantOrderType = GetNextState(prev); return true; } @@ -47,17 +48,17 @@ public ScriptableObject GetPayload() public void InitializeSubsystem() { - currentRestaurantOrderType = orderType; + _currentRestaurantOrderType = _orderType; } public RestaurantOrderType GetInteractionSubsystemType() { - return currentRestaurantOrderType; + return _currentRestaurantOrderType; } public void SetInteractionSubsystemType(RestaurantOrderType inValue) { - currentRestaurantOrderType = inValue; + _currentRestaurantOrderType = inValue; } private RestaurantOrderType GetNextState(RestaurantOrderType state) diff --git a/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantOrderInteractionSubsystem.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Order.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantOrderInteractionSubsystem.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Order.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEnvironment/RestaurantEnvironment.cs b/Assets/_DDD/_Scripts/Restaurant/Environment/RestaurantEnvironment.cs similarity index 99% rename from Assets/_DDD/_Scripts/RestaurantEnvironment/RestaurantEnvironment.cs rename to Assets/_DDD/_Scripts/Restaurant/Environment/RestaurantEnvironment.cs index 312e8f163..7c12b1805 100644 --- a/Assets/_DDD/_Scripts/RestaurantEnvironment/RestaurantEnvironment.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Environment/RestaurantEnvironment.cs @@ -3,7 +3,7 @@ using Unity.VisualScripting; using UnityEngine; -namespace DDD +namespace DDD.Restaurant { public class RestaurantEnvironment : MonoBehaviour { diff --git a/Assets/_DDD/_Scripts/RestaurantEnvironment/RestaurantEnvironment.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Environment/RestaurantEnvironment.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEnvironment/RestaurantEnvironment.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Environment/RestaurantEnvironment.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent.meta b/Assets/_DDD/_Scripts/Restaurant/Event.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent.meta rename to Assets/_DDD/_Scripts/Restaurant/Event.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Cosmetic.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Cosmetic.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Cosmetic/InteractableHighlight.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs similarity index 99% rename from Assets/_DDD/_Scripts/RestaurantEvent/Cosmetic/InteractableHighlight.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs index 1ba96248e..8d6272b14 100644 --- a/Assets/_DDD/_Scripts/RestaurantEvent/Cosmetic/InteractableHighlight.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs @@ -4,7 +4,7 @@ using QualityLevel = HighlightPlus.QualityLevel; using HighlightPlus; -namespace DDD +namespace DDD.Restaurant { public enum InteractionOutlineType { diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Cosmetic/InteractableHighlight.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Cosmetic/InteractableHighlight.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantEvents.cs b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantEvents.cs new file mode 100644 index 000000000..19d3c4f8c --- /dev/null +++ b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantEvents.cs @@ -0,0 +1,26 @@ +using UnityEngine; + +namespace DDD.Restaurant +{ + public static class RestaurantEvents + { + public static ItemSlotSelectedEvent ItemSlotSelectedEvent = new(); + public static TodayMenuAddedEvent TodayMenuAddedEvent = new(); + public static TodayMenuRemovedEvent TodayMenuRemovedEvent = new(); + + public static RestaurantInteractionEvent InteractionEvent = new(); + } + + #region RestaurantInteractionEvents + public class ItemSlotSelectedEvent : IEvent + { + public ItemModel Model; + } + public class TodayMenuAddedEvent : IEvent {} + + public class TodayMenuRemovedEvent : IEvent + { + public InventoryCategoryType InventoryCategoryType; + } + #endregion +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantEvents.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantEvents.cs.meta new file mode 100644 index 000000000..9606be7c7 --- /dev/null +++ b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantEvents.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 23743115320e4bf2a1001c64e92d4a53 +timeCreated: 1756277677 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/RestaurantInteractionComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionComponent.cs similarity index 87% rename from Assets/_DDD/_Scripts/RestaurantEvent/RestaurantInteractionComponent.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionComponent.cs index 48a3e4e86..34bb0a1c3 100644 --- a/Assets/_DDD/_Scripts/RestaurantEvent/RestaurantInteractionComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionComponent.cs @@ -5,15 +5,15 @@ using UnityEngine; using Sirenix.OdinInspector; -namespace DDD +namespace DDD.Restaurant { public static class RestaurantInteractionSubsystems { public static Dictionary TypeToSubsystem = new() { - {InteractionType.RestaurantOrder, typeof(RestaurantOrderInteractionSubsystem)}, - {InteractionType.RestaurantManagement, typeof(RestaurantManagementInteractionSubsystem)}, - {InteractionType.RestaurantMeal, typeof(RestaurantMealInteractionSubsystem)} + {InteractionType.RestaurantOrder, typeof(InteractionSubsystem_Order)}, + {InteractionType.RestaurantManagement, typeof(InteractionSubsystem_Management)}, + {InteractionType.RestaurantMeal, typeof(InteractionSubsystem_Meal)} }; } @@ -75,20 +75,9 @@ public virtual bool IsInteractionHidden() return flowDisabled; } - public virtual bool OnInteracted(IInteractor interactor, ScriptableObject payload = null) + public virtual void OnInteracted(IInteractor interactor, ScriptableObject payload = null) { - if (CanInteract() == false) - { - return false; - } - - bool interactionResult = RestaurantInteractionEvents.RestaurantInteraction.RequestInteraction(interactor.GetInteractorGameObject(), - GetInteractableGameObject(), GetInteractionType(), payload, true); - if (HasSubsystem(_interactionType)) - { - interactionResult &= GetSubsystem(_interactionType).OnInteracted(interactor, payload); - } - return interactionResult; + // TODO : Do Something cosmetic? } public virtual InteractionType GetInteractionType() diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/RestaurantInteractionComponent.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionComponent.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/RestaurantInteractionComponent.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionComponent.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/RestaurantInteractionEvents.cs b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionEvents.cs similarity index 86% rename from Assets/_DDD/_Scripts/RestaurantEvent/RestaurantInteractionEvents.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionEvents.cs index 4c835ec2d..9fe0c5cef 100644 --- a/Assets/_DDD/_Scripts/RestaurantEvent/RestaurantInteractionEvents.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionEvents.cs @@ -2,13 +2,8 @@ using System.Collections.Generic; using UnityEngine; -namespace DDD +namespace DDD.Restaurant { - public static class RestaurantInteractionEvents - { - public static RestaurantInteractionEvent RestaurantInteraction = new(); - } - public static class RestaurantInteractionEventSolvers { public static Dictionary TypeToSolver = new() @@ -59,7 +54,15 @@ public bool RequestInteraction(GameObject causer, GameObject target, Interaction // Cast solverComponent to IInteractable if (solver is not null && interactor is not null) { - evt.EventResult = solver.ExecuteInteraction(interactor, interactable, payload); + bool canExecute = solver.CanExecuteInteraction(interactor, interactable, payload); + if (canExecute) + { + evt.EventResult = solver.ExecuteInteraction(interactor, interactable, payload); + } + else + { + evt.EventResult = false; + } } else { diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/RestaurantInteractionEvents.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionEvents.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/RestaurantInteractionEvents.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionEvents.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantCooks.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantCooks.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantCooks.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantCooks.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantCooks/RestaurantCookSolver.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantCooks/RestaurantCookSolver.cs similarity index 95% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantCooks/RestaurantCookSolver.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantCooks/RestaurantCookSolver.cs index dad15780b..dd79eb368 100644 --- a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantCooks/RestaurantCookSolver.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantCooks/RestaurantCookSolver.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace DDD +namespace DDD.Restaurant { public static class RestaurantCookSolvers { diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantCooks/RestaurantCookSolver.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantCooks/RestaurantCookSolver.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantCooks/RestaurantCookSolver.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantCooks/RestaurantCookSolver.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantCooks/RestaurantCookSolver_OpenCookUi.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantCooks/RestaurantCookSolver_OpenCookUi.cs similarity index 97% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantCooks/RestaurantCookSolver_OpenCookUi.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantCooks/RestaurantCookSolver_OpenCookUi.cs index 4214524ab..3bcf4f904 100644 --- a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantCooks/RestaurantCookSolver_OpenCookUi.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantCooks/RestaurantCookSolver_OpenCookUi.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace DDD +namespace DDD.Restaurant { public class RestaurantCookSolver_OpenCookUi : MonoBehaviour, IInteractionSubsystemSolver { diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantCooks/RestaurantCookSolver_OpenCookUi.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantCooks/RestaurantCookSolver_OpenCookUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantCooks/RestaurantCookSolver_OpenCookUi.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantCooks/RestaurantCookSolver_OpenCookUi.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver.cs similarity index 96% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver.cs index 92e3ce5c5..1d0137d14 100644 --- a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace DDD +namespace DDD.Restaurant { public class RestaurantManagementSolver : RestaurantSubsystemSolver { diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver_Menu.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver_Menu.cs similarity index 97% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver_Menu.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver_Menu.cs index 73005e436..a6f7dad87 100644 --- a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver_Menu.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver_Menu.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace DDD +namespace DDD.Restaurant { public class RestaurantManagementSolver_Menu : MonoBehaviour, IInteractionSubsystemSolver { diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver_Menu.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver_Menu.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver_Menu.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver_Menu.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver_Start.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver_Start.cs similarity index 97% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver_Start.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver_Start.cs index a54d51579..f6f0e6fb5 100644 --- a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver_Start.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver_Start.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; using UnityEngine; -namespace DDD +namespace DDD.Restaurant { public class RestaurantManagementSolver_Start : MonoBehaviour, IInteractionSubsystemSolver { diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver_Start.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver_Start.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver_Start.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver_Start.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantMeals.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantMeals.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantMeals/RestaurantMealSolver.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantMeals/RestaurantMealSolver.cs diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantMeals/RestaurantMealSolver.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantMeals/RestaurantMealSolver.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForOrder.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForOrder.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForOrder.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForOrder.cs diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForOrder.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForOrder.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForOrder.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForOrder.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForServe.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForServe.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForServe.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForServe.cs diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForServe.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForServe.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForServe.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForServe.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver.cs similarity index 95% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver.cs index 71d8149fa..a0f2bab02 100644 --- a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; -using DDD.RestaurantOrders; using UnityEngine; -namespace DDD +namespace DDD.Restaurant { public class RestaurantOrderSolver : RestaurantSubsystemSolver { diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Busy.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Busy.cs similarity index 95% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Busy.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Busy.cs index 653658f12..02e49b9bb 100644 --- a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Busy.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Busy.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace DDD.RestaurantOrders +namespace DDD.Restaurant { public class RestaurantOrderSolver_Busy : MonoBehaviour, IInteractionSubsystemSolver { diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Busy.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Busy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Busy.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Busy.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Dirty.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Dirty.cs similarity index 94% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Dirty.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Dirty.cs index c1d6751d3..465f24f90 100644 --- a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Dirty.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Dirty.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace DDD.RestaurantOrders +namespace DDD.Restaurant { public class RestaurantOrderSolver_Dirty : MonoBehaviour, IInteractionSubsystemSolver { diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Dirty.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Dirty.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Dirty.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Dirty.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs similarity index 94% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs index 0d749254f..476b5f0bb 100644 --- a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace DDD.RestaurantOrders +namespace DDD.Restaurant { public class RestaurantOrderSolver_Order : MonoBehaviour, IInteractionSubsystemSolver { diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Reserved.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Reserved.cs similarity index 95% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Reserved.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Reserved.cs index 04583c485..a6556a78f 100644 --- a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Reserved.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Reserved.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace DDD.RestaurantOrders +namespace DDD.Restaurant { public class RestaurantOrderSolver_Reserved : MonoBehaviour, IInteractionSubsystemSolver { diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Reserved.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Reserved.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Reserved.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Reserved.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Serve.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Serve.cs similarity index 94% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Serve.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Serve.cs index 79407afc9..bbcf1d1d8 100644 --- a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Serve.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Serve.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace DDD.RestaurantOrders +namespace DDD.Restaurant { public class RestaurantOrderSolver_Serve : MonoBehaviour, IInteractionSubsystemSolver { diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Serve.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Serve.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Serve.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Serve.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs similarity index 97% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs index 45dac052c..361b0c465 100644 --- a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs @@ -1,7 +1,7 @@ using Opsive.BehaviorDesigner.Runtime.Tasks; using UnityEngine; -namespace DDD.RestaurantOrders +namespace DDD.Restaurant { public class RestaurantOrderSolver_Wait : MonoBehaviour, IInteractionSubsystemSolver { diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantSubsystemSolver.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantSubsystemSolver.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantSubsystemSolver.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantSubsystemSolver.cs diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantSubsystemSolver.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantSubsystemSolver.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantSubsystemSolver.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantSubsystemSolver.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantState.meta b/Assets/_DDD/_Scripts/Restaurant/State.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantState.meta rename to Assets/_DDD/_Scripts/Restaurant/State.meta diff --git a/Assets/_DDD/_Scripts/RestaurantState/FlowStates.meta b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantState/FlowStates.meta rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates.meta diff --git a/Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantCustomerState.cs b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantCustomerState.cs similarity index 99% rename from Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantCustomerState.cs rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantCustomerState.cs index 87e46dd3d..5f8bd2f1a 100644 --- a/Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantCustomerState.cs +++ b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantCustomerState.cs @@ -4,7 +4,7 @@ using UnityEngine; using UnityEngine.AddressableAssets; -namespace DDD +namespace DDD.Restaurant { public class RestaurantCustomerState : ScriptableObject { diff --git a/Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantCustomerState.cs.meta b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantCustomerState.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantCustomerState.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantCustomerState.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantEnvironmentState.cs b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantEnvironmentState.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantEnvironmentState.cs rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantEnvironmentState.cs diff --git a/Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantEnvironmentState.cs.meta b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantEnvironmentState.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantEnvironmentState.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantEnvironmentState.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantManagementState.cs b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantManagementState.cs similarity index 99% rename from Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantManagementState.cs rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantManagementState.cs index 330546a47..1c5befdf7 100644 --- a/Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantManagementState.cs +++ b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantManagementState.cs @@ -3,7 +3,7 @@ using Sirenix.OdinInspector; using UnityEngine; -namespace DDD +namespace DDD.Restaurant { public class RestaurantManagementState : ScriptableObject { diff --git a/Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantManagementState.cs.meta b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantManagementState.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantManagementState.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantManagementState.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantPlayerState.cs b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantPlayerState.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantPlayerState.cs rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantPlayerState.cs diff --git a/Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantPlayerState.cs.meta b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantPlayerState.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantPlayerState.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantPlayerState.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantRunState.cs b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantRunState.cs similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantRunState.cs rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantRunState.cs diff --git a/Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantRunState.cs.meta b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantRunState.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantState/FlowStates/RestaurantRunState.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantRunState.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantState/RestaurantState.cs b/Assets/_DDD/_Scripts/Restaurant/State/RestaurantState.cs similarity index 98% rename from Assets/_DDD/_Scripts/RestaurantState/RestaurantState.cs rename to Assets/_DDD/_Scripts/Restaurant/State/RestaurantState.cs index 1855bd5eb..560860472 100644 --- a/Assets/_DDD/_Scripts/RestaurantState/RestaurantState.cs +++ b/Assets/_DDD/_Scripts/Restaurant/State/RestaurantState.cs @@ -1,4 +1,4 @@ -namespace DDD +namespace DDD.Restaurant { public class RestaurantState : ScriptSingleton { diff --git a/Assets/_DDD/_Scripts/RestaurantState/RestaurantState.cs.meta b/Assets/_DDD/_Scripts/Restaurant/State/RestaurantState.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/RestaurantState/RestaurantState.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/State/RestaurantState.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui.meta b/Assets/_DDD/_Scripts/Restaurant/Ui.meta new file mode 100644 index 000000000..1505e0786 --- /dev/null +++ b/Assets/_DDD/_Scripts/Restaurant/Ui.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5bf3db4e1b1c49e1be969c4b9d454e70 +timeCreated: 1756279352 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/CookUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/AddedCookSlotUiStrategy.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/AddedCookSlotUiStrategy.cs similarity index 98% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/AddedCookSlotUiStrategy.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/AddedCookSlotUiStrategy.cs index c53aa7554..917afd3ce 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/AddedCookSlotUiStrategy.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/AddedCookSlotUiStrategy.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace DDD +namespace DDD.Restaurant { public class AddedCookSlotUiStrategy : IItemSlotUiStrategy { diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/AddedCookSlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/AddedCookSlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/AddedCookSlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/AddedCookSlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookUi.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookUi.cs similarity index 99% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookUi.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookUi.cs index 28aa2f1bd..8c0b35837 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookUi.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookUi.cs @@ -7,7 +7,7 @@ using UnityEngine.Localization.Components; using UnityEngine.UI; -namespace DDD +namespace DDD.Restaurant { [RequireComponent(typeof(CookViewModel))] public class CookUi : PopupUi diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookUi.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookUi.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookViewModel.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookViewModel.cs similarity index 99% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookViewModel.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookViewModel.cs index 382343373..ae41c6dd6 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookViewModel.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookViewModel.cs @@ -4,7 +4,7 @@ using UnityEngine; using UnityEngine.Localization; -namespace DDD +namespace DDD.Restaurant { public class SelectedCookSnapshot { diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookViewModel.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookViewModel.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/CookViewModel.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookViewModel.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/SelectedIngredient.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/SelectedIngredient.cs similarity index 96% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/SelectedIngredient.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/SelectedIngredient.cs index b5c77f988..04ebaff98 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/SelectedIngredient.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/SelectedIngredient.cs @@ -1,7 +1,7 @@ using UnityEngine; using UnityEngine.UI; -namespace DDD +namespace DDD.Restaurant { public class SelectedIngredient : MonoBehaviour { diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/SelectedIngredient.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/SelectedIngredient.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/CookUi/SelectedIngredient.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/SelectedIngredient.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ChecklistData.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ChecklistData.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ChecklistData.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ChecklistData.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ChecklistData.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ChecklistData.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ChecklistData.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ChecklistData.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ChecklistView.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ChecklistView.cs similarity index 86% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ChecklistView.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ChecklistView.cs index c2a6d0038..e5e3c39e3 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ChecklistView.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ChecklistView.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace DDD +namespace DDD.Restaurant { public enum ChecklistLocalizationKey { @@ -42,7 +42,7 @@ public void UpdateView() _viewModel.UpdateChecklistView(); } - public void Invoke(TodayMenuRemovedEvent evt) => UpdateView(); - public void Invoke(TodayMenuAddedEvent evt) => UpdateView(); + public void HandleEvent(TodayMenuRemovedEvent evt) => UpdateView(); + public void HandleEvent(TodayMenuAddedEvent evt) => UpdateView(); } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ChecklistView.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ChecklistView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ChecklistView.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ChecklistView.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs similarity index 98% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs index 07e5b052e..dacc9a703 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace DDD +namespace DDD.Restaurant { public class InventorySlotUiStrategy : IItemSlotUiStrategy { diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventoryView.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi/InventoryView.cs similarity index 90% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventoryView.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi/InventoryView.cs index 31f3f85b3..3f14f03ad 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventoryView.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi/InventoryView.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace DDD +namespace DDD.Restaurant { public class InventoryView : MonoBehaviour, IUiView, IEventHandler, IEventHandler, IEventHandler @@ -48,17 +48,17 @@ public void UpdateView() public void UpdateCategoryView(InventoryCategoryType category) => _viewModel.UpdateCategoryViewByCategory(category); - public void Invoke(TodayMenuAddedEvent evt) + public void HandleEvent(TodayMenuAddedEvent evt) { UpdateView(); } - public void Invoke(TodayMenuRemovedEvent evt) + public void HandleEvent(TodayMenuRemovedEvent evt) { UpdateView(); } - public void Invoke(InventoryChangedEvent evt) + public void HandleEvent(InventoryChangedEvent evt) { _viewModel.OnInventoryChanged(); } diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventoryView.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi/InventoryView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/InventoryUi/InventoryView.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi/InventoryView.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemDetailView.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemDetailView.cs similarity index 98% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemDetailView.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemDetailView.cs index c25d7869f..8c4cf708e 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemDetailView.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemDetailView.cs @@ -6,7 +6,7 @@ using UnityEngine.Localization.Components; using UnityEngine.UI; -namespace DDD +namespace DDD.Restaurant { public sealed class ItemDetailSnapshot { @@ -159,7 +159,7 @@ private void ClearHashTags() Utils.DestroyAllChildren(_tasteHashTagContent2); } - public void Invoke(ItemSlotSelectedEvent evt) + public void HandleEvent(ItemSlotSelectedEvent evt) { _viewModel.SetSelectedItem(evt.Model); UpdateView(); diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemDetailView.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemDetailView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemDetailView.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemDetailView.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IInteractableUi.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IInteractableUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IInteractableUi.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IInteractableUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IInteractableUi.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IInteractableUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IInteractableUi.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IInteractableUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs similarity index 86% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs index b1167debe..62fad7e24 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs @@ -1,4 +1,4 @@ -namespace DDD +namespace DDD.Restaurant { public interface IItemSlotInteractorStrategy { diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs similarity index 88% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs index 8cb6a32b0..c22f38289 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace DDD +namespace DDD.Restaurant { public interface IItemSlotUiStrategy { diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IngredientEntry.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IngredientEntry.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IngredientEntry.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IngredientEntry.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IngredientEntry.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IngredientEntry.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/IngredientEntry.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IngredientEntry.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemModel.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemModel.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemModel.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemModel.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemModel.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemModel.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemModel.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemModel.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs similarity index 97% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs index 616e640ce..89bd9199b 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace DDD +namespace DDD.Restaurant { public enum TodayMenuEventType { diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotUi.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemSlotUi.cs similarity index 99% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotUi.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemSlotUi.cs index eafc0343e..98fcf3bf3 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotUi.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemSlotUi.cs @@ -4,7 +4,7 @@ using UnityEngine.EventSystems; using UnityEngine.UI; -namespace DDD +namespace DDD.Restaurant { [RequireComponent(typeof(CommonButton))] public class ItemSlotUi : MonoBehaviour, ISelectHandler, IAutoScrollItem diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotUi.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemSlotUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemSlotUi.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemSlotUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementUi.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementUi.cs similarity index 99% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementUi.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementUi.cs index 4fe2315b6..995054a89 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementUi.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementUi.cs @@ -4,7 +4,7 @@ using UnityEngine.EventSystems; using UnityEngine.InputSystem; -namespace DDD +namespace DDD.Restaurant { [RequireComponent(typeof(RestaurantManagementViewModel))] public class RestaurantManagementUi : PopupUi diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementUi.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementUi.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementViewModel.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementViewModel.cs similarity index 99% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementViewModel.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementViewModel.cs index 2726902e9..4675bc003 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementViewModel.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementViewModel.cs @@ -4,7 +4,7 @@ using UnityEngine; using UnityEngine.Localization; -namespace DDD +namespace DDD.Restaurant { public class RestaurantManagementViewModel : SimpleViewModel, IEventHandler { @@ -55,7 +55,7 @@ public void CloseUi() OnCloseRequested?.Invoke(); } - public void Invoke(TodayMenuRemovedEvent evt) + public void HandleEvent(TodayMenuRemovedEvent evt) { SetCategory(evt.InventoryCategoryType); OnMenuCategorySelected?.Invoke(evt.InventoryCategoryType); diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementViewModel.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementViewModel.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/RestaurantManagementViewModel.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementViewModel.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/ITabButton.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/ITabButton.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/ITabButton.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/ITabButton.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/ITabButton.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/ITabButton.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/ITabButton.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/ITabButton.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/TabButtonUi.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabButtonUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/TabButtonUi.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabButtonUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/TabButtonUi.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabButtonUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/TabButtonUi.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabButtonUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/TabGroupUi.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabGroupUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/TabGroupUi.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabGroupUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/TabGroupUi.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabGroupUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TabUi/TabGroupUi.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabGroupUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TasteHashTagSlotUi.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TasteHashTagSlotUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TasteHashTagSlotUi.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TasteHashTagSlotUi.cs diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TasteHashTagSlotUi.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TasteHashTagSlotUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TasteHashTagSlotUi.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TasteHashTagSlotUi.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs similarity index 97% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs index a8357d228..8d505c36e 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs @@ -1,4 +1,4 @@ -namespace DDD +namespace DDD.Restaurant { public class TodayMenuInteractorStrategy : IItemSlotInteractorStrategy { diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs similarity index 98% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs index 12f02076d..8dbf7d252 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace DDD +namespace DDD.Restaurant { public class TodayMenuSlotUiStrategy : IItemSlotUiStrategy { diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs similarity index 89% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs index cdf650c90..127612052 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace DDD +namespace DDD.Restaurant { public class TodayMenuView : MonoBehaviour, IUiView, IEventHandler, IEventHandler { @@ -31,12 +31,12 @@ public void OnClosedEvents() EventBus.Unregister(this); } - public void Invoke(TodayMenuAddedEvent evt) + public void HandleEvent(TodayMenuAddedEvent evt) { UpdateView(); } - public void Invoke(TodayMenuRemovedEvent evt) + public void HandleEvent(TodayMenuRemovedEvent evt) { UpdateView(); } diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs similarity index 97% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs index 7e8fba35d..5b472b150 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs @@ -1,4 +1,4 @@ -namespace DDD +namespace DDD.Restaurant { public class TodayCookwareInteractorStrategy : IItemSlotInteractorStrategy { diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs similarity index 97% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs index 1872ecc68..d3d768572 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace DDD +namespace DDD.Restaurant { public class TodayCookwareSlotUiStrategy : IItemSlotUiStrategy { diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs similarity index 90% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs index 73d37cbf6..26716fbb8 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace DDD +namespace DDD.Restaurant { public class TodayRestaurantStateView : MonoBehaviour, IUiView, IEventHandler, IEventHandler { @@ -32,12 +32,12 @@ public void OnClosedEvents() EventBus.Unregister(this); } - public void Invoke(TodayMenuAddedEvent evt) + public void HandleEvent(TodayMenuAddedEvent evt) { UpdateView(); } - public void Invoke(TodayMenuRemovedEvent evt) + public void HandleEvent(TodayMenuRemovedEvent evt) { UpdateView(); } diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs.meta diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs similarity index 97% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs index 2252a36ac..5f3b4e116 100644 --- a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace DDD +namespace DDD.Restaurant { public class TodayWorkerSlotUiStrategy : IItemSlotUiStrategy { diff --git a/Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/GameUi/BaseUi/PopupUis/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterMovementConstraint.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterMovementConstraint.cs deleted file mode 100644 index ad63b91a3..000000000 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Core/RestaurantCharacterMovementConstraint.cs +++ /dev/null @@ -1,18 +0,0 @@ -using UnityEngine; - -namespace DDD -{ - [RequireComponent(typeof(RestaurantCharacterAnimation))] - public class RestaurantCharacterMovementConstraint : MonoBehaviour, IRestaurantMovementConstraint - { - public bool IsBlockingMovement() - { - if (GetComponent().IsPlayingAnimation()) - { - return true; - } - - return false; - } - } -} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/IRestaurantCustomerAi.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/IRestaurantCustomerAi.cs deleted file mode 100644 index 785b8bb03..000000000 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Interfaces/IRestaurantCustomerAi.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace DDD -{ - public interface IRestaurantCustomerAi - { - void InitializeAi(CustomerData inCustomerData); - } -} \ No newline at end of file