Commit 2e7f732

committed

Redone Controller Connections

redid controller diconnection script to make it fit with the multiplayer controller diconnection scrupts also detatched from the pause menu to make look better

1 parent 36cb30f commit 2e7f732Copy full SHA for 2e7f732

File tree

2 files changed

+433

-37

lines changed

Native/Assets
- Menus
  - inGameManager.cs
- Scenes
  - Level 1_1.unity

2 files changed

+433

-37

lines changed

`‎Native/Assets/Menus/inGameManager.cs`

Lines changed: 14 additions & 29 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,40 +18,14 @@ public class inGameManager : MonoBehaviour`
`18`	`18`	`[Header("Scripts")]`
`19`	`19`	`public PauseMenu pauseMenu;`
`20`	`20`
`21`		`- [Header("Device Connections")]`
`22`		`- public InputDevice activeDevice = null;`
`23`		`- public GameObject controllerDisconnectedWarning;`
	`21`	`+ [Header("Controller Disconnected")]`
	`22`	`+ public GameObject controllerDisconnectedUI;`
`24`	`23`
`25`	`24`	`public bool canPause;`
`26`	`25`
`27`	`26`	`public void OnEnable()`
`28`	`27`	`{`
`29`		`- //activeDevice = null;`
`30`		`- activeDevice = Gamepad.current;`
`31`	`28`	`canPause = true;`
`32`		`- //print(activeDevice);`
`33`		`- InputSystem.onDeviceChange += (device, change) =>`
`34`		`- {`
`35`		`- switch (change)`
`36`		`- {`
`37`		`- case InputDeviceChange.Added:`
`38`		`- //Debug.Log("New device added: " + device);`
`39`		`- activeDevice = device;`
`40`		`- break;`
`41`		`-`
`42`		`- case InputDeviceChange.Removed:`
`43`		`- //Debug.Log("Device removed: " + device);`
`44`		`- if (device == activeDevice)`
`45`		`- {`
`46`		`- if (canPause)`
`47`		`- {`
`48`		`- controllerDisconnectedWarning.SetActive(true);`
`49`		`- openPauseMenu();`
`50`		`- }`
`51`		`- }`
`52`		`- break;`
`53`		`- }`
`54`		`- };`
`55`	`29`	`}`
`56`	`30`
`57`	`31`
`@@ -66,6 +40,18 @@ public void Update()`
`66`	`40`	`}`
`67`	`41`	`}`
`68`	`42`	`}`
	`43`	`+ public void controllerConnected()`
	`44`	`+ {`
	`45`	`+ Time.timeScale = 1f;`
	`46`	`+ canPause = true;`
	`47`	`+ controllerDisconnectedUI.SetActive(false);`
	`48`	`+ }`
	`49`	`+ public void controllerDisconnected()`
	`50`	`+ {`
	`51`	`+ Time.timeScale = 0f;`
	`52`	`+ canPause = false;`
	`53`	`+ controllerDisconnectedUI.SetActive(true);`
	`54`	`+ }`
`69`	`55`
`70`	`56`	`public void openPauseMenu()`
`71`	`57`	`{`
`@@ -76,7 +62,6 @@ public void openPauseMenu()`
`76`	`62`
`77`	`63`	`public void closePauseMenu()`
`78`	`64`	`{`
`79`		`- controllerDisconnectedWarning.SetActive(false);`
`80`	`65`	`scoreUI.SetActive(true);`
`81`	`66`	`pauseUI.SetActive(false);`
`82`	`67`	`pauseMenu.enabled = false;`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 2e7f732

File tree

2 files changed

2 files changed

`‎Native/Assets/Menus/inGameManager.cs`

0 commit comments