diff --git a/Assets/Scripts/Cgs/Play/PlayMatRotation.cs b/Assets/Scripts/Cgs/Play/PlayMatRotation.cs index a69d4561..f641843e 100644 --- a/Assets/Scripts/Cgs/Play/PlayMatRotation.cs +++ b/Assets/Scripts/Cgs/Play/PlayMatRotation.cs @@ -18,6 +18,7 @@ public class PlayMatRotation : MonoBehaviour public CanvasGroup sliderCanvasGroup; private const float PageHorizontalSensitivity = 45f; + private const float PageHorizontalSensitivity2 = 0.2f; private const float Tolerance = 0.01f; private const float TimeToDisappear = 3f; @@ -75,7 +76,7 @@ private void Update() Time.deltaTime * Inputs.FPageHorizontal * PageHorizontalSensitivity; else _playController.playArea.horizontalNormalizedPosition -= - Inputs.FPageHorizontal * PageHorizontalSensitivity * Time.deltaTime; + Inputs.FPageHorizontal * PageHorizontalSensitivity2 * Time.deltaTime; } [UsedImplicitly] diff --git a/Assets/Scripts/Cgs/UI/ScrollRects/RotateZoomableScrollRect.cs b/Assets/Scripts/Cgs/UI/ScrollRects/RotateZoomableScrollRect.cs index ec53010e..73690f52 100644 --- a/Assets/Scripts/Cgs/UI/ScrollRects/RotateZoomableScrollRect.cs +++ b/Assets/Scripts/Cgs/UI/ScrollRects/RotateZoomableScrollRect.cs @@ -84,6 +84,9 @@ protected override void SetContentAnchoredPosition(Vector2 position) public override void OnDrag(PointerEventData eventData) { + if (Input.GetMouseButton(0) && !(Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift))) + return; + PointerPositions[eventData.pointerId] = eventData.position; switch (eventData.button) { diff --git a/Packages/manifest.json b/Packages/manifest.json index def37f37..c9ba4dc7 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -3,12 +3,12 @@ "com.davidmfinol.sfb": "https://github.com/davidmfinol/UnityStandaloneFileBrowser.git", "com.unity.2d.sprite": "1.0.0", "com.unity.ai.navigation": "1.1.5", - "com.unity.ide.rider": "3.0.26", + "com.unity.ide.rider": "3.0.27", "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", "com.unity.netcode.gameobjects": "1.6.0", "com.unity.nuget.newtonsoft-json": "3.2.1", - "com.unity.services.lobby": "1.1.0", + "com.unity.services.lobby": "1.1.1", "com.unity.services.relay": "1.0.5", "com.unity.test-framework": "1.3.0", "com.unity.testtools.codecoverage": "1.2.4", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 4ce364ca..f9b41a0a 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -49,7 +49,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.26", + "version": "3.0.27", "depth": 0, "source": "registry", "dependencies": { @@ -128,7 +128,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.lobby": { - "version": "1.1.0", + "version": "1.1.1", "depth": 0, "source": "registry", "dependencies": {