diff --git a/Assets/Scenes/sr_junglism/sr_junglism.unity b/Assets/Scenes/sr_junglism/sr_junglism.unity index 554d7ec..df3e1db 100644 --- a/Assets/Scenes/sr_junglism/sr_junglism.unity +++ b/Assets/Scenes/sr_junglism/sr_junglism.unity @@ -22034,6 +22034,10 @@ PrefabInstance: propertyPath: m_Name value: Timing objectReference: {fileID: 0} + - target: {fileID: 2603084029878042569, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} propertyPath: m_RootOrder value: 3 diff --git a/Assets/Src/ShipControls.cs b/Assets/Src/ShipControls.cs index 787a81c..c7119c6 100755 --- a/Assets/Src/ShipControls.cs +++ b/Assets/Src/ShipControls.cs @@ -26,6 +26,23 @@ public class ShipControls : MonoBehaviour { float camYaw; float clampAngle = 90.0f; + float _invertY = 1.0f; + public bool InvertY { + set { + _invertY = value ? -1.0f : 1.0f; + Debug.Log($"Set invert Y {_invertY}"); + } + } + + float _viewSens = 1.0f; + public float ViewSens { + get => _viewSens; + set { + _viewSens = value; + Debug.Log($"Set view sensitivity {_viewSens}"); + } + } + public PowerUnit powerUnit = new(); public float Speed => rigidBody.velocity.magnitude; @@ -107,9 +124,11 @@ public class ShipControls : MonoBehaviour { // delta *= 0.1f; // Account for sensitivity setting on old Mouse X and Y axes. // def needs to be configurable + Vector2 lookDelta = input.ship.look.ReadValue(); - camYaw += lookDelta.x; - camPitch -= lookDelta.y; + + camYaw += lookDelta.x * _viewSens; + camPitch -= lookDelta.y * _viewSens * _invertY; camPitch = Mathf.Clamp(camPitch, -clampAngle, clampAngle); aim.transform.eulerAngles = new Vector3(camPitch, camYaw, 0.0f); } diff --git a/Assets/Src/UI/Global.uss b/Assets/Src/UI/Global.uss new file mode 100644 index 0000000..3fc1612 --- /dev/null +++ b/Assets/Src/UI/Global.uss @@ -0,0 +1,14 @@ +:root { + --green: rgb(31, 240, 31); + --red: rgb(165, 42, 42); + --blue: rgb(48, 80, 248); + --purple: rgb(164, 35, 188); + --yellow: rgb(255, 161, 0); + --white: rgb(245, 245, 245); + color: rgb(245, 245, 245); + border-color: var(--white); + font-size: 24px; + letter-spacing: 24px; + -unity-font: url("/Assets/UI Toolkit/Fonts/Jura-Medium.otf"); + -unity-font-definition: initial; +} diff --git a/Assets/Src/UI/Global.uss.meta b/Assets/Src/UI/Global.uss.meta new file mode 100644 index 0000000..7e2553e --- /dev/null +++ b/Assets/Src/UI/Global.uss.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 000591923dc977463bf0fd9f4e7d463e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0} + disableValidation: 0 diff --git a/Assets/Src/UI/Menu.uss b/Assets/Src/UI/Menu.uss index 81a0736..9bfc694 100644 --- a/Assets/Src/UI/Menu.uss +++ b/Assets/Src/UI/Menu.uss @@ -1,5 +1,5 @@ -#Menu #main VisualElement { - flex-basis: 50%; +#Menu #main { + flex-grow: 1; } #logo { @@ -9,12 +9,25 @@ height: 256px; } -/*#exit { - width: 256px; -} -*/ Button { background-color: rgba(0, 0, 0, 0.26); color: rgb(255, 255, 255); border-radius: 5px; + width: 33%; +} + +Button:focus { + border-color: var(--green); +} + +Button:hover { + border-color: var(--green); +} + +Toggle:focus { + border-color: var(--green); +} + +Toggle:hover { + border-color: var(--green); } diff --git a/Assets/Src/UI/Menu.uxml b/Assets/Src/UI/Menu.uxml index 366cf48..798b870 100644 --- a/Assets/Src/UI/Menu.uxml +++ b/Assets/Src/UI/Menu.uxml @@ -1,24 +1,20 @@ -