Leahnaya/TheKingsRace
1
0
Fork 0
mirror of https://github.com/Leahnaya/TheKingsRace.git synced 2026-08-22 02:14:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/Lautha1/TheKingsRace

Browse Source 
Merging in Audio?
This commit is contained in:
Vladdie
2022-04-27 20:04:26 -05:00
parent 94104e2d6d 64ca96553f
commit d7747c64fb
14 changed files with 88628 additions and 6410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Assets/Scripts/UI/Controls/ControlsMenuScript.cs
View File

@@ -32,12 +32,6 @@ public class ControlsMenuScript : MonoBehaviour
keyboardKingControlsMenu.SetActive(false);
gamePadKingControlsMenu.SetActive(true);
}
//if off, turn it on
if(gamePadKingControlsMenu.activeInHierarchy == false)
{
keyboardKingControlsMenu.SetActive(false);
gamePadKingControlsMenu.SetActive(true);
}
}
else{
//if off, turn it on
@@ -46,12 +40,6 @@ public class ControlsMenuScript : MonoBehaviour
keyboardRunnerControlsMenu.SetActive(false);
gamePadRunnerControlsMenu.SetActive(true);
}
//if off, turn it on
if(gamePadRunnerControlsMenu.activeInHierarchy == false)
{
keyboardRunnerControlsMenu.SetActive(false);
gamePadRunnerControlsMenu.SetActive(true);
}
}
}
@@ -59,14 +47,8 @@ public class ControlsMenuScript : MonoBehaviour
if (Input.GetAxis("Mouse X") != 0 || Input.GetAxis("Mouse Y") != 0)
{
if(isKing){
//if off, turn it on
if(gamePadKingControlsMenu.activeInHierarchy == false)
{
keyboardKingControlsMenu.SetActive(true);
gamePadKingControlsMenu.SetActive(false);
}
//if off, turn it on
if(gamePadKingControlsMenu.activeInHierarchy == false)
if(keyboardKingControlsMenu.activeInHierarchy == false)
{
keyboardKingControlsMenu.SetActive(true);
gamePadKingControlsMenu.SetActive(false);
@@ -74,17 +56,11 @@ public class ControlsMenuScript : MonoBehaviour
}
else{
//if off, turn it on
if(gamePadRunnerControlsMenu.activeInHierarchy == false)
if(keyboardRunnerControlsMenu.activeInHierarchy == false)
{
keyboardRunnerControlsMenu.SetActive(true);
gamePadRunnerControlsMenu.SetActive(false);
}
//if off, turn it on
if(gamePadRunnerControlsMenu.activeInHierarchy == false)
{
keyboardRunnerControlsMenu.SetActive(true);
gamePadRunnerControlsMenu.SetActive(false);
}
}
}
}