diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 821785a..590c704 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -545,7 +545,7 @@ Rigidbody: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3224832258464819110} serializedVersion: 2 - m_Mass: 1 + m_Mass: 10 m_Drag: 0 m_AngularDrag: 0.05 m_UseGravity: 1 @@ -619,9 +619,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: body: {fileID: 2949611238048620088} - constSpeed: 1 + constSpeed: 2 constRotation: 10 - constUpForce: 1 + constUpForce: 5 --- !u!114 &2775598781587958943 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/MainGame.unity b/Assets/Scenes/MainGame.unity index 9176c0a..d0434c8 100644 --- a/Assets/Scenes/MainGame.unity +++ b/Assets/Scenes/MainGame.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.18028334, g: 0.2257134, b: 0.30692226, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -5033,6 +5033,7 @@ MonoBehaviour: NextScene: nextMouv: 3 target: {fileID: 1342694502} + positionManager: {fileID: 0} noMovementChange: 0 changeMouvementForPractice: 1 IsQuickTeleport: 0 @@ -10351,6 +10352,7 @@ MonoBehaviour: NextScene: nextMouv: 1 target: {fileID: 1342694502} + positionManager: {fileID: 0} noMovementChange: 0 changeMouvementForPractice: 1 IsQuickTeleport: 0 @@ -12583,6 +12585,7 @@ MonoBehaviour: NextScene: nextMouv: 0 target: {fileID: 1342694502} + positionManager: {fileID: 0} noMovementChange: 0 changeMouvementForPractice: 1 IsQuickTeleport: 0 diff --git a/Assets/Scripts/JoyCon/JoyConMovement.cs b/Assets/Scripts/JoyCon/JoyConMovement.cs index 0617cf1..f6d4a49 100644 --- a/Assets/Scripts/JoyCon/JoyConMovement.cs +++ b/Assets/Scripts/JoyCon/JoyConMovement.cs @@ -32,8 +32,8 @@ namespace JoyCon private void Update() { - //Joycon j = JoyConManager.GetJoycon(JcLegInd); - //_playerDirection = j.GetButton(Joycon.Button.SHOULDER_2) ? Vector3.back : Vector3.forward; + Joycon j = JoyConManager.GetJoycon(JcLegInd); + _playerDirection = j.GetButton(Joycon.Button.SHOULDER_2) ? Vector3.back : Vector3.forward; float moveHorizontal = Input.GetAxis("Horizontal"); transform.Rotate(0.0f, moveHorizontal * constSpeed * 2, 0.0f);