namespacing and multiplayer lobby

This commit is contained in:
2023-06-01 14:25:46 -04:00
parent 1d4a6319e9
commit 3e1b55b036
37 changed files with 2962 additions and 785 deletions

View File

@ -4,6 +4,8 @@ using UnityEngine;
using UnityEngine.Rendering;
using UnityEngine.SceneManagement;
namespace Game
{
public class InGameManager : MonoBehaviour
{
[SerializeField] private Volume gameVolume;
@ -128,4 +130,5 @@ public class InGameManager : MonoBehaviour
{
SceneManager.LoadScene(0);
}
}
}

View File

@ -1,52 +1,55 @@
using UnityEngine;
using UnityEngine.UI;
public class InGameMenuManager : MonoBehaviour
namespace Game
{
[SerializeField] private Button settingsButton;
[SerializeField] private Button returnToMenuButton;
[SerializeField] private Scrollbar sensitivitySlider;
[SerializeField] private Scrollbar volumeSlider;
private InGameManager gameManager;
private Animator menuAnimator;
private PlayerComponent player;
// Start is called before the first frame update
private void Start()
public class InGameMenuManager : MonoBehaviour
{
menuAnimator = GetComponent<Animator>();
settingsButton.onClick.AddListener(SettingsClicked);
returnToMenuButton.onClick.AddListener(SettingsUnClicked);
player = FindObjectOfType(typeof(PlayerComponent)) as PlayerComponent;
gameManager = FindObjectOfType<InGameManager>();
}
[SerializeField] private Button settingsButton;
// Update is called once per frame
private void Update()
{
}
[SerializeField] private Button returnToMenuButton;
private void SettingsClicked()
{
menuAnimator.SetBool("SettingsOpen", true);
}
[SerializeField] private Scrollbar sensitivitySlider;
private void SettingsUnClicked()
{
menuAnimator.SetBool("SettingsOpen", false);
}
[SerializeField] private Scrollbar volumeSlider;
public void UpdateSensitivity()
{
player.SetSensitivity(sensitivitySlider.value * 4f);
}
private InGameManager gameManager;
private Animator menuAnimator;
private Player.PlayerComponent player;
public void UpdateVolume()
{
gameManager.SetVolume(volumeSlider.value * 2);
// Start is called before the first frame update
private void Start()
{
menuAnimator = GetComponent<Animator>();
settingsButton.onClick.AddListener(SettingsClicked);
returnToMenuButton.onClick.AddListener(SettingsUnClicked);
player = FindObjectOfType(typeof(Player.PlayerComponent)) as Player.PlayerComponent;
gameManager = FindObjectOfType<InGameManager>();
}
// Update is called once per frame
private void Update()
{
}
private void SettingsClicked()
{
menuAnimator.SetBool("SettingsOpen", true);
}
private void SettingsUnClicked()
{
menuAnimator.SetBool("SettingsOpen", false);
}
public void UpdateSensitivity()
{
player.SetSensitivity(sensitivitySlider.value * 4f);
}
public void UpdateVolume()
{
gameManager.SetVolume(volumeSlider.value * 2);
}
}
}

View File

@ -1,5 +1,6 @@
using UnityEngine;
namespace Game {
/// <summary>
/// Attach this behavior to a master room collider. Enables everything in this room OnTriggerEnter of [tag]
/// disables everything in this room OnTriggerExit of [tag]
@ -36,4 +37,5 @@ public class Optimizer : MonoBehaviour
{
foreach (var go in references) go.SetActive(false);
}
}
}