Merge branch 'modify-ui' into dev
# Conflicts: # Assets/Scripts/UI/Prefab/Panel/HomeController.cs # Assets/Scripts/Utils/Utils.cs
This commit is contained in:
commit
038720e7bd
84 files changed
+9215
-7132
No files matched your search
@@ -1,24 +1,41 @@
|
||||
using System.Collections;
|
||||
using Mapbox.Examples;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class MainController : MonoBehaviour
|
||||
{
|
||||
[SerializeField]GameObject root;
|
||||
private void Awake()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
UIManager.Instance.Root = root;
|
||||
UIManager.Instance.MainPanel = this.transform.Find("Panel").GetComponent<PFUIPanel>();
|
||||
UIManager.Instance.ModalsPanel = this.transform.Find("ModalPanel").GetComponent<PFUIPanel>();
|
||||
|
||||
|
||||
//MainMenu.transform.Find("Home").GetComponent<Button>().onClick.AddListener(() =>
|
||||
//{
|
||||
// UIManager.ShowHomePanel();
|
||||
//});
|
||||
|
||||
UIManager.ShowHomePanel();
|
||||
//UIManager.ShowUserInfoPanel();
|
||||
//UIManager.ShowEditUserPanel();
|
||||
if (App.MainSceneParam.ContainsKey("Name"))
|
||||
{
|
||||
if(App.MainSceneParam["Name"] == "MapListPanel")
|
||||
{
|
||||
UIManager.ShowMapListPanel();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
UIManager.ShowHomePanel();
|
||||
//UIManager.ShowUserInfoPanel();
|
||||
//UIManager.ShowEditUserPanel();
|
||||
//UIManager.ShowBigMapPanel();
|
||||
}
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
|
||||
Reference in new issue
Block a user