From 58077589b7b93f06adf7c38dda9de7798d35b04b Mon Sep 17 00:00:00 2001
From: "DESKTOP-KFV16CV\\cyt" <2268162076@qq.com>
Date: Sat, 26 Sep 2020 15:40:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8C=96=E5=B7=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CommandCenter/PowerTransferController.cs  | 10 ++-
 .../Common/GameSettings/GameSettings.cs       |  3 +
 .../Common/Lobby/GET_LOBBY_ROOMLIST_SYNC.cs   | 11 ++-
 Assets/Scripts/Common/Menu/Menu.cs            | 79 ++++++++++++++++---
 4 files changed, 88 insertions(+), 15 deletions(-)

diff --git a/Assets/Scripts/Common/CommandCenter/PowerTransferController.cs b/Assets/Scripts/Common/CommandCenter/PowerTransferController.cs
index 43749d4..737e354 100644
--- a/Assets/Scripts/Common/CommandCenter/PowerTransferController.cs
+++ b/Assets/Scripts/Common/CommandCenter/PowerTransferController.cs
@@ -279,6 +279,7 @@ public class PowerTransferController : MonoBehaviour
                     }
                 }
             }
+            StartCoroutine(WaitBtnEnable());
         }
 
         if (GameSettings.othersSettings.mode == Mode.Practice)
@@ -372,8 +373,15 @@ public class PowerTransferController : MonoBehaviour
         //发送给房间内各个客服端调派车辆数据，作战部署力量列表用
         NetworkManager.Default.SendAsync("FIREDEPLOY_ENGINES_SYNC",
             new KeyValuePair<string, List<KeyValuePair<FireCarEngine, int>>>(NowSelectUser.Org.DisplayName, powers));
+        StartCoroutine(WaitBtnEnable());
+    }
+    IEnumerator WaitBtnEnable()
+    {
+        SureBtn.GetComponent<Button>().interactable = false;
+        LoadPromptWin.Instance.LoadTextPromptWindow("调派完成", 1f);
+        yield return new WaitForSeconds(1f);
+        SureBtn.GetComponent<Button>().interactable = true;
     }
-
     public void Cancel()
     {
         hintWin.SetActive(false);
diff --git a/Assets/Scripts/Common/GameSettings/GameSettings.cs b/Assets/Scripts/Common/GameSettings/GameSettings.cs
index 4aee9f4..19f91e7 100644
--- a/Assets/Scripts/Common/GameSettings/GameSettings.cs
+++ b/Assets/Scripts/Common/GameSettings/GameSettings.cs
@@ -20,6 +20,9 @@ public static class GameSettings
 
 public class OthersSettings
 {
+    public SceneType SceneType = SceneType.None;
+    public string mapname;
+
     public Mode mode = Mode.None;
 
     public bool startRecord = false;//先默认初始化为true，没做新建节点时好测试记录回放
diff --git a/Assets/Scripts/Common/Lobby/GET_LOBBY_ROOMLIST_SYNC.cs b/Assets/Scripts/Common/Lobby/GET_LOBBY_ROOMLIST_SYNC.cs
index edf6212..cbda418 100644
--- a/Assets/Scripts/Common/Lobby/GET_LOBBY_ROOMLIST_SYNC.cs
+++ b/Assets/Scripts/Common/Lobby/GET_LOBBY_ROOMLIST_SYNC.cs
@@ -50,9 +50,14 @@ public class GET_LOBBY_ROOMLIST_SYNC : NetworkMessageBehaviour
         }
         foreach (Room r in roomList)
         {
-            GameObject room = Instantiate(RoomPrefab, RoomParent);
-            room.GetComponent<RoomManager>().MyRoom = r;
-            room.name = "房间" + r.Id;
+            if (r.Map.name == GameSettings.othersSettings.mapname &&
+                r.Map.sceneType == GameSettings.othersSettings.SceneType)
+            {
+                GameObject room = Instantiate(RoomPrefab, RoomParent);
+                room.GetComponent<RoomManager>().MyRoom = r;
+                room.name = "房间" + r.Id;
+            }
+
         }
     }
 }
diff --git a/Assets/Scripts/Common/Menu/Menu.cs b/Assets/Scripts/Common/Menu/Menu.cs
index be3ee4a..82fdb0b 100644
--- a/Assets/Scripts/Common/Menu/Menu.cs
+++ b/Assets/Scripts/Common/Menu/Menu.cs
@@ -5,19 +5,21 @@ using UnityEngine;
 using UnityEngine.UI;
 using UnityEngine.SceneManagement;
 using AX.NetworkSystem;
+using System.Xml;
 
-public class Menu : MonoBehaviour {
+public class Menu : MonoBehaviour
+{
     public Toggle DrillToggle;
-    public Toggle  ExerciseToggle;
-    public Toggle  VideoToggle;
-    public Toggle  DisaterToggle;
-    public Toggle  SysSettingToggle;
-    public Toggle  HelpToggle;
-    public Button  ExitButton;
-    public GameObject  Hint;
+    public Toggle ExerciseToggle;
+    public Toggle VideoToggle;
+    public Toggle DisaterToggle;
+    public Toggle SysSettingToggle;
+    public Toggle HelpToggle;
+    public Button ExitButton;
+    public GameObject Hint;
     public Text ShowText;
 
-    public Button  SureButton;
+    public Button SureButton;
     public Button CancelButton;
 
     public GameObject SettingPanel;
@@ -30,8 +32,9 @@ public class Menu : MonoBehaviour {
     private Color oritextColor;
 
     public Text promptText;
-   
-    void Start () {
+
+    void Start()
+    {
         DrillToggle.onValueChanged.AddListener(DrillToggleChange);
         ExerciseToggle.onValueChanged.AddListener(ExerciseToggleChange);
         VideoToggle.onValueChanged.AddListener(VideoToggleChage);
@@ -42,6 +45,7 @@ public class Menu : MonoBehaviour {
         SureButton.onClick.AddListener(Sure);
         CancelButton.onClick.AddListener(Cancel);
         oritextColor = DrillToggle.GetComponentInChildren<Text>().color;
+        GetMaps();
     }
 
     private void Cancel()
@@ -166,4 +170,57 @@ public class Menu : MonoBehaviour {
             promptText.text = "登录用户没有灾情管理权限";
         }
     }
+
+    private void GetMaps()
+    {
+        var doc = new XmlDocument();
+
+        doc.Load(Application.dataPath + @"\StreamingAssets\MainMapXml.xml");
+
+        var children = doc.SelectSingleNode("Maps").ChildNodes;
+
+        foreach (XmlElement node in children)
+        {
+            var sceneType = node.GetAttribute("MapType");
+            var sceneTp = SceneType.None;
+            if (sceneType == SceneType.化工建筑.ToString())
+            {
+                sceneTp = SceneType.化工建筑;
+            }
+            else if (sceneType == SceneType.高层建筑.ToString())
+            {
+                sceneTp = SceneType.高层建筑;
+            }
+            else if (sceneType == SceneType.地下建筑.ToString())
+            {
+                sceneTp = SceneType.地下建筑;
+            }
+            else if (sceneType == SceneType.综合体建筑.ToString())
+            {
+                sceneTp = SceneType.综合体建筑;
+            }
+            var mapName = node.GetAttribute("MapName");
+            GameSettings.othersSettings.SceneType = sceneTp;
+            GameSettings.othersSettings.mapname = mapName;
+
+            //var path = node.GetAttribute("Path");
+            //var unit = Unit.None;
+            //if (path == Unit.DongYouLiQing.ToString())
+            //{
+            //    unit = Unit.DongYouLiQing;
+            //}
+
+
+            //var intro = node.GetAttribute("Intro");
+            //var areaSquadron = node.GetAttribute("XiaQZD");
+
+            //mapType.sceneType = sceneTp;
+            //mapType.unit = unit;
+            //mapType.name = mapName;
+            //mapType.introduction = intro;
+            //mapType.areaSquadron = areaSquadron;
+
+            //maps.Add(mapType.unit.ToString(), mapType);
+        }
+    }
 }