Skip to content
Snippets Groups Projects
Commit 54b691ee authored by Averrous Saloom's avatar Averrous Saloom
Browse files

Merge branch 'averrous/feat/setting' into 'master'

feat: setting

See merge request !16
parents 87696158 d64f88bc
1 merge request!16feat: setting
This diff is collapsed.
...@@ -11,6 +11,7 @@ public class GlobalManager : MonoBehaviour ...@@ -11,6 +11,7 @@ public class GlobalManager : MonoBehaviour
private string defaultName = "PLAYER"; private string defaultName = "PLAYER";
private string playerName; private string playerName;
private double totalTime; private double totalTime;
private int volume = 60;
public string PlayerName public string PlayerName
{ {
get get
...@@ -31,6 +32,14 @@ public class GlobalManager : MonoBehaviour ...@@ -31,6 +32,14 @@ public class GlobalManager : MonoBehaviour
totalTime = value; totalTime = value;
} }
} }
public int Volume
{
get => volume;
set
{
volume = value;
}
}
private MetaStateSave metaStateSave; private MetaStateSave metaStateSave;
public MetaStateSave MetaStateSave public MetaStateSave MetaStateSave
......
...@@ -6,11 +6,14 @@ using UnityEngine.SceneManagement; ...@@ -6,11 +6,14 @@ using UnityEngine.SceneManagement;
public class MainMenuManager : MonoBehaviour public class MainMenuManager : MonoBehaviour
{ {
private LoadDialogHandler loadDialogHandler; private LoadDialogHandler loadDialogHandler;
private SettingManager settingPanel;
private void Awake() private void Awake()
{ {
this.loadDialogHandler = FindObjectOfType<LoadDialogHandler>(); this.loadDialogHandler = FindObjectOfType<LoadDialogHandler>();
this.loadDialogHandler.gameObject.SetActive(false); this.loadDialogHandler.gameObject.SetActive(false);
this.settingPanel = FindObjectOfType<SettingManager>();
this.settingPanel.gameObject.SetActive(false);
} }
public void OnClickNewGame() public void OnClickNewGame()
...@@ -20,15 +23,12 @@ public class MainMenuManager : MonoBehaviour ...@@ -20,15 +23,12 @@ public class MainMenuManager : MonoBehaviour
public void OnClickLoadGame() public void OnClickLoadGame()
{ {
/* GlobalManager.Instance.IdxSaveSlot = 2;
GlobalManager.Instance.IsFirstLoad = true;
SceneManager.LoadScene("Quest");*/
this.loadDialogHandler.gameObject.SetActive(true); this.loadDialogHandler.gameObject.SetActive(true);
} }
public void OnClickSettings() public void OnClickSettings()
{ {
this.settingPanel.gameObject.SetActive(true);
} }
private void Update() private void Update()
......
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
public class SettingManager : MonoBehaviour
{
[SerializeField]
private TMP_InputField nameInput;
[SerializeField]
private GameObject volumeInput;
// Start is called before the first frame update
void Start()
{
nameInput.text = getGlobalName();
(volumeInput.GetComponent<Slider>()).value = GlobalManager.Instance.Volume;
}
// Update is called once per frame
void Update()
{
GlobalManager.Instance.PlayerName = nameInput.text;
GlobalManager.Instance.Volume = (int) (volumeInput.GetComponent<Slider>()).value;
Debug.Log("PLAYER NAME: " + GlobalManager.Instance.PlayerName);
Debug.Log("VOLUME: " + GlobalManager.Instance.Volume);
if (Input.GetKeyDown(KeyCode.Escape))
{
Debug.Log("CLOSINGGGGGGGGG");
Close();
}
}
string getGlobalName()
{
var name = GlobalManager.Instance.PlayerName;
if (name == null) return "";
return name;
}
public void Show()
{
gameObject.SetActive(true);
}
public void Close()
{
gameObject.SetActive(false);
}
}
fileFormatVersion: 2
guid: 78458297694b1bb4b8641f9fb28d0fb7
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment