diff --git a/Assets/_DDD/_Scripts/Game/GameCharacter/IMovementConstraint.cs b/Assets/_DDD/_Scripts/Game/GameCharacter/IMovementConstraint.cs index 6e290b4e9..064721ade 100644 --- a/Assets/_DDD/_Scripts/Game/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/Restaurant/RestaurantCharacter.meta b/Assets/_DDD/_Scripts/Restaurant/Character.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter.meta rename to Assets/_DDD/_Scripts/Restaurant/Character.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Common.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Common.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Common.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Common/Actions.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Actions.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Common/Actions.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Actions.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Common/Actions/LookAtInteractionTarget.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Actions/LookAtInteractionTarget.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Common/Actions/LookAtInteractionTarget.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Actions/LookAtInteractionTarget.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/RestaurantCharacter/AI/Common/Actions/MoveToInteractionTarget.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Actions/MoveToInteractionTarget.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Common/Actions/MoveToInteractionTarget.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Actions/MoveToInteractionTarget.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/RestaurantCharacter/AI/Common/Decorator.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Decorator.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Common/Decorator.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Decorator.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantCharacter/AI/Common/Decorator/TimeLimiter.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Common/Decorator/TimeLimiter.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/RestaurantCharacter/AI/Customer.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Customer.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Customer/Actions.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Customer/Actions.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantCharacter/AI/Customer/Actions/ContinueRestaurantOrder.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/ContinueRestaurantOrder.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/RestaurantCharacter/AI/Customer/Actions/StartRestaurantOrder.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/StartRestaurantOrder.cs similarity index 98% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Customer/Actions/StartRestaurantOrder.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/StartRestaurantOrder.cs index 660e46799..c7d41ab1f 100644 --- a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Customer/Actions/StartRestaurantOrder.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/StartRestaurantOrder.cs @@ -47,7 +47,7 @@ public override TaskStatus OnUpdate() if (_registerOnBlackboard) { // 하위 호환: 고객 전용 블랙보드 지원 - var customerBlackboard = gameObject.GetComponent(); + var customerBlackboard = gameObject.GetComponent(); customerBlackboard?.SetCurrentInteractionTarget(outInteractable.gameObject); } diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/RestaurantCharacter/AI/Customer/Actions/WaitForPlayerInteraction.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/WaitForPlayerInteraction.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Customer/Actions/WaitForPlayerInteraction.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/WaitForPlayerInteraction.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/RestaurantCharacter/AI/Customer/Conditionals.meta b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Conditionals.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Customer/Conditionals.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Conditionals.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Customer/Conditionals/RestaurantOrderAvailable.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Conditionals/RestaurantOrderAvailable.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Customer/Conditionals/RestaurantOrderAvailable.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Conditionals/RestaurantOrderAvailable.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/RestaurantCharacter/AI/Customer/RestaurantCustomerAiComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerAiComponent.cs similarity index 83% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Customer/RestaurantCustomerAiComponent.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerAiComponent.cs index 987edeb54..89593be6d 100644 --- a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Customer/RestaurantCustomerAiComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerAiComponent.cs @@ -8,16 +8,16 @@ 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 async Task InitializeAi(CustomerData inCustomerData) diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantCharacter/AI/Customer/RestaurantCustomerAiComponent.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerAiComponent.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Customer/RestaurantCustomerBlackboardComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerBlackboardComponent.cs similarity index 91% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/AI/Customer/RestaurantCustomerBlackboardComponent.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerBlackboardComponent.cs index efef15e5b..51f81d791 100644 --- a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/RestaurantCharacter/AI/Customer/RestaurantCustomerBlackboardComponent.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/CustomerBlackboardComponent.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Core.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Core.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core/RestaurantCharacterAnimation.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterAnimation.cs similarity index 89% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core/RestaurantCharacterAnimation.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterAnimation.cs index 88058c404..03a4d5a4c 100644 --- a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantCharacter/Core/RestaurantCharacterAnimation.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterAnimation.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core/RestaurantCharacterAnimation.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterAnimation.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core/RestaurantCharacterInteraction.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterInteraction.cs similarity index 96% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core/RestaurantCharacterInteraction.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterInteraction.cs index 7407eb6de..d6b1530a5 100644 --- a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core/RestaurantCharacterInteraction.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterInteraction.cs @@ -4,7 +4,7 @@ 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]; diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core/RestaurantCharacterInteraction.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterInteraction.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core/RestaurantCharacterInteraction.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterInteraction.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core/RestaurantCharacterMovement.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterMovement.cs similarity index 55% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core/RestaurantCharacterMovement.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterMovement.cs index 19920b0b2..a7f326db4 100644 --- a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantCharacter/Core/RestaurantCharacterMovement.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterMovement.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantCharacter/Core/RestaurantCharacterMovementConstraint.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterMovementConstraint.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core/RestaurantCharacterMovementConstraint.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterMovementConstraint.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core/RestaurantCharacterVisual.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterVisual.cs similarity index 93% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core/RestaurantCharacterVisual.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterVisual.cs index 13b6bfa02..5b866df48 100644 --- a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantCharacter/Core/RestaurantCharacterVisual.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterVisual.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core/RestaurantCharacterVisual.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterVisual.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core/RestaurantCharacter.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Core/RestaurantCharacter.cs similarity index 88% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core/RestaurantCharacter.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Core/RestaurantCharacter.cs index 65c8a53fd..42105fd49 100644 --- a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core/RestaurantCharacter.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Core/RestaurantCharacter.cs @@ -3,16 +3,16 @@ 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/Restaurant/RestaurantCharacter/Core/RestaurantCharacter.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Core/RestaurantCharacter.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core/RestaurantCharacter.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Core/RestaurantCharacter.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Interfaces.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Interfaces.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Interfaces.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Interfaces/IAiMovement.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/IAiMovement.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Interfaces/IAiMovement.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/IAiMovement.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Interfaces/IAiMovement.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/IAiMovement.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Interfaces/IAiMovement.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/IAiMovement.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Interfaces/ICurrentDirection.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICurrentDirection.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Interfaces/ICurrentDirection.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICurrentDirection.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Interfaces/ICurrentDirection.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICurrentDirection.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Interfaces/ICurrentDirection.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICurrentDirection.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Interfaces/IRestaurantCustomerAi.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerAi.cs similarity index 72% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Interfaces/IRestaurantCustomerAi.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerAi.cs index 1d0f490a0..6fc7ad64f 100644 --- a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Interfaces/IRestaurantCustomerAi.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerAi.cs @@ -2,7 +2,7 @@ namespace DDD { - public interface IRestaurantCustomerAi + public interface ICustomerAi { Task InitializeAi(CustomerData inCustomerData); } diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Interfaces/IRestaurantCustomerAi.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerAi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Interfaces/IRestaurantCustomerAi.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerAi.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Interfaces/IRestaurantCustomerBlackboard.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerBlackboard.cs similarity index 88% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Interfaces/IRestaurantCustomerBlackboard.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerBlackboard.cs index 51859cddf..3f811c8a3 100644 --- a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantCharacter/Interfaces/IRestaurantCustomerBlackboard.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerBlackboard.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Interfaces/IRestaurantCustomerBlackboard.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/ICustomerBlackboard.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Interfaces/IRestaurantMovementConstraint.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/IMovementConstraint.cs similarity index 58% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Interfaces/IRestaurantMovementConstraint.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/IMovementConstraint.cs index 462d87b94..5bb57d976 100644 --- a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantCharacter/Interfaces/IRestaurantMovementConstraint.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/IMovementConstraint.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Interfaces/IRestaurantMovementConstraint.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Interfaces/IMovementConstraint.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Npc.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Npc.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Npc.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Npc.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Npc/Customer.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/Customer.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Npc/Customer.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Npc/Customer.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/Customer/CustomerCharacter.cs similarity index 60% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Npc/Customer/CustomerCharacter.cs index e3f0ae046..6dc164fa9 100644 --- a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/Customer/CustomerCharacter.cs @@ -5,22 +5,22 @@ 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/Restaurant/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/Restaurant/RestaurantCharacter/Npc/Customer/CustomerCharacter.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Npc/Customer/CustomerCharacter.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Npc/RestaurantNpcCharacter.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcCharacter.cs similarity index 61% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Npc/RestaurantNpcCharacter.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcCharacter.cs index 7756a14fa..10e29bd62 100644 --- a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Npc/RestaurantNpcCharacter.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcCharacter.cs @@ -3,8 +3,8 @@ 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/Restaurant/RestaurantCharacter/Npc/RestaurantNpcCharacter.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcCharacter.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Npc/RestaurantNpcCharacter.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcCharacter.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Npc/RestaurantNpcMovement.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcMovement.cs similarity index 98% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Npc/RestaurantNpcMovement.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcMovement.cs index e73acf69f..4248d0aa1 100644 --- a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantCharacter/Npc/RestaurantNpcMovement.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcMovement.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Npc/RestaurantNpcMovement.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Npc/NpcMovement.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Player.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Player.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerAnimation.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerAnimation.cs similarity index 58% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerAnimation.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerAnimation.cs index 71c5aa3e8..8ae579f6d 100644 --- a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerAnimation.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerAnimation.cs @@ -2,34 +2,34 @@ 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/Restaurant/RestaurantCharacter/Player/RestaurantPlayerAnimation.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerAnimation.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerAnimation.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerAnimation.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerCharacter.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerCharacter.cs similarity index 79% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerCharacter.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerCharacter.cs index 3fef16bef..1abe46f50 100644 --- a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerCharacter.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerCharacter.cs @@ -2,8 +2,8 @@ namespace DDD.Restaurant { - [RequireComponent(typeof(RestaurantPlayerMovement))] - public class RestaurantPlayerCharacter : RestaurantCharacter + [RequireComponent(typeof(PlayerMovement))] + public class PlayerCharacter : RestaurantCharacter { protected override void Awake() { diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerCharacter.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerCharacter.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerCharacter.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerCharacter.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerInput.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInput.cs similarity index 94% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerInput.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInput.cs index 611f8c920..3d158502a 100644 --- a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerInput.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInput.cs @@ -3,7 +3,7 @@ namespace DDD.Restaurant { - public class RestaurantPlayerInput : MonoBehaviour + public class PlayerInput : MonoBehaviour { private RestaurantPlayerData _playerDataSo; diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerInput.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInput.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerInput.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInput.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerInteraction.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInteraction.cs similarity index 98% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerInteraction.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInteraction.cs index 10529301d..4162945a1 100644 --- a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerInteraction.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInteraction.cs @@ -4,7 +4,7 @@ namespace DDD.Restaurant { - public class RestaurantPlayerInteraction : RestaurantCharacterInteraction + public class PlayerInteraction : CharacterInteraction { private RestaurantPlayerData _restaurantPlayerDataSo; diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerInteraction.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInteraction.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerInteraction.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInteraction.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerMovement.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerMovement.cs similarity index 99% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerMovement.cs rename to Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerMovement.cs index 5c5d52683..98a911da5 100644 --- a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerMovement.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerMovement.cs @@ -9,7 +9,7 @@ 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/Restaurant/RestaurantCharacter/Player/RestaurantPlayerMovement.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerMovement.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Player/RestaurantPlayerMovement.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerMovement.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController.meta b/Assets/_DDD/_Scripts/Restaurant/Controller.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantEnvironmentController.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/EnvironmentController.cs similarity index 95% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantEnvironmentController.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/EnvironmentController.cs index b13f038d8..32c5be4f2 100644 --- a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantEnvironmentController.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/EnvironmentController.cs @@ -3,7 +3,7 @@ namespace DDD.Restaurant { - public class RestaurantEnvironmentController : FlowController + public class EnvironmentController : FlowController { private RestaurantEnvironmentState _environmentState; public override Task InitializeController() diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantEnvironmentController.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/EnvironmentController.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantEnvironmentController.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/EnvironmentController.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantGlobalMessageController.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/GlobalMessageController.cs similarity index 94% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantGlobalMessageController.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/GlobalMessageController.cs index e43fa0310..1eb99f053 100644 --- a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantController/Conrtollers/RestaurantGlobalMessageController.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/GlobalMessageController.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantGlobalMessageController.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/GlobalMessageController.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantManagementController.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/ManagementController.cs similarity index 91% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantManagementController.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/ManagementController.cs index bd7bf976d..c395c5858 100644 --- a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantManagementController.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/ManagementController.cs @@ -3,7 +3,7 @@ namespace DDD.Restaurant { - public class RestaurantManagementController : FlowController + public class ManagementController : FlowController { public override Task InitializeController() { diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantManagementController.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/ManagementController.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantManagementController.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/ManagementController.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantPlayerController.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/PlayerController.cs similarity index 94% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantPlayerController.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/PlayerController.cs index 676c27b27..76ab29331 100644 --- a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantPlayerController.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/PlayerController.cs @@ -4,7 +4,7 @@ namespace DDD.Restaurant { - public class RestaurantPlayerController : FlowController + public class PlayerController : FlowController { public override Task InitializeController() { diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantPlayerController.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/PlayerController.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantPlayerController.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/PlayerController.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/Run.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/Run.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/Run/Customer.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/Run/Customer.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/Run/Customer/CustomerFactory.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/CustomerFactory.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/Run/Customer/CustomerFactory.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/CustomerFactory.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/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/Restaurant/RestaurantController/Conrtollers/Run/Customer/RandomSpawnScheduleBuilder.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/RandomSpawnScheduleBuilder.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/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/Restaurant/RestaurantController/Conrtollers/Run/Customer/RegularSpawnScheduleBuilder.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/RegularSpawnScheduleBuilder.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/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/Restaurant/RestaurantController/Conrtollers/Run/Customer/SpawnPointProvider.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/SpawnPointProvider.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/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/Restaurant/RestaurantController/Conrtollers/Run/Customer/SpawnSchedule.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/SpawnSchedule.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/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/Restaurant/RestaurantController/Conrtollers/Run/Customer/SpawnScheduleUtils.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Run/Customer/SpawnScheduleUtils.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/RestaurantController/Conrtollers/RestaurantRunController.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/RunController.cs similarity index 99% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantRunController.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/RunController.cs index c076719fc..20074746e 100644 --- a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantRunController.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/RunController.cs @@ -7,7 +7,7 @@ namespace DDD.Restaurant { - public class RestaurantRunController : FlowController + public class RunController : FlowController { private RestaurantCustomerState _restaurantCustomerStateSo; private RestaurantRunState _restaurantRunStateSo; diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantRunController.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/RunController.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/RestaurantRunController.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/RunController.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/Tasks.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/Tasks.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/Tasks/CreateRestaurantEnvironment.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks/CreateRestaurantEnvironment.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/Tasks/CreateRestaurantEnvironment.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks/CreateRestaurantEnvironment.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantController/Conrtollers/Tasks/CreateRestaurantEnvironment.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks/CreateRestaurantEnvironment.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/Tasks/CreateRestaurantPlayer.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks/CreateRestaurantPlayer.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/Conrtollers/Tasks/CreateRestaurantPlayer.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks/CreateRestaurantPlayer.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantController/Conrtollers/Tasks/CreateRestaurantPlayer.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/Tasks/CreateRestaurantPlayer.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/FlowController.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/FlowController.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/FlowController.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/FlowController.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/FlowController.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/FlowController.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/FlowController.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/FlowController.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/RestaurantController.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantController.cs similarity index 92% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/RestaurantController.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantController.cs index 8f6a12cab..079143c8c 100644 --- a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/RestaurantController.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantController.cs @@ -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/Restaurant/RestaurantController/RestaurantController.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantController.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/RestaurantController.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantController.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/RestaurantControllerDataSo.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantControllerDataSo.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/RestaurantControllerDataSo.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantControllerDataSo.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/RestaurantControllerDataSo.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantControllerDataSo.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/RestaurantControllerDataSo.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantControllerDataSo.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/RestaurantFlowTask.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantFlowTask.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/RestaurantFlowTask.cs rename to Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantFlowTask.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantController/RestaurantFlowTask.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantFlowTask.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantController/RestaurantFlowTask.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Controller/RestaurantFlowTask.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantData.meta b/Assets/_DDD/_Scripts/Restaurant/Data.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantData.meta rename to Assets/_DDD/_Scripts/Restaurant/Data.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantData/DataObjects.meta b/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantData/DataObjects.meta rename to Assets/_DDD/_Scripts/Restaurant/Data/DataObjects.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantData/DataObjects/RestaurantCustomerData.cs b/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantCustomerData.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantData/DataObjects/RestaurantCustomerData.cs rename to Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantCustomerData.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantData/DataObjects/RestaurantCustomerData.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantCustomerData.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantData/DataObjects/RestaurantCustomerData.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantCustomerData.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantData/DataObjects/RestaurantManagementData.cs b/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantManagementData.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantData/DataObjects/RestaurantManagementData.cs rename to Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantManagementData.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantData/DataObjects/RestaurantManagementData.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantManagementData.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantData/DataObjects/RestaurantManagementData.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantManagementData.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantData/DataObjects/RestaurantPlayerData.cs b/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantPlayerData.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantData/DataObjects/RestaurantPlayerData.cs rename to Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantPlayerData.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantData/DataObjects/RestaurantPlayerData.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantPlayerData.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantData/DataObjects/RestaurantPlayerData.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantPlayerData.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantData/DataObjects/RestaurantRunData.cs b/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantRunData.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantData/DataObjects/RestaurantRunData.cs rename to Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantRunData.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantData/DataObjects/RestaurantRunData.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantRunData.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantData/DataObjects/RestaurantRunData.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Data/DataObjects/RestaurantRunData.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantData/RestaurantData.cs b/Assets/_DDD/_Scripts/Restaurant/Data/RestaurantData.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantData/RestaurantData.cs rename to Assets/_DDD/_Scripts/Restaurant/Data/RestaurantData.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantData/RestaurantData.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Data/RestaurantData.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantData/RestaurantData.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Data/RestaurantData.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment.meta b/Assets/_DDD/_Scripts/Restaurant/Environment.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment.meta rename to Assets/_DDD/_Scripts/Restaurant/Environment.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/IInteractionSubsystemOwner.cs b/Assets/_DDD/_Scripts/Restaurant/Environment/IInteractionSubsystemOwner.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/IInteractionSubsystemOwner.cs rename to Assets/_DDD/_Scripts/Restaurant/Environment/IInteractionSubsystemOwner.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/IInteractionSubsystemOwner.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Environment/IInteractionSubsystemOwner.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/IInteractionSubsystemOwner.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Environment/IInteractionSubsystemOwner.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/Interactions.meta b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/Interactions.meta rename to Assets/_DDD/_Scripts/Restaurant/Environment/Interactions.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/Interactions/RestaurantCookInteractionSubsystem.cs b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Cook.cs similarity index 88% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/Interactions/RestaurantCookInteractionSubsystem.cs rename to Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Cook.cs index 8853c91ae..c599b2af8 100644 --- a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantEnvironment/Interactions/RestaurantCookInteractionSubsystem.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Cook.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/Interactions/RestaurantCookInteractionSubsystem.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Cook.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/Interactions/RestaurantManagementInteractionSubsystem.cs b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Management.cs similarity index 88% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/Interactions/RestaurantManagementInteractionSubsystem.cs rename to Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Management.cs index 0c7dd033c..0bab205bb 100644 --- a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantEnvironment/Interactions/RestaurantManagementInteractionSubsystem.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Management.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/Interactions/RestaurantManagementInteractionSubsystem.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Management.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/Interactions/RestaurantMealInteractionSubsystem.cs b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Meal.cs similarity index 94% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/Interactions/RestaurantMealInteractionSubsystem.cs rename to Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Meal.cs index ffaceb0d6..48b1b410d 100644 --- a/Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/Interactions/RestaurantMealInteractionSubsystem.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Meal.cs @@ -10,7 +10,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/Restaurant/RestaurantEnvironment/Interactions/RestaurantMealInteractionSubsystem.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Meal.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/Interactions/RestaurantMealInteractionSubsystem.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Meal.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/Interactions/RestaurantOrderInteractionSubsystem.cs b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Order.cs similarity index 73% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/Interactions/RestaurantOrderInteractionSubsystem.cs rename to Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Order.cs index fd6260925..eebb1f995 100644 --- a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantEnvironment/Interactions/RestaurantOrderInteractionSubsystem.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Order.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/Interactions/RestaurantOrderInteractionSubsystem.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Order.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/RestaurantEnvironment.cs b/Assets/_DDD/_Scripts/Restaurant/Environment/RestaurantEnvironment.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/RestaurantEnvironment.cs rename to Assets/_DDD/_Scripts/Restaurant/Environment/RestaurantEnvironment.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/RestaurantEnvironment.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Environment/RestaurantEnvironment.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEnvironment/RestaurantEnvironment.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Environment/RestaurantEnvironment.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEvent.meta b/Assets/_DDD/_Scripts/Restaurant/Event.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent.meta rename to Assets/_DDD/_Scripts/Restaurant/Event.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Cosmetic.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Cosmetic.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Cosmetic/InteractableHighlight.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Cosmetic/InteractableHighlight.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Cosmetic/InteractableHighlight.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Cosmetic/InteractableHighlight.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Cosmetic/InteractableHighlight.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/RestaurantEvents.cs b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantEvents.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/RestaurantEvents.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/RestaurantEvents.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/RestaurantEvents.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantEvents.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/RestaurantEvents.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/RestaurantEvents.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/RestaurantInteractionComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionComponent.cs similarity index 95% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/RestaurantInteractionComponent.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionComponent.cs index 4fdfd83fe..34bb0a1c3 100644 --- a/Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/RestaurantInteractionComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionComponent.cs @@ -11,9 +11,9 @@ 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)} }; } diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/RestaurantInteractionComponent.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionComponent.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/RestaurantInteractionComponent.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionComponent.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/RestaurantInteractionEvents.cs b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionEvents.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/RestaurantInteractionEvents.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionEvents.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/RestaurantInteractionEvents.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionEvents.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/RestaurantInteractionEvents.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionEvents.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantCooks.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantCooks.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantCooks.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantCooks.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantCooks/RestaurantCookSolver.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantCooks/RestaurantCookSolver.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantCooks/RestaurantCookSolver.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantCooks/RestaurantCookSolver.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantEvent/Solvers/RestaurantCooks/RestaurantCookSolver.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantCooks/RestaurantCookSolver.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantCooks/RestaurantCookSolver_OpenCookUi.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantCooks/RestaurantCookSolver_OpenCookUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantCooks/RestaurantCookSolver_OpenCookUi.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantCooks/RestaurantCookSolver_OpenCookUi.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/RestaurantEvent/Solvers/RestaurantManagements.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantManagements.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver_Menu.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver_Menu.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver_Menu.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver_Menu.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver_Start.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver_Start.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver_Start.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantManagements/RestaurantManagementSolver_Start.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/RestaurantEvent/Solvers/RestaurantMeals.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantMeals.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantMeals.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantMeals.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantMeals/RestaurantMealSolver.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantMeals/RestaurantMealSolver.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantMeals/RestaurantMealSolver.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForOrder.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForOrder.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/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/Restaurant/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForServe.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForServe.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/RestaurantEvent/Solvers/RestaurantOrders.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantOrders.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Busy.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Busy.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Busy.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Busy.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Dirty.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Dirty.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Dirty.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Dirty.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Reserved.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Reserved.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Reserved.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Reserved.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Serve.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Serve.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Serve.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Serve.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/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/Restaurant/RestaurantEvent/Solvers/RestaurantSubsystemSolver.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantSubsystemSolver.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantSubsystemSolver.cs rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantSubsystemSolver.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantSubsystemSolver.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantSubsystemSolver.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantEvent/Solvers/RestaurantSubsystemSolver.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantSubsystemSolver.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core/RestaurantCharacterMovementConstraint.cs b/Assets/_DDD/_Scripts/Restaurant/RestaurantCharacter/Core/RestaurantCharacterMovementConstraint.cs deleted file mode 100644 index ad63b91a3..000000000 --- a/Assets/_DDD/_Scripts/Restaurant/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/Restaurant/RestaurantState.meta b/Assets/_DDD/_Scripts/Restaurant/State.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantState.meta rename to Assets/_DDD/_Scripts/Restaurant/State.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates.meta b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates.meta rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates/RestaurantCustomerState.cs b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantCustomerState.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates/RestaurantCustomerState.cs rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantCustomerState.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates/RestaurantCustomerState.cs.meta b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantCustomerState.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates/RestaurantCustomerState.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantCustomerState.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates/RestaurantEnvironmentState.cs b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantEnvironmentState.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates/RestaurantEnvironmentState.cs rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantEnvironmentState.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates/RestaurantEnvironmentState.cs.meta b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantEnvironmentState.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates/RestaurantEnvironmentState.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantEnvironmentState.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates/RestaurantManagementState.cs b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantManagementState.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates/RestaurantManagementState.cs rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantManagementState.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates/RestaurantManagementState.cs.meta b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantManagementState.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates/RestaurantManagementState.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantManagementState.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates/RestaurantPlayerState.cs b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantPlayerState.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates/RestaurantPlayerState.cs rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantPlayerState.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates/RestaurantPlayerState.cs.meta b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantPlayerState.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates/RestaurantPlayerState.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantPlayerState.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates/RestaurantRunState.cs b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantRunState.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates/RestaurantRunState.cs rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantRunState.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates/RestaurantRunState.cs.meta b/Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantRunState.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantState/FlowStates/RestaurantRunState.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/State/FlowStates/RestaurantRunState.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantState/RestaurantState.cs b/Assets/_DDD/_Scripts/Restaurant/State/RestaurantState.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantState/RestaurantState.cs rename to Assets/_DDD/_Scripts/Restaurant/State/RestaurantState.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantState/RestaurantState.cs.meta b/Assets/_DDD/_Scripts/Restaurant/State/RestaurantState.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantState/RestaurantState.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/State/RestaurantState.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi.meta b/Assets/_DDD/_Scripts/Restaurant/Ui.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/CookUi.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/CookUi.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/CookUi.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/CookUi/AddedCookSlotUiStrategy.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/AddedCookSlotUiStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/CookUi/AddedCookSlotUiStrategy.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/AddedCookSlotUiStrategy.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/CookUi/AddedCookSlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/AddedCookSlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/CookUi/AddedCookSlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/AddedCookSlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/CookUi/CookUi.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/CookUi/CookUi.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookUi.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/CookUi/CookUi.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/CookUi/CookUi.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookUi.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/CookUi/CookViewModel.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookViewModel.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/CookUi/CookViewModel.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookViewModel.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/CookUi/CookViewModel.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookViewModel.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/CookUi/CookViewModel.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/CookViewModel.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/CookUi/SelectedIngredient.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/SelectedIngredient.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/CookUi/SelectedIngredient.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/SelectedIngredient.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/CookUi/SelectedIngredient.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/SelectedIngredient.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/CookUi/SelectedIngredient.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/CookUi/SelectedIngredient.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ChecklistData.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ChecklistData.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ChecklistData.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ChecklistData.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ChecklistData.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ChecklistData.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ChecklistData.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ChecklistData.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ChecklistView.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ChecklistView.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ChecklistView.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ChecklistView.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ChecklistView.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ChecklistView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ChecklistView.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ChecklistView.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ExtensionsUi.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ExtensionsUi.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/CraftingHelper.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/DrinkDataExtensions.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ExtensionsUi/FoodDataExtensions.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/InventoryUi.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/InventoryUi.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi/InventorySlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/InventoryUi/InventoryView.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi/InventoryView.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/InventoryUi/InventoryView.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi/InventoryView.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/InventoryUi/InventoryView.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi/InventoryView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/InventoryUi/InventoryView.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/InventoryUi/InventoryView.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemDetailView.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemDetailView.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemDetailView.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemDetailView.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemDetailView.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemDetailView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemDetailView.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemDetailView.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/IInteractableUi.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IInteractableUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/IInteractableUi.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IInteractableUi.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/IInteractableUi.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IInteractableUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/IInteractableUi.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IInteractableUi.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IItemSlotInteractorStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IItemSlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/IngredientEntry.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IngredientEntry.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/IngredientEntry.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IngredientEntry.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/IngredientEntry.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IngredientEntry.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/IngredientEntry.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/IngredientEntry.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/ItemModel.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemModel.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/ItemModel.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemModel.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/ItemModel.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemModel.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/ItemModel.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemModel.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemSlotInteractor.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/ItemSlotUi.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemSlotUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/ItemSlotUi.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemSlotUi.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/ItemSlotUi.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemSlotUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/ItemSlotUi.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemSlotUi.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/ItemUi/ItemViewModelFactory.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/RestaurantManagementUi.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/RestaurantManagementUi.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementUi.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/RestaurantManagementUi.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/RestaurantManagementUi.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementUi.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/RestaurantManagementViewModel.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementViewModel.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/RestaurantManagementViewModel.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementViewModel.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/RestaurantManagementViewModel.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementViewModel.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/RestaurantManagementViewModel.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/RestaurantManagementViewModel.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TabUi.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TabUi.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TabUi/ITabButton.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/ITabButton.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TabUi/ITabButton.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/ITabButton.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TabUi/ITabButton.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/ITabButton.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TabUi/ITabButton.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/ITabButton.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TabUi/TabButtonUi.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabButtonUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TabUi/TabButtonUi.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabButtonUi.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TabUi/TabButtonUi.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabButtonUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TabUi/TabButtonUi.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabButtonUi.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TabUi/TabGroupUi.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabGroupUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TabUi/TabGroupUi.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabGroupUi.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TabUi/TabGroupUi.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabGroupUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TabUi/TabGroupUi.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TabUi/TabGroupUi.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TasteHashTagSlotUi.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TasteHashTagSlotUi.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TasteHashTagSlotUi.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TasteHashTagSlotUi.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TasteHashTagSlotUi.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TasteHashTagSlotUi.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TasteHashTagSlotUi.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TasteHashTagSlotUi.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayMenuUi.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayMenuUi.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuInteractorStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuSlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayMenuUi/TodayMenuView.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayRestaurantStateUi.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayRestaurantStateUi.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareInteractorStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayCookwareSlotUiStrategy.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayRestaurantStateView.cs.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs diff --git a/Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs.meta similarity index 100% rename from Assets/_DDD/_Scripts/Restaurant/RestaurantUi/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs.meta rename to Assets/_DDD/_Scripts/Restaurant/Ui/RestaurantManagementUi/TodayRestaurantStateUi/TodayWorkerSlotUiStrategy.cs.meta