From de566924ad11af1132883206045149644e55e755 Mon Sep 17 00:00:00 2001 From: desktop-maesty/steve Date: Mon, 25 Sep 2017 19:30:34 +1000 Subject: [PATCH] Updated Input Axes Removed missing monoscript from Football scene --- .../FungusExamples/Playground/Football.unity | 37 ++----- ProjectSettings/InputManager.asset | 100 ++++++++++++++---- 2 files changed, 89 insertions(+), 48 deletions(-) diff --git a/Assets/FungusExamples/Playground/Football.unity b/Assets/FungusExamples/Playground/Football.unity index da641e39..0e9ef072 100644 --- a/Assets/FungusExamples/Playground/Football.unity +++ b/Assets/FungusExamples/Playground/Football.unity @@ -250,7 +250,6 @@ GameObject: - component: {fileID: 53095177} - component: {fileID: 53095178} - component: {fileID: 53095176} - - component: {fileID: 53095179} - component: {fileID: 53095172} - component: {fileID: 53095180} - component: {fileID: 53095160} @@ -688,9 +687,8 @@ MonoBehaviour: width: 0 height: 0 selectedBlocks: - - {fileID: 53095162} - selectedCommands: - - {fileID: 53095181} + - {fileID: 53095145} + selectedCommands: [] variables: - {fileID: 53095153} - {fileID: 53095152} @@ -724,7 +722,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &53095158 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 53095135} @@ -738,7 +736,7 @@ MonoBehaviour: value: {x: 0, y: 0, z: 0} --- !u!114 &53095159 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 53095135} @@ -752,7 +750,7 @@ MonoBehaviour: value: {x: -5, y: 0, z: 0} --- !u!114 &53095160 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 53095135} @@ -991,7 +989,6 @@ MonoBehaviour: eventHandler: {fileID: 0} commandList: - {fileID: 53095175} - - {fileID: 53095179} - {fileID: 53095174} - {fileID: 53095173} - {fileID: 53095172} @@ -1131,26 +1128,6 @@ MonoBehaviour: stringVal: startIndex: 0 callMode: 0 ---- !u!114 &53095179 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 53095135} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b521257e66940a4c835dce2e246e464, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 34 - indentLevel: 0 - property: 9 - transformData: - transformRef: {fileID: 0} - transformVal: {fileID: 785288107} - vec3: - vector3Ref: {fileID: 0} - vector3Val: {x: 1, y: 1, z: 1} --- !u!114 &53095180 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1172,7 +1149,7 @@ MonoBehaviour: inOutVar: {fileID: 53095160} --- !u!114 &53095181 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 53095135} @@ -1191,7 +1168,7 @@ MonoBehaviour: inOutVar: {fileID: 53095158} --- !u!114 &53095182 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 53095135} diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 0a69793b..88af1c0c 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -14,7 +14,39 @@ InputManager: altNegativeButton: a altPositiveButton: d gravity: 3 - dead: .00100000005 + dead: 0.001 + sensitivity: 3 + snap: 1 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: p1xAxis + descriptiveName: + descriptiveNegativeName: + negativeButton: left + positiveButton: right + altNegativeButton: + altPositiveButton: + gravity: 3 + dead: 0.001 + sensitivity: 3 + snap: 1 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: p2xAxis + descriptiveName: + descriptiveNegativeName: + negativeButton: a + positiveButton: d + altNegativeButton: + altPositiveButton: + gravity: 3 + dead: 0.001 sensitivity: 3 snap: 1 invert: 0 @@ -30,7 +62,39 @@ InputManager: altNegativeButton: s altPositiveButton: w gravity: 3 - dead: .00100000005 + dead: 0.001 + sensitivity: 3 + snap: 1 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: p1yAxis + descriptiveName: + descriptiveNegativeName: + negativeButton: down + positiveButton: up + altNegativeButton: + altPositiveButton: + gravity: 3 + dead: 0.001 + sensitivity: 3 + snap: 1 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: p2yAxis + descriptiveName: + descriptiveNegativeName: + negativeButton: s + positiveButton: w + altNegativeButton: + altPositiveButton: + gravity: 3 + dead: 0.001 sensitivity: 3 snap: 1 invert: 0 @@ -46,7 +110,7 @@ InputManager: altNegativeButton: altPositiveButton: mouse 0 gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0 @@ -62,7 +126,7 @@ InputManager: altNegativeButton: altPositiveButton: mouse 1 gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0 @@ -78,7 +142,7 @@ InputManager: altNegativeButton: altPositiveButton: mouse 2 gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0 @@ -94,7 +158,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0 @@ -111,7 +175,7 @@ InputManager: altPositiveButton: gravity: 0 dead: 0 - sensitivity: .100000001 + sensitivity: 0.1 snap: 0 invert: 0 type: 1 @@ -127,7 +191,7 @@ InputManager: altPositiveButton: gravity: 0 dead: 0 - sensitivity: .100000001 + sensitivity: 0.1 snap: 0 invert: 0 type: 1 @@ -143,7 +207,7 @@ InputManager: altPositiveButton: gravity: 0 dead: 0 - sensitivity: .100000001 + sensitivity: 0.1 snap: 0 invert: 0 type: 1 @@ -158,7 +222,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 0 - dead: .189999998 + dead: 0.19 sensitivity: 1 snap: 0 invert: 0 @@ -174,7 +238,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 0 - dead: .189999998 + dead: 0.19 sensitivity: 1 snap: 0 invert: 1 @@ -190,7 +254,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0 @@ -206,7 +270,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0 @@ -222,7 +286,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0 @@ -238,7 +302,7 @@ InputManager: altNegativeButton: altPositiveButton: gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0 @@ -254,7 +318,7 @@ InputManager: altNegativeButton: altPositiveButton: joystick button 0 gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0 @@ -270,7 +334,7 @@ InputManager: altNegativeButton: altPositiveButton: space gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0 @@ -286,7 +350,7 @@ InputManager: altNegativeButton: altPositiveButton: joystick button 1 gravity: 1000 - dead: .00100000005 + dead: 0.001 sensitivity: 1000 snap: 0 invert: 0