diff --git a/Assets/Script/Player/SetControls.cs b/Assets/Script/Player/SetControls.cs index f01fd9d88cc9155a3f76f603424172a1ad360ecb..c3c173ffdfc8877784c77375e47d22d1f4c21c30 100644 --- a/Assets/Script/Player/SetControls.cs +++ b/Assets/Script/Player/SetControls.cs @@ -16,14 +16,14 @@ public class SetControls : MonoBehaviour // Set Mac Controls if (Application.platform == RuntimePlatform.OSXEditor) { - jump = Input.GetButtonDown("A Button Mac"); - pickup = Input.GetButtonDown("B Button Mac"); + jump = Input.GetButtonDown("X Button Mac"); + pickup = Input.GetButtonDown("Y Button Mac"); pause = Input.GetButtonDown("Menu (Start) Mac"); } if (Application.platform == RuntimePlatform.OSXPlayer) { - jump = Input.GetButtonDown("A Button Mac"); - pickup = Input.GetButtonDown("B Button Mac"); + jump = Input.GetButtonDown("X Button Mac"); + pickup = Input.GetButtonDown("Y Button Mac"); pause = Input.GetButtonDown("Menu (Start) Mac"); } diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 6cf2c97ac5ee9b5551dadca89bb89a7b2e123082..b44212af70017867d07b1e59f66e1bcf3bdcb428 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -36,6 +36,10 @@ GraphicsSettings: - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 91c64908a783d1ce29174231f993d3c627cf5889..938e5778b622b1795bb7ae0a2984987bde2fc0e6 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -682,7 +682,7 @@ InputManager: descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: joystick button 18 + positiveButton: joystick button 1 altNegativeButton: altPositiveButton: gravity: 1000 @@ -698,7 +698,7 @@ InputManager: descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: joystick button 19 + positiveButton: joystick button 0 altNegativeButton: altPositiveButton: gravity: 1000