Make stats menu into a popup
This commit is contained in:
5 files changed
+3654
-4050
No files matched your search
File diff suppressed because it is too large.
Load diff
@@ -1,6 +1,6 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 7fc772dfc5233442ebeceac3db878727
|
guid: 33b706f9dca9d4d36be1cd5740f53b03
|
||||||
DefaultImporter:
|
PrefabImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName:
|
||||||
@@ -2171,7 +2171,6 @@ GameObject:
|
|||||||
- component: {fileID: 462957725}
|
- component: {fileID: 462957725}
|
||||||
- component: {fileID: 462957727}
|
- component: {fileID: 462957727}
|
||||||
- component: {fileID: 462957726}
|
- component: {fileID: 462957726}
|
||||||
- component: {fileID: 462957728}
|
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: StatsButton
|
m_Name: StatsButton
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -2252,19 +2251,6 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 462957724}
|
m_GameObject: {fileID: 462957724}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
--- !u!114 &462957728
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 462957724}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 1a45465fc8803364d968dc6bec70fca8, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier: Assembly-CSharp::ButtonToScene
|
|
||||||
sceneName: StatsMenu
|
|
||||||
--- !u!1 &519420028
|
--- !u!1 &519420028
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -2471,6 +2457,7 @@ MonoBehaviour:
|
|||||||
profilePrefab: {fileID: 3162524169402907368, guid: ed502784d1f0b48ee8e614eb6d09f2fb, type: 3}
|
profilePrefab: {fileID: 3162524169402907368, guid: ed502784d1f0b48ee8e614eb6d09f2fb, type: 3}
|
||||||
accountsPrefab: {fileID: 690144046416174326, guid: 8980083d89fb7477b8d55aa9233f15b7, type: 3}
|
accountsPrefab: {fileID: 690144046416174326, guid: 8980083d89fb7477b8d55aa9233f15b7, type: 3}
|
||||||
settingsPrefab: {fileID: 2128217568192272405, guid: 0d66068f9c9ce46b88b019a3aa64793f, type: 3}
|
settingsPrefab: {fileID: 2128217568192272405, guid: 0d66068f9c9ce46b88b019a3aa64793f, type: 3}
|
||||||
|
statsPrefab: {fileID: 922734498401451496, guid: 33b706f9dca9d4d36be1cd5740f53b03, type: 3}
|
||||||
copyrightText: {fileID: 319334213}
|
copyrightText: {fileID: 319334213}
|
||||||
closePopup: {fileID: 60514371}
|
closePopup: {fileID: 60514371}
|
||||||
closePopupCancelButton: {fileID: 1983964294}
|
closePopupCancelButton: {fileID: 1983964294}
|
||||||
@@ -2479,6 +2466,7 @@ MonoBehaviour:
|
|||||||
iconMarketplaceButtonText: {fileID: 2073047665}
|
iconMarketplaceButtonText: {fileID: 2073047665}
|
||||||
accountsButton: {fileID: 1582935349}
|
accountsButton: {fileID: 1582935349}
|
||||||
settingsButton: {fileID: 1570123698}
|
settingsButton: {fileID: 1570123698}
|
||||||
|
statsButton: {fileID: 462957726}
|
||||||
--- !u!1 &600923169
|
--- !u!1 &600923169
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ public class MainMenu : MonoBehaviour {
|
|||||||
[SerializeField] private ProfileMenu profilePrefab;
|
[SerializeField] private ProfileMenu profilePrefab;
|
||||||
[SerializeField] private AccountHandler accountsPrefab;
|
[SerializeField] private AccountHandler accountsPrefab;
|
||||||
[SerializeField] private SettingsMenu settingsPrefab;
|
[SerializeField] private SettingsMenu settingsPrefab;
|
||||||
|
[SerializeField] private StatsMenu statsPrefab;
|
||||||
[SerializeField] private TMP_Text copyrightText;
|
[SerializeField] private TMP_Text copyrightText;
|
||||||
[SerializeField] private GameObject closePopup;
|
[SerializeField] private GameObject closePopup;
|
||||||
[SerializeField] private Button closePopupCancelButton;
|
[SerializeField] private Button closePopupCancelButton;
|
||||||
@@ -22,6 +23,7 @@ public class MainMenu : MonoBehaviour {
|
|||||||
[SerializeField] private TMP_Text iconMarketplaceButtonText;
|
[SerializeField] private TMP_Text iconMarketplaceButtonText;
|
||||||
[SerializeField] private Button accountsButton;
|
[SerializeField] private Button accountsButton;
|
||||||
[SerializeField] private Button settingsButton;
|
[SerializeField] private Button settingsButton;
|
||||||
|
[SerializeField] private Button statsButton;
|
||||||
|
|
||||||
void Awake() {
|
void Awake() {
|
||||||
if (PresistentData.latestVersion != null) {
|
if (PresistentData.latestVersion != null) {
|
||||||
@@ -75,6 +77,11 @@ public class MainMenu : MonoBehaviour {
|
|||||||
clone.name = "Prefab";
|
clone.name = "Prefab";
|
||||||
clone.SetActive(true);
|
clone.SetActive(true);
|
||||||
});
|
});
|
||||||
|
statsButton.onClick.AddListener(() => {
|
||||||
|
var clone = Instantiate(statsPrefab.gameObject, statsPrefab.gameObject.transform.parent);
|
||||||
|
clone.name = "Prefab";
|
||||||
|
clone.SetActive(true);
|
||||||
|
});
|
||||||
|
|
||||||
if (Tools.GetLevelInfo().level < 3) {
|
if (Tools.GetLevelInfo().level < 3) {
|
||||||
iconMarketplaceButton.interactable = false;
|
iconMarketplaceButton.interactable = false;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ using UnityEngine.UI;
|
|||||||
public class SettingsMenu : MonoBehaviour {
|
public class SettingsMenu : MonoBehaviour {
|
||||||
[SerializeField] private GameObject settingsMenu;
|
[SerializeField] private GameObject settingsMenu;
|
||||||
[SerializeField] private ColorPanel colorMenu;
|
[SerializeField] private ColorPanel colorMenu;
|
||||||
[SerializeField] private Button backButton;
|
[SerializeField] private Button exitButton;
|
||||||
[SerializeField] private Button toggleButton;
|
[SerializeField] private Button toggleButton;
|
||||||
|
|
||||||
[SerializeField] private Toggle setting1toggle;
|
[SerializeField] private Toggle setting1toggle;
|
||||||
@@ -36,7 +36,7 @@ public class SettingsMenu : MonoBehaviour {
|
|||||||
|
|
||||||
foreach (CustomColorObject customColorObject in FindObjectsByType<CustomColorObject>(FindObjectsSortMode.None)) customColorObject.SetColor();
|
foreach (CustomColorObject customColorObject in FindObjectsByType<CustomColorObject>(FindObjectsSortMode.None)) customColorObject.SetColor();
|
||||||
};
|
};
|
||||||
backButton.onClick.AddListener(() => Destroy(gameObject));
|
exitButton.onClick.AddListener(() => Destroy(gameObject));
|
||||||
toggleButton.onClick.AddListener(() => {
|
toggleButton.onClick.AddListener(() => {
|
||||||
settingsMenu.SetActive(!settingsMenu.activeSelf);
|
settingsMenu.SetActive(!settingsMenu.activeSelf);
|
||||||
colorMenu.gameObject.SetActive(!colorMenu.gameObject.activeSelf);
|
colorMenu.gameObject.SetActive(!colorMenu.gameObject.activeSelf);
|
||||||
@@ -125,9 +125,6 @@ public class SettingsMenu : MonoBehaviour {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Update() {
|
void Update() {
|
||||||
if (Keyboard.current.escapeKey.wasPressedThisFrame) {
|
if (Keyboard.current.escapeKey.wasPressedThisFrame && exitButton.interactable) exitButton.onClick.Invoke();
|
||||||
if (colorMenu.gameObject.activeSelf) toggleButton.onClick.Invoke();
|
|
||||||
else backButton.onClick.Invoke();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user