diff --git a/Assets/Data/1/File/NodeList.xml b/Assets/Data/1/File/NodeList.xml index 7f7770c..fb111b5 100644 --- a/Assets/Data/1/File/NodeList.xml +++ b/Assets/Data/1/File/NodeList.xml @@ -1,11 +1,15 @@  - 0 - + 1 + + + - 0 - + 1 + + + \ No newline at end of file diff --git a/Assets/ReplayUIManager.cs b/Assets/ReplayUIManager.cs index d4ad636..cf7d1db 100644 --- a/Assets/ReplayUIManager.cs +++ b/Assets/ReplayUIManager.cs @@ -6,16 +6,16 @@ using UnityEngine; public class ReplayUIManager : MonoBehaviour { - private GameObject rolePanel; - private GameObject roleSelectPanel; + //private GameObject rolePanel; + // private GameObject roleSelectPanel; private GameObject bottomCenterUI; - private GameObject editorRight; + // private GameObject editorRight; private void Start() { - rolePanel = transform.Find("RolePanel").gameObject; - roleSelectPanel = transform.Find("RoleSelectPanel").gameObject; + //rolePanel = transform.Find("RolePanel").gameObject; + //roleSelectPanel = transform.Find("RoleSelectPanel").gameObject; bottomCenterUI = transform.Find("BottomCenterUI").gameObject; - editorRight = transform.Find("TopUI/EditorRight").gameObject; + //editorRight = transform.Find("TopUI/EditorRight").gameObject; SetUI(); } // Use this for initialization @@ -27,16 +27,16 @@ public class ReplayUIManager : MonoBehaviour { if (DisasterManager.model == PlayModel.view) { - rolePanel.SetActive(false);//单机版注释 - roleSelectPanel.SetActive(false);//单机版注释 - editorRight.SetActive(false);//单机版注释 + //rolePanel.SetActive(false);//单机版注释 + //roleSelectPanel.SetActive(false);//单机版注释 + //editorRight.SetActive(false);//单机版注释 } else if (DisasterManager.model == PlayModel.editor) { - rolePanel.SetActive(true);//单机版注释 - roleSelectPanel.SetActive(true);//单机版注释 - editorRight.SetActive(true);//单机版注释 + //rolePanel.SetActive(true);//单机版注释 + //roleSelectPanel.SetActive(true);//单机版注释 + //editorRight.SetActive(true);//单机版注释 MultiSelectNAV.GetInstance.gameObject.SetActive(true); } /* diff --git a/Assets/Scene/MainScene_New.unity b/Assets/Scene/MainScene_New.unity index 830b55d..d2a7d36 100644 Binary files a/Assets/Scene/MainScene_New.unity and b/Assets/Scene/MainScene_New.unity differ diff --git a/Assets/Scripts/DisasterList/AddDisaster.cs b/Assets/Scripts/DisasterList/AddDisaster.cs index f10e3ab..52b43dc 100644 --- a/Assets/Scripts/DisasterList/AddDisaster.cs +++ b/Assets/Scripts/DisasterList/AddDisaster.cs @@ -10,27 +10,29 @@ using UnityEngine; using UnityEngine.SceneManagement; using UnityEngine.UI; -public class AddDisaster : MonoBehaviour { - private Button addBtn; +public class AddDisaster : MonoBehaviour +{ + private Button addBtn; // Use this for initialization - void Start () { + void Start() + { addBtn = GetComponent