Merge branch 'dev'

Studio-23-xyz · Feb 1, 2024 · 778af33 · 778af33
2 parents 8d16921 + ba7e3e0
commit 778af33
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/...ackages/com.studio23.ss2.interactionsystem/Runtime/Abstract/InputPromptsControllerBase.cs b/...ackages/com.studio23.ss2.interactionsystem/Runtime/Abstract/InputPromptsControllerBase.cs
@@ -6,7 +6,6 @@ namespace Studio23.SS2.InteractionSystem.Abstract
 {
     public abstract class InputPromptsControllerBase : MonoBehaviour
     {
-        public UnityEvent<InteractableBase> OnInteractableConfirmed;
         public UnityEvent<InteractableBase> OnInteractableConfirmationStarted;
         public UnityEvent<InteractableBase> OnInteractableConfirmationCancelled;
 

diff --git a/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Core/InputPromptsController.cs b/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Core/InputPromptsController.cs
@@ -67,7 +67,7 @@ public async UniTask ConfirmInteraction(InteractableBase interactableBase)
             {
                 _view.HidePrompts();
                 _model.ClearPrompts();
-                OnInteractableConfirmed?.Invoke(interactableBase);
+                InteractionManager.Instance.StartNewInteraction(interactableBase);
             }
             else
             {

diff --git a/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Core/InteractionManager.cs b/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Core/InteractionManager.cs
@@ -163,10 +163,7 @@ private void RefreshCancellationToken()
             _subInteractionCancellationTokens = new CancellationTokenSource();
         }
 
-        private void HandleInteractableConfirmationCompleted(InteractableBase obj)
-        {
-            StartNewInteraction(obj);
-        }
+
 
         public void ShowNewInteractables(List<InteractableBase> interactables)
         {
@@ -196,7 +193,6 @@ private void HandleInteractableConfirmationCancelled(InteractableBase obj)
 
         private void Start()
         {
-            _inputPromptsController.OnInteractableConfirmed.AddListener(HandleInteractableConfirmationCompleted); 
             _inputPromptsController.OnInteractableConfirmationStarted.AddListener(HandleInteractableConfirmationStarted);
             _inputPromptsController.OnInteractableConfirmationCancelled.AddListener(HandleInteractableConfirmationCancelled);
         }
@@ -211,7 +207,6 @@ private void OnDestroy()
 
             if (_inputPromptsController != null)
             {
-                _inputPromptsController.OnInteractableConfirmed.RemoveListener(HandleInteractableConfirmationCompleted);
                 _inputPromptsController.OnInteractableConfirmationStarted.RemoveListener(HandleInteractableConfirmationStarted);
                 _inputPromptsController.OnInteractableConfirmationCancelled.RemoveListener(HandleInteractableConfirmationCancelled);
             }