diff --git a/Assets/Scripts/Controls.cs b/Assets/Scripts/Controls.cs index e5d8687..f844571 100644 --- a/Assets/Scripts/Controls.cs +++ b/Assets/Scripts/Controls.cs @@ -16,12 +16,21 @@ public class Controls : MonoBehaviour GameObject playerCam; UIHandler uihandler; Vector3 input; - Vector2 view; public PlayerInput playerInput; MoveDirection direction; public Vector2 sensitivityMouse = new Vector2(0, 0); - float multiplier = 0.01f; //DEV Purpose only + private Vector2 lookInput; + private Vector2 currentRotation; + private Vector2 rotationVelocity; + + private float yaw; + private float pitch; + + private float smoothTime = 0.05f; + + private float minPitch = -75f; + private float maxPitch = 80f; void Start() { @@ -31,7 +40,6 @@ public class Controls : MonoBehaviour playerCam = GameObject.Find("Main Camera"); uihandler = GameObject.Find("UIHandler").GetComponent(); input = new Vector3(); - view = new Vector2(); playerInput = GetComponent(); direction = MoveDirection.None; } @@ -53,8 +61,22 @@ public class Controls : MonoBehaviour { if (uihandler.canPlayerRotate()) { - playerCam.GetComponent().LookAround(view, sensitivityMouse * multiplier); - player.GetComponent().rotate(view, sensitivityMouse * multiplier); + lookInput = Mouse.current.delta.ReadValue(); + Vector2 targetRotation = lookInput * sensitivityMouse * Time.deltaTime; + currentRotation = Vector2.SmoothDamp( + currentRotation, + targetRotation, + ref rotationVelocity, + smoothTime + ); + + yaw += currentRotation.x; + pitch -= currentRotation.y; + pitch = Mathf.Clamp(pitch, minPitch, maxPitch); + // Apply rotations + transform.rotation = Quaternion.Euler(0f, yaw, 0f); + playerCam.GetComponent().LookAround(pitch); + player.GetComponent().rotate(yaw); } if (uihandler.canPlayerMove()) { @@ -85,7 +107,7 @@ public class Controls : MonoBehaviour public void OnLooking(InputValue value) { - view = value.Get(); + //lookInput = value.Get(); } public void OnMovement(InputValue value) diff --git a/Assets/Scripts/Player/PlayerCamera.cs b/Assets/Scripts/Player/PlayerCamera.cs index bb833e6..9510d33 100644 --- a/Assets/Scripts/Player/PlayerCamera.cs +++ b/Assets/Scripts/Player/PlayerCamera.cs @@ -43,17 +43,9 @@ namespace Assets.Scripts.Player return null; } - public void LookAround(Vector2 view, Vector2 speed) + public void LookAround(float pitch) { - if (transform.rotation.x <= -0.25) - { - if (view.y > 0) return; - } - if (transform.rotation.x >= 0.25) - { - if (view.y < 0) return; - } - transform.Rotate(Vector3.left, view.y * speed.y); + transform.localRotation = Quaternion.Euler(pitch, 0f, 0f); } void showInformation() diff --git a/Assets/Scripts/Player/PlayerGameObject.cs b/Assets/Scripts/Player/PlayerGameObject.cs index 61739e6..6398797 100644 --- a/Assets/Scripts/Player/PlayerGameObject.cs +++ b/Assets/Scripts/Player/PlayerGameObject.cs @@ -179,8 +179,8 @@ namespace Assets.Scripts.Player GameObject.Find("QuestLog").GetComponent().updateQuests("explore", gameObject, 1); } - public void rotate(Vector2 input, Vector2 speed){ - transform.Rotate(Vector3.up, input.x * speed.x * 5);// * Time.deltaTime); + public void rotate(float yaw){ + transform.rotation = Quaternion.Euler(0f, yaw, 0f); } public void getRotation() diff --git a/UserSettings/Layouts/default-6000.dwlt b/UserSettings/Layouts/default-6000.dwlt index 3155fcf..03652eb 100644 --- a/UserSettings/Layouts/default-6000.dwlt +++ b/UserSettings/Layouts/default-6000.dwlt @@ -41,9 +41,9 @@ MonoBehaviour: x: 1920 y: 28 width: 1920 - height: 998 + height: 971 m_ShowMode: 4 - m_Title: Inspector + m_Title: Hierarchy m_RootView: {fileID: 5} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -120,7 +120,7 @@ MonoBehaviour: x: 0 y: 0 width: 1920 - height: 998 + height: 971 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -165,7 +165,7 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 978 + y: 951 width: 1920 height: 20 m_MinSize: {x: 0, y: 0} @@ -189,11 +189,11 @@ MonoBehaviour: x: 0 y: 36 width: 1920 - height: 942 + height: 915 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 62 + controlID: 125 draggingID: 0 --- !u!114 &9 MonoBehaviour: @@ -215,11 +215,11 @@ MonoBehaviour: x: 0 y: 0 width: 1920 - height: 942 + height: 915 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 63 + controlID: 126 draggingID: 0 --- !u!114 &10 MonoBehaviour: @@ -241,7 +241,7 @@ MonoBehaviour: x: 0 y: 0 width: 1454 - height: 942 + height: 915 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 @@ -267,7 +267,7 @@ MonoBehaviour: x: 0 y: 0 width: 1454 - height: 644 + height: 626 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 @@ -291,7 +291,7 @@ MonoBehaviour: x: 0 y: 0 width: 359 - height: 644 + height: 626 m_MinSize: {x: 201, y: 226} m_MaxSize: {x: 4001, y: 4026} m_ActualView: {fileID: 17} @@ -317,7 +317,7 @@ MonoBehaviour: x: 359 y: 0 width: 1095 - height: 644 + height: 626 m_MinSize: {x: 202, y: 226} m_MaxSize: {x: 4002, y: 4026} m_ActualView: {fileID: 16} @@ -341,9 +341,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 644 + y: 626 width: 1454 - height: 298 + height: 289 m_MinSize: {x: 231, y: 276} m_MaxSize: {x: 10001, y: 10026} m_ActualView: {fileID: 19} @@ -370,7 +370,7 @@ MonoBehaviour: x: 1454 y: 0 width: 466 - height: 942 + height: 915 m_MinSize: {x: 276, y: 76} m_MaxSize: {x: 4001, y: 4026} m_ActualView: {fileID: 21} @@ -402,7 +402,7 @@ MonoBehaviour: x: 360 y: 24 width: 1093 - height: 618 + height: 600 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -459,11 +459,11 @@ MonoBehaviour: displayed: 0 id: unity-search-toolbar index: 2 - contents: '{"m_Layout":1,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":1,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":1,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":1,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 layout: 1 size: {x: 0, y: 0} @@ -515,11 +515,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Light Settings index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -543,11 +543,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Cloth Constraints index: 1 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -557,11 +557,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Cloth Collisions index: 2 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -613,11 +613,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Occlusion Culling index: 3 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -627,11 +627,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Physics Debugger index: 4 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -641,11 +641,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Scene Visibility index: 5 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -781,11 +781,11 @@ MonoBehaviour: displayed: 0 id: Brush Attributes index: 2 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -809,11 +809,11 @@ MonoBehaviour: displayed: 0 id: Terrain Tools index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -823,11 +823,11 @@ MonoBehaviour: displayed: 0 id: Brush Masks index: 1 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -837,11 +837,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Lighting Visualization Colors index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -865,11 +865,11 @@ MonoBehaviour: displayed: 0 id: SceneView/CamerasOverlay index: 9 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -879,11 +879,11 @@ MonoBehaviour: displayed: 0 id: Scene View/PBR Validation Settings index: 10 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -893,11 +893,11 @@ MonoBehaviour: displayed: 0 id: unity-spline-inspector index: 11 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -931,7 +931,7 @@ MonoBehaviour: m_Position: m_Target: {x: 97.26449, y: 79.453186, z: -124.13573} speed: 2 - m_Value: {x: 0.1591852, y: -2.916478, z: -18.185755} + m_Value: {x: 97.26449, y: 79.453186, z: -124.13573} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -979,11 +979,11 @@ MonoBehaviour: m_Rotation: m_Target: {x: -0.42115283, y: 0.37659967, z: -0.1979821, w: -0.8009632} speed: 2 - m_Value: {x: 0.0018710041, y: 0.99589354, z: -0.08215267, w: 0.0024397895} + m_Value: {x: -0.4211528, y: 0.37659967, z: -0.1979821, w: -0.80096316} m_Size: m_Target: 0.30661905 speed: 2 - m_Value: 9.470363 + m_Value: 0.30661905 m_Ortho: m_Target: 0 speed: 2 @@ -1041,7 +1041,7 @@ MonoBehaviour: x: 0 y: 24 width: 358 - height: 618 + height: 600 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1058,7 +1058,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ce91ffff80f0ffffa0f0ffffa8f4ffff7af5ffffd69c0000 + m_ExpandedIDs: 12fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1208,9 +1208,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 668 + y: 650 width: 1453 - height: 272 + height: 263 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1250,8 +1250,8 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 46} - m_SelectedIDs: 2c9c0000 - m_LastClickedID: 39980 + m_SelectedIDs: 629c0000 + m_LastClickedID: 40034 m_ExpandedIDs: 000000008a9b00008c9b00008e9b0000909b0000929b0000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1399,7 +1399,7 @@ MonoBehaviour: x: 1455 y: 24 width: 465 - height: 916 + height: 889 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 diff --git a/settings.txt b/settings.txt index 1677529..9aa90c4 100644 --- a/settings.txt +++ b/settings.txt @@ -3,4 +3,4 @@ Mode:0 Language:de Music:0 Effects:0 -SensitivityMouse:42.32454/58.06303 \ No newline at end of file +SensitivityMouse:50.37529/69.14286 \ No newline at end of file