Merge pull request #8 from Studio-23-xyz/dev

Update dependency package version
Studio-23-xyz · Dec 19, 2023 · 6f45f02 · 6f45f02
2 parents 522ca13 + 0b7e73f
commit 6f45f02
Show file tree

Hide file tree

Showing 62 changed files with 83 additions and 132 deletions.
diff --git a/Assets/Packages/com.studio23.ss2.interactionsystem/README.md.meta b/Assets/Packages/com.studio23.ss2.interactionsystem/README.md.meta
diff --git a/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Abstract/ClosableBase.cs b/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Abstract/ClosableBase.cs
@@ -1,5 +1,5 @@
 using System.Threading;
-using com.bdeshi.helpers.Input;
+using Bdeshi.Helpers.Input;
 using Studio23.SS2.InteractionSystem.Core;
 using Studio23.SS2.InteractionSystem.Data;
 using Cysharp.Threading.Tasks;

diff --git a/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Abstract/InspectableBase.cs b/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Abstract/InspectableBase.cs
@@ -1,5 +1,6 @@
 using System.Threading;
-using com.bdeshi.helpers.Input;
+using Bdeshi.Helpers;
+using Bdeshi.Helpers.Input;
 using Studio23.SS2.InteractionSystem.Core;
 using Cysharp.Threading.Tasks;
 using UnityEngine;

diff --git a/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Abstract/InteractableBase.cs b/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Abstract/InteractableBase.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading;
-using com.bdeshi.helpers.Input;
+using Bdeshi.Helpers;
+using Bdeshi.Helpers.Input;
 using Studio23.SS2.InteractionSystem.Core;
 using Studio23.SS2.InteractionSystem.Data;
 using Cysharp.Threading.Tasks;

diff --git a/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Abstract/ItemPickupBase.cs b/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Abstract/ItemPickupBase.cs
@@ -1,4 +1,5 @@
-using com.bdeshi.helpers.Input;
+using Bdeshi.Helpers;
+using Bdeshi.Helpers.Input;
 using Studio23.SS2.InteractionSystem.Core;
 using UnityEngine;
 

diff --git a/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Abstract/OpenableBase.cs b/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Abstract/OpenableBase.cs
@@ -1,5 +1,6 @@
 using System.Threading;
-using com.bdeshi.helpers.Input;
+using Bdeshi.Helpers;
+using Bdeshi.Helpers.Input;
 using Studio23.SS2.InteractionSystem.Core;
 using Studio23.SS2.InteractionSystem.Data;
 using Cysharp.Threading.Tasks;

diff --git a/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Abstract/TogglableBase.cs b/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Abstract/TogglableBase.cs
@@ -1,5 +1,6 @@
 using System.Threading;
-using com.bdeshi.helpers.Input;
+using Bdeshi.Helpers;
+using Bdeshi.Helpers.Input;
 using Studio23.SS2.InteractionSystem.Core;
 using Cysharp.Threading.Tasks;
 using UnityEngine;

diff --git a/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Core/InputPromptsController.cs b/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Core/InputPromptsController.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using com.bdeshi.helpers.Utility;
+using Bdeshi.Helpers.Utility;
 using Studio23.SS2.InteractionSystem.Abstract;
 using Studio23.SS2.InteractionSystem.Data;
 using Studio23.SS2.InteractionSystem.UI;
@@ -25,9 +25,9 @@ private void Initialize()
             _view = GetComponent<InputPromptsViewBase>();
             _model.OnPromptsChanged += _view.UpdatePromptsView;
 
-            InteractionInputManager.Instance.InspectButton.addPerformedCallback(gameObject, HandleInspectPressed);
-            InteractionInputManager.Instance.PickupButton.addPerformedCallback(gameObject, HandlePickupPressed);
-            InteractionInputManager.Instance.ToggleButton.addPerformedCallback(gameObject, HandleTogglePressed);
+            InteractionInputManager.Instance.InspectButton.AddCancelledCallback(gameObject, HandleInspectPressed);
+            InteractionInputManager.Instance.PickupButton.AddCancelledCallback(gameObject, HandlePickupPressed);
+            InteractionInputManager.Instance.ToggleButton.AddCancelledCallback(gameObject, HandleTogglePressed);
         }
 
         private async void HandleTogglePressed()
@@ -82,7 +82,7 @@ private async UniTask DoHoldInteraction(InteractableBase interactableBase)
             buttonPrompt.SetProgress(0);
 
             _remainingPressTimer.reset(interactableBase.InteractionHoldTime);
-            while (interactableBase.InputButton.isHeld)
+            while (interactableBase.InputButton.IsHeld)
             {
                 _remainingPressTimer.safeUpdateTimer(Time.deltaTime);
                 buttonPrompt.SetProgress(_remainingPressTimer.Ratio);

diff --git a/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Core/InspectionManager.cs b/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Core/InspectionManager.cs
@@ -1,5 +1,5 @@
 using System.Threading;
-using com.bdeshi.helpers.Utility;
+using Bdeshi.Helpers.Utility;
 using Studio23.SS2.InteractionSystem.Abstract;
 using Cysharp.Threading.Tasks;
 using UnityEngine;
@@ -31,17 +31,17 @@ public class InspectionManager:MonoBehaviourSingletonPersistent<InspectionManage
 
         private Camera _cam;
 
-        protected override void initialize()
+        protected override void Initialize()
         {
             _subInteractionFinder = GetComponentInChildren<PlayerInteractionFinder>();
         }
 
         private void Start()
         {
-            InteractionInputManager.Instance.InspectionDragButton.addPerformedCallback(gameObject, HandleInspectDragPerformed);
-            InteractionInputManager.Instance.InspectionDragButton.addCancelledCallback(gameObject, HandleInspectDragCancelled);
-            InteractionInputManager.Instance.InteractCancelButton.addPerformedCallback(gameObject, HandleInspectionCancelled);
-            InteractionInputManager.Instance.InspectResetButton.addPerformedCallback(gameObject, HandleInspectResetPerformed);
+            InteractionInputManager.Instance.InspectionDragButton.AddPerformedCallback(gameObject, HandleInspectDragPerformed);
+            InteractionInputManager.Instance.InspectionDragButton.AddCancelledCallback(gameObject, HandleInspectDragCancelled);
+            InteractionInputManager.Instance.InteractCancelButton.AddPerformedCallback(gameObject, HandleInspectionCancelled);
+            InteractionInputManager.Instance.InspectResetButton.AddPerformedCallback(gameObject, HandleInspectResetPerformed);
         }
 
         private void HandleInspectResetPerformed()

diff --git a/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Core/InteractionInputManager.cs b/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Core/InteractionInputManager.cs
@@ -1,6 +1,8 @@
 using System.Collections.Generic;
-using com.bdeshi.helpers.Input;
-using com.bdeshi.helpers.Utility;
+using Bdeshi.Helpers.Input;
+using Bdeshi.Helpers.Utility;
+using Bdeshi.Helpers;
+using Bdeshi.Helpers.Utility;
 using UnityEngine;
 using UnityEngine.InputSystem;
 
@@ -45,7 +47,7 @@ public class InteractionInputManager : MonoBehaviourSingletonPersistent<Interact
 
 
         #endregion
-        protected override void initialize()
+        protected override void Initialize()
         {
             Buttons = new List<InputButtonSlot>();
             InspectButton = new InputButtonSlot("InspectButton");
@@ -84,10 +86,10 @@ void Bind(InputButtonSlot slot, InputActionReference action)
         {
             if(action == null)
             {
-                Debug.LogWarning("action null for button " + slot.buttonName);
+                Debug.LogWarning("action null for button " + slot.ButtonName);
                 return;
             }
-            slot.bind(action);
+            slot.Bind(action);
             Buttons.Add(slot);
         }
         void OnEnable()
@@ -133,7 +135,7 @@ private void UnBindAll()
 
             foreach (var inputButtonSlot in Buttons)
             {
-                inputButtonSlot.unBind();
+                inputButtonSlot.UnBind();
             }
 
             _inspectMoveAction.action.performed -= OnMovePerformed;
@@ -159,7 +161,7 @@ public static void PlayModeExitCleanUp()
                 return;
             foreach (var inputButtonSlot in Instance.Buttons)
             {
-                inputButtonSlot.cleanup();
+                inputButtonSlot.Cleanup();
             }
         }
 

diff --git a/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Core/InteractionManager.cs b/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Core/InteractionManager.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-using com.bdeshi.helpers.Utility;
+using Bdeshi.Helpers.Utility;
 using Studio23.SS2.InteractionSystem.Abstract;
 using Studio23.SS2.InteractionSystem.Data;
 using Cysharp.Threading.Tasks;
@@ -133,7 +133,7 @@ public async void StartNewInteraction(InteractableBase newInteractableBase)
             }
         }
 
-        protected override void initialize()
+        protected override void Initialize()
         {
             RefreshCancellationToken();
         }

diff --git a/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Core/PlayerInteractionFinder.cs b/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Core/PlayerInteractionFinder.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using com.bdeshi.helpers.Utility.Extensions;
+using Bdeshi.Helpers.Utility.Extensions;
 using Studio23.SS2.InteractionSystem.Abstract;
 using Studio23.SS2.InteractionSystem.Data;
 using UnityEngine;

diff --git a/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Data/InputPromptsModel.cs b/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/Data/InputPromptsModel.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using com.bdeshi.helpers.Input;
+using Bdeshi.Helpers.Input;
 using Studio23.SS2.InteractionSystem.Abstract;
 using UnityEngine;
 

diff --git a/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/UI/InputPromptsView.cs b/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/UI/InputPromptsView.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
-using com.bdeshi.helpers.Input;
+using Bdeshi.Helpers;
+using Bdeshi.Helpers.Input;
 using Studio23.SS2.InteractionSystem.Core;
 using Studio23.SS2.InteractionSystem.Data;
 using UnityEngine;

diff --git a/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/UI/InputPromptsViewBase.cs b/Assets/Packages/com.studio23.ss2.interactionsystem/Runtime/UI/InputPromptsViewBase.cs
@@ -1,4 +1,4 @@
-using com.bdeshi.helpers.Input;
+using Bdeshi.Helpers.Input;
 using Studio23.SS2.InteractionSystem.Data;
 using UnityEngine;
 

diff --git a/Assets/Packages/com.studio23.ss2.interactionsystem/Samples/Demo/Scripts/TestInventory.cs b/Assets/Packages/com.studio23.ss2.interactionsystem/Samples/Demo/Scripts/TestInventory.cs
@@ -1,13 +1,13 @@
 using System.Collections.Generic;
-using com.bdeshi.helpers.Utility;
+using Bdeshi.Helpers.Utility;
 using UnityEngine;
 
 namespace Studio23.SS2.InteractionSystem.Samples.Demo1
 {
     public class TestInventory:MonoBehaviourSingletonPersistent<TestInventory>
     {
         HashSet<string> _items;
-        protected override void initialize()
+        protected override void Initialize()
         {
             _items = new HashSet<string>();
         }

diff --git a/...Packages/com.studio23.ss2.interactionsystem/Samples/Plugins/Demigiant/DOTween/DOTween.dll b/...Packages/com.studio23.ss2.interactionsystem/Samples/Plugins/Demigiant/DOTween/DOTween.dll
diff --git a/...studio23.ss2.interactionsystem/Samples/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll b/...studio23.ss2.interactionsystem/Samples/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll
diff --git a/...s2.interactionsystem/Samples/Plugins.meta → Assets/Plugins.meta b/...s2.interactionsystem/Samples/Plugins.meta → Assets/Plugins.meta
diff --git a/...tionsystem/Samples/Plugins/Demigiant.meta → Assets/Plugins/Demigiant.meta b/...tionsystem/Samples/Plugins/Demigiant.meta → Assets/Plugins/Demigiant.meta
diff --git a/...em/Samples/Plugins/Demigiant/DOTween.meta → Assets/Plugins/Demigiant/DOTween.meta b/...em/Samples/Plugins/Demigiant/DOTween.meta → Assets/Plugins/Demigiant/DOTween.meta
diff --git a/...les/Plugins/Demigiant/DOTween/DOTween.XML → Assets/Plugins/Demigiant/DOTween/DOTween.XML b/...les/Plugins/Demigiant/DOTween/DOTween.XML → Assets/Plugins/Demigiant/DOTween/DOTween.XML
diff --git a/...lugins/Demigiant/DOTween/DOTween.XML.meta → ...lugins/Demigiant/DOTween/DOTween.XML.meta b/...lugins/Demigiant/DOTween/DOTween.XML.meta → ...lugins/Demigiant/DOTween/DOTween.XML.meta
diff --git a/Assets/Plugins/Demigiant/DOTween/DOTween.dll b/Assets/Plugins/Demigiant/DOTween/DOTween.dll
diff --git a/...lugins/Demigiant/DOTween/DOTween.dll.meta → ...lugins/Demigiant/DOTween/DOTween.dll.meta b/...lugins/Demigiant/DOTween/DOTween.dll.meta → ...lugins/Demigiant/DOTween/DOTween.dll.meta
diff --git a/...les/Plugins/Demigiant/DOTween/Editor.meta → Assets/Plugins/Demigiant/DOTween/Editor.meta b/...les/Plugins/Demigiant/DOTween/Editor.meta → Assets/Plugins/Demigiant/DOTween/Editor.meta
diff --git a/...emigiant/DOTween/Editor/DOTweenEditor.XML → ...emigiant/DOTween/Editor/DOTweenEditor.XML b/...emigiant/DOTween/Editor/DOTweenEditor.XML → ...emigiant/DOTween/Editor/DOTweenEditor.XML
diff --git a/...ant/DOTween/Editor/DOTweenEditor.XML.meta → ...ant/DOTween/Editor/DOTweenEditor.XML.meta b/...ant/DOTween/Editor/DOTweenEditor.XML.meta → ...ant/DOTween/Editor/DOTweenEditor.XML.meta
diff --git a/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll b/Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll