Merge branch 'update-2-0-0'

jozzzzep · Dec 28, 2022 · 8fdfa61 · 8fdfa61
2 parents d64f5ec + 0458039
commit 8fdfa61
Show file tree

Hide file tree

Showing 73 changed files with 8,411 additions and 916 deletions.
diff --git a/README.md b/README.md
diff --git a/packages/KeyBinder.unitypackage b/packages/KeyBinder.unitypackage
diff --git a/packages/keybinder-scripts.zip b/packages/keybinder-scripts.zip
diff --git a/samples/keybinder-unity-examples/Assets/Examples/CanvasMiddleText.prefab b/samples/keybinder-unity-examples/Assets/Examples/CanvasMiddleText.prefab
@@ -13,7 +13,7 @@ GameObject:
   - component: {fileID: 3979250487278012142}
   - component: {fileID: 3979250487278012141}
   m_Layer: 5
-  m_Name: Canvas
+  m_Name: CanvasMiddleText
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -29,6 +29,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3979250487461342932}
   m_Father: {fileID: 0}
@@ -72,7 +73,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
+  m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
   m_ReferenceResolution: {x: 800, y: 600}
@@ -128,6 +129,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3979250487278012144}
   m_RootOrder: 0

diff --git a/samples/keybinder-unity-examples/Assets/Examples/Example01/ExampleScript01.cs b/samples/keybinder-unity-examples/Assets/Examples/Example01/ExampleScript01.cs
@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using TMPro;
 using KeyBinder;
@@ -8,16 +6,14 @@ public class ExampleScript01 : MonoBehaviour
 {
     [SerializeField] TextMeshProUGUI textComp;
 
-    // Start is called before the first frame update
     void Start()
     {
         textComp.text = "Press a key";
         KeyDetector.InputCheckSetActive(true);
-        KeyDetector.KeyReceived += KeyBinderKeyReceived;
     }
 
-    private void KeyBinderKeyReceived(KeyCode obj)
+    private void Update()
     {
-        textComp.text = $"Key pressed: {obj}";
+        textComp.text = $"Key pressed: {KeyDetector.LatestKey}";
     }
 }
diff --git a/samples/keybinder-unity-examples/Assets/Examples/Example02/ExampleScene02.unity b/samples/keybinder-unity-examples/Assets/Examples/Example02/ExampleScene02.unity
@@ -210,6 +210,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_SendPointerHoverToParent: 1
   m_HorizontalAxis: Horizontal
   m_VerticalAxis: Vertical
   m_SubmitButton: Submit
@@ -242,6 +243,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 2
@@ -394,6 +396,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 3

diff --git a/samples/keybinder-unity-examples/Assets/Examples/Example02/ExampleScript02.cs b/samples/keybinder-unity-examples/Assets/Examples/Example02/ExampleScript02.cs
@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using TMPro;
 using KeyBinder;
@@ -8,15 +6,15 @@ public class ExampleScript02 : MonoBehaviour
 {
     [SerializeField] TextMeshProUGUI textComp;
 
-    // Start is called before the first frame update
     void Start()
     {
         textComp.text = "Press a key";
         KeyDetector.InputCheckSetActive(true);
+        KeyDetector.KeyReceived += KeyBinderKeyReceived;
     }
 
-    private void Update()
+    private void KeyBinderKeyReceived(KeyCode obj)
     {
-        textComp.text = $"Key pressed: {KeyDetector.LatestKey}";
+        textComp.text = $"Key pressed: {obj}";
     }
 }
diff --git a/samples/keybinder-unity-examples/Assets/Examples/Example03/ExampleScene03.unity b/samples/keybinder-unity-examples/Assets/Examples/Example03/ExampleScene03.unity
@@ -151,14 +151,15 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1253847176}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -126.71, y: 243.5}
-  m_SizeDelta: {x: 602.57, y: 38.254}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 335, y: -38}
+  m_SizeDelta: {x: 602.57007, y: 38.25403}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &121495112
 MonoBehaviour:
@@ -284,6 +285,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 3
@@ -352,10 +354,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
+  m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
+  m_ReferenceResolution: {x: 1280, y: 720}
   m_ScreenMatchMode: 0
   m_MatchWidthOrHeight: 0
   m_PhysicalUnit: 3
@@ -394,6 +396,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 121495111}
   - {fileID: 2137231986}
@@ -435,6 +438,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_SendPointerHoverToParent: 1
   m_HorizontalAxis: Horizontal
   m_VerticalAxis: Vertical
   m_SubmitButton: Submit
@@ -467,6 +471,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 2
@@ -499,6 +504,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2137231986}
   m_RootOrder: 0
@@ -634,15 +640,16 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1925297929}
   m_Father: {fileID: 1253847176}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 301.65057, y: 243.5}
-  m_SizeDelta: {x: 254.1611, y: 38.2528}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -151, y: -38}
+  m_SizeDelta: {x: 254.16113, y: 38.252808}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2137231987
 MonoBehaviour:

diff --git a/samples/keybinder-unity-examples/Assets/Examples/Example03/ExampleScript03.cs b/samples/keybinder-unity-examples/Assets/Examples/Example03/ExampleScript03.cs
@@ -1,11 +1,11 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using TMPro;
 using KeyBinder;
 
 public class ExampleScript03 : MonoBehaviour
 {
+    /// a better solution is in example 4
+
     [SerializeField] TextMeshProUGUI textComp;
     [SerializeField] GameObject bulletPrefab;
     [SerializeField] Transform firePoint;
@@ -52,7 +52,7 @@ public void BindNewKey()
     void DetectedNewKey(KeyCode key)
     {
         UpdateKeyBind(key);
-        KeyDetector.KeyReceived -= UpdateKeyBind;
+        KeyDetector.KeyReceived -= DetectedNewKey;
         KeyDetector.InputCheckSetActive(false);
         binding = false;
     }

diff --git a/samples/keybinder-unity-examples/Assets/Examples/Example04/ExampleScene04.unity b/samples/keybinder-unity-examples/Assets/Examples/Example04/ExampleScene04.unity
@@ -151,14 +151,15 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1253847176}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -126.71, y: 243.5}
-  m_SizeDelta: {x: 602.57, y: 38.254}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 327, y: -38}
+  m_SizeDelta: {x: 602.57, y: 38.253998}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &121495112
 MonoBehaviour:
@@ -284,6 +285,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 3
@@ -352,7 +354,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
+  m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
   m_ReferenceResolution: {x: 800, y: 600}
@@ -394,6 +396,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 121495111}
   - {fileID: 2137231986}
@@ -435,6 +438,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_SendPointerHoverToParent: 1
   m_HorizontalAxis: Horizontal
   m_VerticalAxis: Vertical
   m_SubmitButton: Submit
@@ -467,6 +471,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 2
@@ -499,6 +504,7 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2137231986}
   m_RootOrder: 0
@@ -634,15 +640,16 @@ RectTransform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1925297929}
   m_Father: {fileID: 1253847176}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 301.65057, y: 243.5}
-  m_SizeDelta: {x: 254.1611, y: 38.2528}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -146, y: -38}
+  m_SizeDelta: {x: 254.16113, y: 38.252808}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2137231987
 MonoBehaviour:

diff --git a/samples/keybinder-unity-examples/Assets/Examples/Example04/ExampleScript04.cs b/samples/keybinder-unity-examples/Assets/Examples/Example04/ExampleScript04.cs
@@ -10,7 +10,6 @@ public class ExampleScript04 : MonoBehaviour
     [SerializeField] float shootingForce;
 
     KeyCode currentBind;
-    bool binding;
 
     void Start()
     {
@@ -19,7 +18,7 @@ void Start()
 
     void Update()
     {
-        if (binding) return;
+        if (KeyDetector.InputCheckIsActive) return;
 
         if (Input.GetKeyDown(currentBind))
             Shoot();
@@ -43,12 +42,10 @@ public void BindNewKey()
     {
         textComp.text = $"Press a key to bind it";
         KeyDetector.InputCheckOnce(DetectedNewKey);
-        binding = true;
     }
 
     void DetectedNewKey(KeyCode key)
     {
         UpdateKeyBind(key);
-        binding = false;
     }
 }
diff --git a/samples/keybinder-unity-examples/Assets/Examples/Example05.meta b/samples/keybinder-unity-examples/Assets/Examples/Example05.meta