payload 롤백

Assets/_DDD/_Scripts/GameEvent/IInteractable.cs

@@ -48,7 +48,6 @@ public interface IInteractable
         InteractionExecutionParameters GetExecutionParameters();
         InteractionDisplayParameters GetDisplayParameters();
         Vector3[] GetInteractionPoints();
-        ScriptableObject GetPayload();
     }
     
     public interface IInteractor
@@ -62,7 +61,7 @@ bool CanInteractTo(IInteractable interactable,
 
     public interface IInteractionSolver
     {
-        bool ExecuteInteraction(IInteractor interactor, IInteractable interactable, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null);
+        bool ExecuteInteraction(IInteractor interactor, IInteractable interactable, ScriptableObject payload = null);
-        bool CanExecuteInteraction(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null);
+        bool CanExecuteInteraction(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject payload = null);
     }
 }

Assets/_DDD/_Scripts/GameEvent/InteractionSubsystem.cs

@@ -8,7 +8,6 @@ public interface IInteractionSubsystemObject
         void InitializeSubsystem();
         bool CanInteract();
         bool OnInteracted(IInteractor interactor, ScriptableObject payloadSo = null);
-        ScriptableObject GetPayload();
     }
     public interface IInteractionSubsystemObject<T> : IInteractionSubsystemObject where T : Enum
     {
@@ -21,7 +20,7 @@ public interface IInteractionSubsystemSolver
     }
     public interface IInteractionSubsystemSolver<T> : IInteractionSubsystemSolver where T : Enum
     {
-        bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null);
+        bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject payload = null);
-        bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null);
+        bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject payload = null);
     }
 }

Assets/_DDD/_Scripts/RestaurantEnvironment/Interactions/RestaurantCookInteractionSubsystem.cs

@@ -18,6 +18,11 @@ public RestaurantCookType GetInteractionSubsystemType()
             return _cookType;
         }
 
+        public void SetInteractionSubsystemType(RestaurantCookType inValue)
+        {
+            
+        }
+
         public virtual void InitializeSubsystem()
         {
             

Assets/_DDD/_Scripts/RestaurantEvent/RestaurantInteractionComponent.cs

@@ -31,19 +31,7 @@ public class RestaurantInteractionComponent : MonoBehaviour, IInteractable, IInt
         private bool _isInitialized = false;
 
         private Dictionary<InteractionType, IInteractionSubsystemObject> _subsystems = new();
-
+        
-        private void OnEnable()
-        {
-            // Register this interactable to environment state
-            var environmentState = RestaurantState.Instance?.EnvironmentState;
-            environmentState?.RegisterInteractable(this);
-
-            if (autoInitialize && !_isInitialized)
-            {
-                InitializeInteraction(_interactionType);
-            }
-        }
-
         private void OnDisable()
         {
             var environmentState = RestaurantState.Instance?.EnvironmentState;
@@ -87,7 +75,7 @@ public virtual bool IsInteractionHidden()
             return flowDisabled;
         }
 
-        public virtual bool OnInteracted(IInteractor interactor, ScriptableObject causerPayload = null)
+        public virtual bool OnInteracted(IInteractor interactor, ScriptableObject payload = null)
         {
             if (CanInteract() == false)
             {
@@ -95,10 +83,10 @@ public virtual bool OnInteracted(IInteractor interactor, ScriptableObject causer
             }
             
             bool interactionResult = RestaurantInteractionEvents.RestaurantInteraction.RequestInteraction(interactor.GetInteractorGameObject(),
-                GetInteractableGameObject(), GetInteractionType(), causerPayload, GetPayload(), true);
+                GetInteractableGameObject(), GetInteractionType(), payload, true);
             if (HasSubsystem(_interactionType))
             {
-                interactionResult &= GetSubsystem(_interactionType).OnInteracted(interactor, causerPayload);
+                interactionResult &= GetSubsystem(_interactionType).OnInteracted(interactor, payload);
             }
             return interactionResult;
         }
@@ -195,11 +183,6 @@ public Vector3[] GetInteractionPoints()
             return positions;
         }
 
-        public ScriptableObject GetPayload()
-        {
-            return TryGetSubsystem(_interactionType, out var subsystem) ? subsystem.GetPayload() : null;
-        }
-
         public bool TryGetSubsystemObject<T>(out IInteractionSubsystemObject<T> subsystemObject) where T : Enum
         {
             foreach (var interactionSubsystemObject in _subsystems.Values)

Assets/_DDD/_Scripts/RestaurantEvent/RestaurantInteractionEvents.cs

@@ -25,30 +25,28 @@ public class RestaurantInteractionEvent : IEvent
         public GameObject Causer;
         public GameObject Target;
         public InteractionType InteractionType;
-        public ScriptableObject CauserPayload;
+        public ScriptableObject Payload;
-        public ScriptableObject TargetPayload;
         public bool EventResult = false;
 
         public RestaurantInteractionEvent MakeInteractionEvent(GameObject causer, GameObject target, InteractionType interactionType,
-            ScriptableObject causerPayload, ScriptableObject targetPayload)
+            ScriptableObject payload = null)
         {
             Causer = causer;
             Target = target;
             InteractionType = interactionType;
-            CauserPayload = causerPayload;
+            Payload = payload;
-            TargetPayload = targetPayload;
             return this;
         }
 
         public bool RequestInteraction(GameObject causer, GameObject target, InteractionType interactionType,
-            ScriptableObject causerPayload = null, ScriptableObject targetPayload = null, bool shouldBroadcastAfterSolve = true)
+            ScriptableObject payload = null, bool shouldBroadcastAfterSolve = true)
         {
             if (interactionType == InteractionType.None)
             {
                 return false;
             }
             
-            var evt = MakeInteractionEvent(causer, target, interactionType, causerPayload, targetPayload);
+            var evt = MakeInteractionEvent(causer, target, interactionType, payload);
             evt.EventResult = false;
             // Solve event directly. 이벤트 처리는 여기서 하고, 이벤트 호출로는 이런 이벤트가 호출되었고 결과가 어떻다는 거 전파하는 식으로.
             if (RestaurantInteractionEventSolvers.TypeToSolver.TryGetValue(interactionType, out var solverType))
@@ -61,7 +59,7 @@ public bool RequestInteraction(GameObject causer, GameObject target, Interaction
                 // Cast solverComponent to IInteractable
                 if (solver is not null && interactor is not null)
                 {
-                    evt.EventResult = solver.ExecuteInteraction(interactor, interactable, causerPayload, targetPayload);
+                    evt.EventResult = solver.ExecuteInteraction(interactor, interactable, payload);
                 }
                 else 
                 {

Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantCooks/RestaurantCookSolver_OpenCookUi.cs

@@ -4,10 +4,9 @@ namespace DDD
 {
     public class RestaurantCookSolver_OpenCookUi : MonoBehaviour, IInteractionSubsystemSolver<RestaurantCookType>
     {
-        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable,
+        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject payload = null)
-            ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
         {
-            if (CanExecuteInteractionSubsystem(interactor, interactable, causerPayload, targetPayloadSo) == false) return false;
+            if (CanExecuteInteractionSubsystem(interactor, interactable, payload) == false) return false;
                 
             var evt = GameEvents.OpenPopupUiEvent;
             evt.UiType = typeof(CookUi);
@@ -16,8 +15,7 @@ public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable in
             return true;
         }
 
-        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null,
+        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject payload = null)
-            ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
         {
             GameFlowState currentGameFlowState = GameFlowManager.Instance.GameFlowDataSo.CurrentGameState;
             return currentGameFlowState == GameFlowState.RunRestaurant;

Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver_Menu.cs

@@ -4,9 +4,9 @@ namespace DDD
 {
     public class RestaurantManagementSolver_Menu : MonoBehaviour, IInteractionSubsystemSolver<RestaurantManagementType>
     {
-        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
+        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject payload = null)
         {
-            if (CanExecuteInteractionSubsystem(interactor, interactable, causerPayload, targetPayloadSo) == false) return false;
+            if (CanExecuteInteractionSubsystem(interactor, interactable, payload) == false) return false;
             
             var evt = GameEvents.OpenPopupUiEvent;
             evt.UiType = typeof(RestaurantManagementUi);
@@ -14,7 +14,7 @@ public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable in
             return true;
         }
 
-        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
+        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject payload = null)
         {
             GameFlowState currentGameFlowState = GameFlowManager.Instance.GameFlowDataSo.CurrentGameState;
             return currentGameFlowState == GameFlowState.ReadyForRestaurant;

Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantManagements/RestaurantManagementSolver_Start.cs

@@ -10,15 +10,15 @@ private RestaurantManagementState GetManagementState()
             return RestaurantState.Instance.ManagementState;
         }
 
-        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
+        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject payload = null)
         {
-            if (CanExecuteInteractionSubsystem(interactor, interactable, causerPayload, targetPayloadSo) == false) return false;
+            if (CanExecuteInteractionSubsystem(interactor, interactable, payload) == false) return false;
             
             _ = GameFlowManager.Instance.ChangeFlow(GameFlowState.RunRestaurant);
             return true;
         }
 
-        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
+        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject payload = null)
         {
             GameFlowState currentGameFlowState = GameFlowManager.Instance.GameFlowDataSo.CurrentGameState;
             

Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForOrder.cs

@@ -4,13 +4,12 @@ namespace DDD
 {
     public class RestaurantMealSolver_WaitForOrder : MonoBehaviour, IInteractionSubsystemSolver<RestaurantMealType>
     {
-        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
+        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject payload = null)
         {
             return true;
         }
 
-        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, 
+        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject payload = null)
-            ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
         {
             
             return true;

Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantMeals/RestaurantMealSolver_WaitForServe.cs

@@ -4,13 +4,12 @@ namespace DDD
 {
     public class RestaurantMealSolver_WaitForServe : MonoBehaviour, IInteractionSubsystemSolver<RestaurantMealType>
     {
-        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
+        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject payload = null)
         {
             return true;
         }
 
-        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, 
+        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject payload = null)
-            ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
         {
             return true;
         }

Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Busy.cs

@@ -4,15 +4,13 @@ namespace DDD.RestaurantOrders
 {
     public class RestaurantOrderSolver_Busy : MonoBehaviour, IInteractionSubsystemSolver<RestaurantOrderType>
     {
-        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable,
+        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject payload = null)
-            ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
         {
             // TODO : DO SOMETHING!!!
             return true;
         }
 
-        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null,
+        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject payload = null)
-            ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
         {
             // TODO : DO SOMETHING!!!
             return true;

Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Dirty.cs

@@ -4,14 +4,13 @@ namespace DDD.RestaurantOrders
 {
     public class RestaurantOrderSolver_Dirty : MonoBehaviour, IInteractionSubsystemSolver<RestaurantOrderType>
     {
-        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
+        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject payload = null)
         {
             // TODO : DO SOMETHING!!!
             return true;
         }
 
-        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, 
+        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject payload = null)
-            ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
         {
             return true;
         }

Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs

@@ -4,13 +4,13 @@ namespace DDD.RestaurantOrders
 {
     public class RestaurantOrderSolver_Order : MonoBehaviour, IInteractionSubsystemSolver<RestaurantOrderType>
     {
-        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
+        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject payload = null)
         {
             // TODO : DO SOMETHING!!!
             return true;
         }
 
-        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
+        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject payload = null)
         {
             return true;
         }

Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Reserved.cs

@@ -4,13 +4,13 @@ namespace DDD.RestaurantOrders
 {
     public class RestaurantOrderSolver_Reserved : MonoBehaviour, IInteractionSubsystemSolver<RestaurantOrderType>
     {
-        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
+        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject payload = null)
         {
             // TODO : DO SOMETHING!!!
             return true;
         }
 
-        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
+        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject payload = null)
         {
             // Interactable's CurrentInteractor is me? => Can execute
             return false;

Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Serve.cs

@@ -4,13 +4,13 @@ namespace DDD.RestaurantOrders
 {
     public class RestaurantOrderSolver_Serve : MonoBehaviour, IInteractionSubsystemSolver<RestaurantOrderType>
     {
-        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
+        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject payload = null)
         {
             // TODO : DO SOMETHING!!!
             return true;
         }
 
-        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
+        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject payload = null)
         {
             return true;
         }

Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs

@@ -5,9 +5,9 @@ namespace DDD.RestaurantOrders
 {
     public class RestaurantOrderSolver_Wait : MonoBehaviour, IInteractionSubsystemSolver<RestaurantOrderType>
     {
-        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
+        public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject payload = null)
         {
-            if (CanExecuteInteractionSubsystem(interactor, interactable, causerPayload, targetPayloadSo) == false) return false;
+            if (CanExecuteInteractionSubsystem(interactor, interactable, payload) == false) return false;
             // TODO : DO SOMETHING!!!
             /* TODO
              * OnInteracted에서 상태를 바꾸는 대신, 여기서 직접 바꿔주고, 현재 나에게 점유되어 있다는 사실을 알려주기? 그리고 CanInteractTo에서 이게 일치해야만 참 반환하게?
@@ -16,7 +16,7 @@ public bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable in
             return true;
         }
 
-        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
+        public bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject payload = null)
         {
             return true;
         }

Assets/_DDD/_Scripts/RestaurantEvent/Solvers/RestaurantSubsystemSolver.cs

@@ -18,16 +18,16 @@ private void Awake()
                 _solvers.Add(subsystemSolverType.Key, solver);
             }
         }
-        public bool ExecuteInteraction(IInteractor interactor, IInteractable interactable, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
+        public bool ExecuteInteraction(IInteractor interactor, IInteractable interactable, ScriptableObject payload = null)
         {
             return TryGetSolver(interactable, out var solver) &&
-                   solver.ExecuteInteractionSubsystem(interactor, interactable, causerPayload, targetPayloadSo);
+                   solver.ExecuteInteractionSubsystem(interactor, interactable, payload);
         }
 
-        public bool CanExecuteInteraction(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject causerPayload = null, ScriptableObject targetPayloadSo = null)
+        public bool CanExecuteInteraction(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject payload = null)
         {
             return TryGetSolver(interactable, out var solver) &&
-                   solver.CanExecuteInteractionSubsystem(interactor, interactable, causerPayload, targetPayloadSo);
+                   solver.CanExecuteInteractionSubsystem(interactor, interactable, payload);
         }
 
         // Solver를 가져오는 공통 로직