|
|
|
|
@@ -988,15 +988,6 @@ namespace NBF
|
|
|
|
|
""name"": ""UI"",
|
|
|
|
|
""id"": ""1e134a50-caf1-48ef-a011-2fabe2c0d049"",
|
|
|
|
|
""actions"": [
|
|
|
|
|
{
|
|
|
|
|
""name"": ""Roll"",
|
|
|
|
|
""type"": ""Button"",
|
|
|
|
|
""id"": ""379cc72d-f733-45da-b173-b881ab8ab0ed"",
|
|
|
|
|
""expectedControlType"": """",
|
|
|
|
|
""processors"": """",
|
|
|
|
|
""interactions"": """",
|
|
|
|
|
""initialStateCheck"": false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
""name"": ""Back"",
|
|
|
|
|
""type"": ""Button"",
|
|
|
|
|
@@ -1095,29 +1086,9 @@ namespace NBF
|
|
|
|
|
""processors"": """",
|
|
|
|
|
""interactions"": ""Hold"",
|
|
|
|
|
""initialStateCheck"": false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
""name"": ""New action"",
|
|
|
|
|
""type"": ""Button"",
|
|
|
|
|
""id"": ""a21da899-9653-49b5-8fd8-73934d7f180c"",
|
|
|
|
|
""expectedControlType"": """",
|
|
|
|
|
""processors"": """",
|
|
|
|
|
""interactions"": """",
|
|
|
|
|
""initialStateCheck"": false
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
""bindings"": [
|
|
|
|
|
{
|
|
|
|
|
""name"": """",
|
|
|
|
|
""id"": ""0e66040a-5980-401a-85c3-b2ef2cc13664"",
|
|
|
|
|
""path"": """",
|
|
|
|
|
""interactions"": """",
|
|
|
|
|
""processors"": """",
|
|
|
|
|
""groups"": """",
|
|
|
|
|
""action"": ""Roll"",
|
|
|
|
|
""isComposite"": false,
|
|
|
|
|
""isPartOfComposite"": false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
""name"": """",
|
|
|
|
|
""id"": ""89052787-93ee-47da-ae8f-5bd86adfb2ff"",
|
|
|
|
|
@@ -1447,17 +1418,6 @@ namespace NBF
|
|
|
|
|
""action"": ""Up"",
|
|
|
|
|
""isComposite"": false,
|
|
|
|
|
""isPartOfComposite"": false
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
""name"": """",
|
|
|
|
|
""id"": ""393f1eb9-d10d-4cd1-87e7-ea299f92b2da"",
|
|
|
|
|
""path"": """",
|
|
|
|
|
""interactions"": """",
|
|
|
|
|
""processors"": """",
|
|
|
|
|
""groups"": """",
|
|
|
|
|
""action"": ""New action"",
|
|
|
|
|
""isComposite"": false,
|
|
|
|
|
""isPartOfComposite"": false
|
|
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
@@ -1564,7 +1524,6 @@ namespace NBF
|
|
|
|
|
m_Player_Use2 = m_Player.FindAction("Use2", throwIfNotFound: true);
|
|
|
|
|
// UI
|
|
|
|
|
m_UI = asset.FindActionMap("UI", throwIfNotFound: true);
|
|
|
|
|
m_UI_Roll = m_UI.FindAction("Roll", throwIfNotFound: true);
|
|
|
|
|
m_UI_Back = m_UI.FindAction("Back", throwIfNotFound: true);
|
|
|
|
|
m_UI_Enter = m_UI.FindAction("Enter", throwIfNotFound: true);
|
|
|
|
|
m_UI_Tab = m_UI.FindAction("Tab", throwIfNotFound: true);
|
|
|
|
|
@@ -1576,7 +1535,6 @@ namespace NBF
|
|
|
|
|
m_UI_Left = m_UI.FindAction("Left", throwIfNotFound: true);
|
|
|
|
|
m_UI_Down = m_UI.FindAction("Down", throwIfNotFound: true);
|
|
|
|
|
m_UI_Up = m_UI.FindAction("Up", throwIfNotFound: true);
|
|
|
|
|
m_UI_Newaction = m_UI.FindAction("New action", throwIfNotFound: true);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
~@PlayerInputControl()
|
|
|
|
|
@@ -2128,7 +2086,6 @@ namespace NBF
|
|
|
|
|
// UI
|
|
|
|
|
private readonly InputActionMap m_UI;
|
|
|
|
|
private List<IUIActions> m_UIActionsCallbackInterfaces = new List<IUIActions>();
|
|
|
|
|
private readonly InputAction m_UI_Roll;
|
|
|
|
|
private readonly InputAction m_UI_Back;
|
|
|
|
|
private readonly InputAction m_UI_Enter;
|
|
|
|
|
private readonly InputAction m_UI_Tab;
|
|
|
|
|
@@ -2140,7 +2097,6 @@ namespace NBF
|
|
|
|
|
private readonly InputAction m_UI_Left;
|
|
|
|
|
private readonly InputAction m_UI_Down;
|
|
|
|
|
private readonly InputAction m_UI_Up;
|
|
|
|
|
private readonly InputAction m_UI_Newaction;
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// Provides access to input actions defined in input action map "UI".
|
|
|
|
|
/// </summary>
|
|
|
|
|
@@ -2153,10 +2109,6 @@ namespace NBF
|
|
|
|
|
/// </summary>
|
|
|
|
|
public UIActions(@PlayerInputControl wrapper) { m_Wrapper = wrapper; }
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// Provides access to the underlying input action "UI/Roll".
|
|
|
|
|
/// </summary>
|
|
|
|
|
public InputAction @Roll => m_Wrapper.m_UI_Roll;
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// Provides access to the underlying input action "UI/Back".
|
|
|
|
|
/// </summary>
|
|
|
|
|
public InputAction @Back => m_Wrapper.m_UI_Back;
|
|
|
|
|
@@ -2201,10 +2153,6 @@ namespace NBF
|
|
|
|
|
/// </summary>
|
|
|
|
|
public InputAction @Up => m_Wrapper.m_UI_Up;
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// Provides access to the underlying input action "UI/Newaction".
|
|
|
|
|
/// </summary>
|
|
|
|
|
public InputAction @Newaction => m_Wrapper.m_UI_Newaction;
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// Provides access to the underlying input action map instance.
|
|
|
|
|
/// </summary>
|
|
|
|
|
public InputActionMap Get() { return m_Wrapper.m_UI; }
|
|
|
|
|
@@ -2230,9 +2178,6 @@ namespace NBF
|
|
|
|
|
{
|
|
|
|
|
if (instance == null || m_Wrapper.m_UIActionsCallbackInterfaces.Contains(instance)) return;
|
|
|
|
|
m_Wrapper.m_UIActionsCallbackInterfaces.Add(instance);
|
|
|
|
|
@Roll.started += instance.OnRoll;
|
|
|
|
|
@Roll.performed += instance.OnRoll;
|
|
|
|
|
@Roll.canceled += instance.OnRoll;
|
|
|
|
|
@Back.started += instance.OnBack;
|
|
|
|
|
@Back.performed += instance.OnBack;
|
|
|
|
|
@Back.canceled += instance.OnBack;
|
|
|
|
|
@@ -2266,9 +2211,6 @@ namespace NBF
|
|
|
|
|
@Up.started += instance.OnUp;
|
|
|
|
|
@Up.performed += instance.OnUp;
|
|
|
|
|
@Up.canceled += instance.OnUp;
|
|
|
|
|
@Newaction.started += instance.OnNewaction;
|
|
|
|
|
@Newaction.performed += instance.OnNewaction;
|
|
|
|
|
@Newaction.canceled += instance.OnNewaction;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
@@ -2280,9 +2222,6 @@ namespace NBF
|
|
|
|
|
/// <seealso cref="UIActions" />
|
|
|
|
|
private void UnregisterCallbacks(IUIActions instance)
|
|
|
|
|
{
|
|
|
|
|
@Roll.started -= instance.OnRoll;
|
|
|
|
|
@Roll.performed -= instance.OnRoll;
|
|
|
|
|
@Roll.canceled -= instance.OnRoll;
|
|
|
|
|
@Back.started -= instance.OnBack;
|
|
|
|
|
@Back.performed -= instance.OnBack;
|
|
|
|
|
@Back.canceled -= instance.OnBack;
|
|
|
|
|
@@ -2316,9 +2255,6 @@ namespace NBF
|
|
|
|
|
@Up.started -= instance.OnUp;
|
|
|
|
|
@Up.performed -= instance.OnUp;
|
|
|
|
|
@Up.canceled -= instance.OnUp;
|
|
|
|
|
@Newaction.started -= instance.OnNewaction;
|
|
|
|
|
@Newaction.performed -= instance.OnNewaction;
|
|
|
|
|
@Newaction.canceled -= instance.OnNewaction;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
@@ -2677,13 +2613,6 @@ namespace NBF
|
|
|
|
|
/// <seealso cref="UIActions.RemoveCallbacks(IUIActions)" />
|
|
|
|
|
public interface IUIActions
|
|
|
|
|
{
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// Method invoked when associated input action "Roll" is either <see cref="UnityEngine.InputSystem.InputAction.started" />, <see cref="UnityEngine.InputSystem.InputAction.performed" /> or <see cref="UnityEngine.InputSystem.InputAction.canceled" />.
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <seealso cref="UnityEngine.InputSystem.InputAction.started" />
|
|
|
|
|
/// <seealso cref="UnityEngine.InputSystem.InputAction.performed" />
|
|
|
|
|
/// <seealso cref="UnityEngine.InputSystem.InputAction.canceled" />
|
|
|
|
|
void OnRoll(InputAction.CallbackContext context);
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// Method invoked when associated input action "Back" is either <see cref="UnityEngine.InputSystem.InputAction.started" />, <see cref="UnityEngine.InputSystem.InputAction.performed" /> or <see cref="UnityEngine.InputSystem.InputAction.canceled" />.
|
|
|
|
|
/// </summary>
|
|
|
|
|
@@ -2761,13 +2690,6 @@ namespace NBF
|
|
|
|
|
/// <seealso cref="UnityEngine.InputSystem.InputAction.performed" />
|
|
|
|
|
/// <seealso cref="UnityEngine.InputSystem.InputAction.canceled" />
|
|
|
|
|
void OnUp(InputAction.CallbackContext context);
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// Method invoked when associated input action "New action" is either <see cref="UnityEngine.InputSystem.InputAction.started" />, <see cref="UnityEngine.InputSystem.InputAction.performed" /> or <see cref="UnityEngine.InputSystem.InputAction.canceled" />.
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <seealso cref="UnityEngine.InputSystem.InputAction.started" />
|
|
|
|
|
/// <seealso cref="UnityEngine.InputSystem.InputAction.performed" />
|
|
|
|
|
/// <seealso cref="UnityEngine.InputSystem.InputAction.canceled" />
|
|
|
|
|
void OnNewaction(InputAction.CallbackContext context);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|