Skip to content

Commit 5d40eb4

Browse files
committed
Made a setting to enable/disable UI actions during gameplay. It defaults to true but is currently set to false for the sample.
1 parent 43829da commit 5d40eb4

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

Assets/Samples/RebindingUI/RebindUIGameManager.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ public class RebindUIGameManager : MonoBehaviour
1616
[Tooltip("The actions asset that holds Gameplay, Common and UI action maps to be used. (Required).")]
1717
public InputActionAsset actions;
1818

19-
//[Tooltip("The input action to be used to toggle menu (Required).")]
20-
//public InputActionReference toggleMenuAction;
19+
[Tooltip("Whether UI actions should be disabled during gameplay.")]
20+
public bool enableUIActionsDuringGameplay = true;
2121

2222
[Tooltip("The gameplay manager responsible for managing gameplay.")]
2323
public GameplayManager gameplayManager;
@@ -29,11 +29,13 @@ public class RebindUIGameManager : MonoBehaviour
2929
private GameState m_NextState = GameState.Playing;
3030

3131
private InputActionMap gameplayActions;
32+
private InputActionMap uiActions;
3233
private InputAction toggleMenuAction;
3334

3435
private void Awake()
3536
{
3637
gameplayActions = actions.FindActionMap("Gameplay");
38+
uiActions = actions.FindActionMap("UI");
3739
toggleMenuAction = actions.FindAction("Common/Menu");
3840
}
3941

@@ -97,6 +99,10 @@ private void Update()
9799
case GameState.Playing:
98100
gameplayActions.Enable();
99101
gameplayManager.enabled = true;
102+
if (enableUIActionsDuringGameplay)
103+
uiActions.Enable();
104+
else
105+
uiActions.Disable();
100106

101107
gameUI.SetActive(true);
102108
menu.SetActive(false);
@@ -107,6 +113,8 @@ private void Update()
107113
case GameState.RebindingMenu:
108114
gameplayActions.Disable();
109115
gameplayManager.enabled = false;
116+
if (!enableUIActionsDuringGameplay)
117+
uiActions.Enable();
110118

111119
gameUI.SetActive(false);
112120
menu.SetActive(true);

Assets/Samples/RebindingUI/RebindingUISampleScene.unity

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,7 @@ MonoBehaviour:
441441
m_EditorClassIdentifier:
442442
menu: {fileID: 508436405}
443443
actions: {fileID: -944628639613478452, guid: 7dead05c54ca85b4681351aafd8bd03a, type: 3}
444+
enableUIActionsDuringGameplay: 0
444445
gameplayManager: {fileID: 51853247}
445446
gameUI: {fileID: 5139312}
446447
--- !u!114 &51853246

0 commit comments

Comments
 (0)