From 92e2cda1a9da74f2e7c484413e219aa9c5d99985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=82=B0?= Date: Tue, 26 Aug 2025 17:43:51 +0900 Subject: [PATCH] =?UTF-8?q?Payload=20=EC=B6=94=EA=B0=80=EB=90=9C=20?= =?UTF-8?q?=EB=B2=84=EC=A0=84=20=EB=A8=B8=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Interactions/RestaurantMealInteractionSubsystem.cs | 7 ++++++- .../RestaurantMeals/RestaurantMealSolver_WaitForOrder.cs | 6 +++--- .../RestaurantMeals/RestaurantMealSolver_WaitForServe.cs | 6 +++--- .../Solvers/RestaurantOrders/RestaurantOrderSolver_Busy.cs | 6 ++++-- .../RestaurantOrders/RestaurantOrderSolver_Dirty.cs | 6 +++--- .../Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs | 2 +- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantMealInteractionSubsystem.cs b/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantMealInteractionSubsystem.cs index 8c7924467..d018dc86b 100644 --- a/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantMealInteractionSubsystem.cs +++ b/Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantMealInteractionSubsystem.cs @@ -42,7 +42,12 @@ public bool OnInteracted(IInteractor interactor, ScriptableObject payloadSo = nu _currentRestaurantMealType = GetNextState(prev); return true; } - + + public ScriptableObject GetPayload() + { + return null; + } + private RestaurantMealType GetNextState(RestaurantMealType state) { switch (state) diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForOrder.cs b/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForOrder.cs index c17717631..59236cb16 100644 --- a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForOrder.cs +++ b/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForOrder.cs @@ -4,13 +4,13 @@ namespace DDD { public class RestaurantMealSolver_WaitForOrder : MonoBehaviour, IInteractionSubsystemSolver { - public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject payloadSo = null) + public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null) { return true; } - public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, - ScriptableObject payloadSo = null) + public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, + ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null) { return true; diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForServe.cs b/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForServe.cs index f46d22e80..86851c9f0 100644 --- a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForServe.cs +++ b/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForServe.cs @@ -4,13 +4,13 @@ namespace DDD { public class RestaurantMealSolver_WaitForServe : MonoBehaviour, IInteractionSubsystemSolver { - public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject payloadSo = null) + public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null) { return true; } - public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, - ScriptableObject payloadSo = null) + public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, + ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null) { return true; } diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Busy.cs b/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Busy.cs index da7bad36a..a53ef8b77 100644 --- a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Busy.cs +++ b/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Busy.cs @@ -4,15 +4,17 @@ namespace DDD.RestaurantOrders { public class RestaurantOrderSolver_Busy : MonoBehaviour, IInteractionSubsystemSolver { - public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject payloadSo = null) + public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, + ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null) { // TODO : DO SOMETHING!!! return true; } public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, - ScriptableObject payloadSo = null) + ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null) { + // TODO : DO SOMETHING!!! return true; } } diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Dirty.cs b/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Dirty.cs index 571cbd9a0..8819bfe60 100644 --- a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Dirty.cs +++ b/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Dirty.cs @@ -4,14 +4,14 @@ namespace DDD.RestaurantOrders { public class RestaurantOrderSolver_Dirty : MonoBehaviour, IInteractionSubsystemSolver { - public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject payloadSo = null) + public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null) { // TODO : DO SOMETHING!!! return true; } - public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, - ScriptableObject payloadSo = null) + public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, + ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null) { return true; } diff --git a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs b/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs index 94917688b..8667bddda 100644 --- a/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs +++ b/Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs @@ -7,7 +7,7 @@ public class RestaurantOrderSolver_Wait : MonoBehaviour, IInteractionSubsystemSo { public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null) { - if (CanExecuteInteractionSubsystem(interactor, interactable, payloadSo) == false) return false; + if (CanExecuteInteractionSubsystem(interactor, interactable, causerPayload, targetPayloadSo) == false) return false; return true; }