UI修改及拼接

xiaofang/Assets/Prefabs/PanelPrefabs.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1f4657dbc7c28184e85924b17ca03cd6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Prefabs/PanelPrefabs/DatePanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 26d5710936f5f7d468eb5eb9da96112e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Prefabs/PanelPrefabs/DistributionPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f7e3ba3643cbe834083789575336030d
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Prefabs/PanelPrefabs/EvacuationPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e6f6debb1a995f84dbbd4311e5162317
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Prefabs/PanelPrefabs/LoginPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b12b9c2976224d64bbd9fab913c03a63
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Prefabs/PanelPrefabs/MaterialPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 167a8e8951bec7e40a329d40d3e20b04
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Prefabs/PanelPrefabs/Panel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 53dc1a298c6cce341bb2416bd0c194f1
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Prefabs/PanelPrefabs/PersonnelPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4f3b9bb4983d57e42823b44b92e40a4b
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Prefabs/PanelPrefabs/schedule_4_panel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 816e2aea60d232a46bccd30a7722407e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Script/Scheduled_03/Panel.cs

@@ -15,16 +15,19 @@ public class Panel : MonoBehaviour
     public Button peoplePublishBtn;
     public Button materialReserveBtn;
     public Button dateSelectionBtn;
+    public Button personnelmanagementBtn;
 
 
     public Button setName;//设置人员
     public Button setDuty;//设置职责
     public Button setScene;//设置场景
 
+    public Text arrangeText;//整体安排
+
     public string name, duty, scene;
 
     public Button sureBtn;//确认信息按钮
-
+    public GameObject ManagerPanel;
 
     public GraphicRaycaster raycaster; // 画布上的射线投射器
     public EventSystem eventSystem;    // 事件系统
@@ -38,6 +41,7 @@ public class Panel : MonoBehaviour
     void Update()
     {
         GetData();
+        SetText();
     }
 
     public void SetName()
@@ -83,14 +87,18 @@ public class Panel : MonoBehaviour
     //处理点击选择演练日期按钮
     public void ClickDateSelectionBtn()
     {
-
+        
     }
 
 
 
 
-
-
+    //处理人员管理按钮
+    public void ClickPersonnelManagement()
+    {
+        Debug.Log("调用人员管理");
+        ManagerPanel.gameObject.SetActive(true);
+    }
 
     //处理点击确认按钮
     public void ClickSureBtn()
@@ -103,6 +111,8 @@ public class Panel : MonoBehaviour
 
     public void GetData()
     {
+        ManagerPanel managerPanel = new ManagerPanel();
+        
         // 当鼠标左键按下时进行检测
         if (Input.GetMouseButtonDown(0))
         {
@@ -134,16 +144,22 @@ public class Panel : MonoBehaviour
                     Text buttonText = clickedButton.GetComponentInChildren<Text>();
                     if (buttonText != null && buttonText.tag == Tags.people)
                     {
+
                         name = buttonText.text;
                         Debug.Log(name);
                     }
                     else if (buttonText != null && buttonText.tag == Tags.scene)
                     {
+                        //PlateInfo plateInfo = new PlateInfo();
                         scene = buttonText.text;
+                        //managerPanel.platesList.Add(plateInfo);
+                        //plateInfo.plateinfoText = plateInfo.transform.GetComponent<Text>();
+                        //plateInfo.plateinfoText.text = scene;
                         Debug.Log(scene);
                     }
                     else if (buttonText != null && buttonText.tag == Tags.duty)
                     {
+
                         duty = buttonText.text;
                         Debug.Log(duty);
                     }
@@ -151,7 +167,11 @@ public class Panel : MonoBehaviour
             }
         }
     }
-
+    //设置安排文字
+    public void SetText()
+    {
+        arrangeText.text = "[" + name + "]担任[" + duty + "],位于[" + scene + "]";
+    }
 
 
     

xiaofang/Assets/Script/UI/PanelUI.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8fefa911164b3504f84a5e8331d97498
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Script/UI/PanelUI/InfoLable.cs

@@ -0,0 +1,20 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class InfoLable : MonoBehaviour
+{
+    public Text nameText;
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

xiaofang/Assets/Script/UI/PanelUI/InfoLable.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 703e5b15a5c1676498419d310d694fe0
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Script/UI/PanelUI/ManagerPanel.cs

@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+//板块信息
+public class ManagerPanel : MonoBehaviour
+{
+    public List<PlateInfo> platesList = new List<PlateInfo>();
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+    //更新板块人员信息
+    void SetPlate()
+    {
+        
+    }
+}

xiaofang/Assets/Script/UI/PanelUI/ManagerPanel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: bf46134b79a6f364eb7461349a15ee8a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Script/UI/PanelUI/PlateInfo.cs

@@ -0,0 +1,22 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+//ÈËÔ±ÐÅÏ¢
+public class PlateInfo : MonoBehaviour
+{
+    public Text plateinfoText;
+    public List<InfoLable> infoLables = new List<InfoLable>();
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

xiaofang/Assets/Script/UI/PanelUI/PlateInfo.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e182cb4043a555540ab9b79ff044cbb7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs

@@ -66,7 +66,6 @@ public class SelectScenePanel : MonoBehaviour
         {
             if (item.gameObject.transform.GetComponent<Toggle>().isOn)
             {
-                Debug.Log(item.eventId);
                 this.eventId = item.eventId;
                 this.eventName = item.eventName;
             }