izzy/Darklings-FightingGame
0
0
Fork 0
mirror of https://github.com/izzy2lost/Darklings-FightingGame.git synced 2026-03-10 11:35:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

General ui update

Browse Source
This commit is contained in:
David Kalatzis
2023-09-22 16:54:55 +03:00
parent bdc272b3a9
commit 028bbb2c78
41 changed files with 6257 additions and 4439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/_Project/Inputs/DemonInput.cs
+41
View File
@@ -907,6 +907,15 @@ public partial class @DemonInput: IInputActionCollection2, IDisposable
""processors"": """",
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""Hotbar"",
""type"": ""Button"",
""id"": ""affa4d6e-17ef-42aa-8854-5f9ae9921146"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """",
""initialStateCheck"": false
}
],
""bindings"": [
@@ -1415,6 +1424,28 @@ public partial class @DemonInput: IInputActionCollection2, IDisposable
""action"": ""Options"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""8bc351b5-02e2-4897-adac-96a3fd771f2c"",
""path"": ""<Keyboard>/space"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard"",
""action"": ""Hotbar"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""77d75695-d0c7-4a9f-aed8-1bfbdd7ac3a9"",
""path"": ""<Gamepad>/select"",
""interactions"": """",
""processors"": """",
""groups"": ""Xbox"",
""action"": ""Hotbar"",
""isComposite"": false,
""isPartOfComposite"": false
}
]
},
@@ -1576,6 +1607,7 @@ public partial class @DemonInput: IInputActionCollection2, IDisposable
m_UI_Point = m_UI.FindAction("Point", throwIfNotFound: true);
m_UI_Click = m_UI.FindAction("Click", throwIfNotFound: true);
m_UI_Options = m_UI.FindAction("Options", throwIfNotFound: true);
m_UI_Hotbar = m_UI.FindAction("Hotbar", throwIfNotFound: true);
// Training
m_Training = asset.FindActionMap("Training", throwIfNotFound: true);
m_Training_Reset = m_Training.FindAction("Reset", throwIfNotFound: true);
@@ -1808,6 +1840,7 @@ public partial class @DemonInput: IInputActionCollection2, IDisposable
private readonly InputAction m_UI_Point;
private readonly InputAction m_UI_Click;
private readonly InputAction m_UI_Options;
private readonly InputAction m_UI_Hotbar;
public struct UIActions
{
private @DemonInput m_Wrapper;
@@ -1829,6 +1862,7 @@ public partial class @DemonInput: IInputActionCollection2, IDisposable
public InputAction @Point => m_Wrapper.m_UI_Point;
public InputAction @Click => m_Wrapper.m_UI_Click;
public InputAction @Options => m_Wrapper.m_UI_Options;
public InputAction @Hotbar => m_Wrapper.m_UI_Hotbar;
public InputActionMap Get() { return m_Wrapper.m_UI; }
public void Enable() { Get().Enable(); }
public void Disable() { Get().Disable(); }
@@ -1889,6 +1923,9 @@ public partial class @DemonInput: IInputActionCollection2, IDisposable
@Options.started += instance.OnOptions;
@Options.performed += instance.OnOptions;
@Options.canceled += instance.OnOptions;
@Hotbar.started += instance.OnHotbar;
@Hotbar.performed += instance.OnHotbar;
@Hotbar.canceled += instance.OnHotbar;
}
private void UnregisterCallbacks(IUIActions instance)
@@ -1944,6 +1981,9 @@ public partial class @DemonInput: IInputActionCollection2, IDisposable
@Options.started -= instance.OnOptions;
@Options.performed -= instance.OnOptions;
@Options.canceled -= instance.OnOptions;
@Hotbar.started -= instance.OnHotbar;
@Hotbar.performed -= instance.OnHotbar;
@Hotbar.canceled -= instance.OnHotbar;
}
public void RemoveCallbacks(IUIActions instance)
@@ -2078,6 +2118,7 @@ public partial class @DemonInput: IInputActionCollection2, IDisposable
void OnPoint(InputAction.CallbackContext context);
void OnClick(InputAction.CallbackContext context);
void OnOptions(InputAction.CallbackContext context);
void OnHotbar(InputAction.CallbackContext context);
}
public interface ITrainingActions
{
Assets/_Project/Inputs/DemonInput.inputactions
+31
View File
@@ -885,6 +885,15 @@
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Hotbar",
"type": "Button",
"id": "affa4d6e-17ef-42aa-8854-5f9ae9921146",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
@@ -1393,6 +1402,28 @@
"action": "Options",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "8bc351b5-02e2-4897-adac-96a3fd771f2c",
"path": "<Keyboard>/space",
"interactions": "",
"processors": "",
"groups": "Keyboard",
"action": "Hotbar",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "77d75695-d0c7-4a9f-aed8-1bfbdd7ac3a9",
"path": "<Gamepad>/select",
"interactions": "",
"processors": "",
"groups": "Xbox",
"action": "Hotbar",
"isComposite": false,
"isPartOfComposite": false
}
]
},