diff --git a/Assets/Nickk888/RTSCameraController/Prefabs/RTSCameraController_NewInputSystem.prefab b/Assets/Nickk888/RTSCameraController/Prefabs/RTSCameraController_NewInputSystem.prefab index c925a964..a1b3f0b8 100644 --- a/Assets/Nickk888/RTSCameraController/Prefabs/RTSCameraController_NewInputSystem.prefab +++ b/Assets/Nickk888/RTSCameraController/Prefabs/RTSCameraController_NewInputSystem.prefab @@ -1260,13 +1260,14 @@ MonoBehaviour: AllowTiltRotate: 1 AllowZoom: 1 AllowDragMove: 1 + mouseDragStyle: 0 AllowKeysMove: 1 AllowScreenSideMove: 1 AllowHeightOffsetChange: 1 MouseLockOnRotate: 1 InvertMouseVertical: 0 InvertMouseHorizontal: 0 - CameraMouseSpeed: 2 + CameraMouseSpeed: 16 CameraRotateSpeed: 2 CameraKeysRotateSpeedMultiplier: 50 CameraKeysSpeed: 6 diff --git a/Assets/Nickk888/RTSCameraController/Prefabs/RTSCameraController_OldInputSystem.prefab b/Assets/Nickk888/RTSCameraController/Prefabs/RTSCameraController_OldInputSystem.prefab index 0679e073..748f70a8 100644 --- a/Assets/Nickk888/RTSCameraController/Prefabs/RTSCameraController_OldInputSystem.prefab +++ b/Assets/Nickk888/RTSCameraController/Prefabs/RTSCameraController_OldInputSystem.prefab @@ -1267,7 +1267,7 @@ MonoBehaviour: MouseLockOnRotate: 1 InvertMouseVertical: 0 InvertMouseHorizontal: 0 - CameraMouseSpeed: 8 + CameraMouseSpeed: 16 CameraRotateSpeed: 2 CameraKeysRotateSpeedMultiplier: 50 CameraKeysSpeed: 6 diff --git a/Assets/Nickk888/RTSCameraController/Scenes/ExampleScene.unity b/Assets/Nickk888/RTSCameraController/Scenes/ExampleScene.unity index d61222c3..3ad2d594 100644 --- a/Assets/Nickk888/RTSCameraController/Scenes/ExampleScene.unity +++ b/Assets/Nickk888/RTSCameraController/Scenes/ExampleScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6017bd65b35cf75d907f5a5286344cb9d6a4a6bc8e3fc4d7b19d15665b839e47 -size 74814145 +oid sha256:687d42e571ddb8dec4dbde3253c0b748b45d00e83418ea77506c4dc69a2d14fd +size 74818563 diff --git a/Assets/Nickk888/RTSCameraController/Scripts/RTSCameraTargetController.cs b/Assets/Nickk888/RTSCameraController/Scripts/RTSCameraTargetController.cs index 7d40e56f..beb23021 100644 --- a/Assets/Nickk888/RTSCameraController/Scripts/RTSCameraTargetController.cs +++ b/Assets/Nickk888/RTSCameraController/Scripts/RTSCameraTargetController.cs @@ -110,7 +110,7 @@ [SerializeField] [Tooltip("Invert the horizontal mouse input?")] [Space] [Header("Speed")] [SerializeField, Min(0)] - public float CameraMouseSpeed = 8.0f; + public float CameraMouseSpeed = 16.0f; [SerializeField, Min(0)] public float CameraRotateSpeed = 2.0f; @@ -378,13 +378,13 @@ private void HandleMouseDrag(Vector3 mousePos) CancelTargetLock(); OnMouseDragStarted?.Invoke(this, new OnMouseDragStartedEventArgs { mouseLockPosition = mousePos, mouseDragStyle = MouseDragStyle.MouseDirection }); } - if ((_isDragging && !_inputProvider.DragButtonInput()) || (_isDragging && !AllowDragMove)) + else if ((_isDragging && !_inputProvider.DragButtonInput()) || (_isDragging && !AllowDragMove)) { Cursor.visible = true; _isDragging = false; OnMouseDragStopped?.Invoke(this, EventArgs.Empty); } - if (_inputProvider.DragButtonInput() && _isDragging && AllowDragMove) + else if (_inputProvider.DragButtonInput() && _isDragging && AllowDragMove) { Vector3 vectorChange = new Vector3(_mouseLockPos.x - mousePos.x, 0, _mouseLockPos.y - mousePos.y) * -1; float distance = vectorChange.sqrMagnitude; @@ -407,14 +407,14 @@ private void HandleMouseDrag(Vector3 mousePos) CancelTargetLock(); OnMouseDragStarted?.Invoke(this, new OnMouseDragStartedEventArgs { mouseLockPosition = mousePos, mouseDragStyle = MouseDragStyle.Direct }); } - if ((_isDragging && !_inputProvider.DragButtonInput()) || (_isDragging && !AllowDragMove)) + else if ((_isDragging && !_inputProvider.DragButtonInput()) || (_isDragging && !AllowDragMove)) { Cursor.visible = true; Cursor.lockState = CursorLockMode.None; _isDragging = false; OnMouseDragStopped?.Invoke(this, EventArgs.Empty); } - if (_inputProvider.DragButtonInput() && _isDragging && AllowDragMove) + else if (_inputProvider.DragButtonInput() && _isDragging && AllowDragMove) { Vector3 vectorChange = _inputProvider.MouseInput(); vectorChange.z = vectorChange.y;