删掉未实现功能的UI，修改命令接受发送统计，添加内置判断错误的显示，修改了一些UI的显示。主场景返回时退出当前房间。

Assets/Commandcountnum.cs

@@ -0,0 +1,96 @@
+//using Boo.Lang;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Commandcountnum : MonoBehaviour
+{
+    public Text sendtext;
+    public Text receivetext;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        if (Input.GetKeyDown(KeyCode.Space))
+        {
+
+            sendtext.text = "send:" + GetSendMsg().Count;
+            receivetext.text = "receive:" + GetReceiveMsg().Count;
+
+        }
+    }
+    private List<ChatMessage> GetSendMsg()
+    {
+        List<ChatMessage> sendchatlist = new List<ChatMessage>();
+        for (int i = 0; i < ReportDataMgr.AllChatMessage.Count; i++)
+        {
+            if (ReportDataMgr.AllChatMessage[i].SenderId==CurrentUserInfo.mySelf.Id) 
+            {//当前客户端发送的
+               // if (ChatManager.Instance.FindDirectionSubUserDataID().Contains(ReportDataMgr.AllChatMessage[i].ReceiverId)) 
+                {//直接下级为接收方
+                    sendchatlist.Add(ReportDataMgr.AllChatMessage[i]);
+                }
+            }
+        }
+        return sendchatlist;
+    }
+    private List<ChatMessage> GetReceiveMsg()
+    {
+        List<ChatMessage> receivechatlist = new List<ChatMessage>();
+        for (int i = 0; i < ReportDataMgr.AllChatMessage.Count; i++)
+        {
+            if (!(CurrentUserInfo.role == Role.导调组 || CurrentUserInfo.role == Role.参谋))
+            {
+                if (ReportDataMgr.AllChatMessage[i].ReceiverId == CurrentUserInfo.mySelf.Id)
+                {
+                    receivechatlist.Add(ReportDataMgr.AllChatMessage[i]);
+                    //if (ChatManager.Instance.FindDirectionSubUserDataID().Contains(ReportDataMgr.AllChatMessage[i].SenderId))
+                    //{
+                    //    receivechatlist.Add(ReportDataMgr.AllChatMessage[i]);
+                    //}
+                    //if (ChatManager.Instance.FindDirectionSupUserDataID()== ReportDataMgr.AllChatMessage[i].SenderId) 
+                    //{
+                    //    receivechatlist.Add(ReportDataMgr.AllChatMessage[i]);
+                    //}
+                }
+            }
+            else 
+            {
+                receivechatlist.Add(ReportDataMgr.AllChatMessage[i]);
+            }
+           
+        }
+        return receivechatlist;
+    }
+    private List<long> GetChildOriIdList() 
+    {
+        List<long> idlist = new List<long>();
+        for (int i = 0; i < CurrentUserInfo.room.UserList.Count; i++)
+        {
+            if (CurrentUserInfo.room.UserList[i].Org.ParentId==CurrentUserInfo.mySelf.Id) 
+            {
+                idlist.Add(CurrentUserInfo.room.UserList[i].UserInfo.Id);
+            }
+        }
+        return idlist;
+    }
+    private long GetDirectionOriId() 
+    {
+        long parentoriid = 0;
+        for (int i = 0; i < CurrentUserInfo.room.UserList.Count; i++)
+        {
+            if (CurrentUserInfo.room.UserList[i].UserInfo.Id == CurrentUserInfo.mySelf.Id)
+            {
+                parentoriid = CurrentUserInfo.room.UserList[i].Org.ParentId;
+            }
+        }
+        return parentoriid;
+    }
+}

Assets/Commandcountnum.cs.meta

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

Assets/Prefabs/Common/OilTanks/OilTankSet 1.prefab.meta

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

Assets/Prefabs/Common/RoomWaiting/RoomWaiting.prefab

@@ -35,9 +35,9 @@ RectTransform:
   m_Father: {fileID: 224206009082004428}
   m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 622.89996, y: 0}
+  m_AnchoredPosition: {x: 622.89996, y: -444}
   m_SizeDelta: {x: 1240, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &222069633989209916
@@ -406,9 +406,9 @@ RectTransform:
   m_Father: {fileID: 224206009082004428}
   m_RootOrder: 17
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 622.89996, y: 0}
+  m_AnchoredPosition: {x: 622.89996, y: -666}
   m_SizeDelta: {x: 1240, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &222073028446080886
@@ -535,9 +535,9 @@ RectTransform:
   m_Father: {fileID: 224206009082004428}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 622.89996, y: 0}
+  m_AnchoredPosition: {x: 622.89996, y: -74}
   m_SizeDelta: {x: 1240, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &222045343299953470
@@ -1339,9 +1339,9 @@ RectTransform:
   m_Father: {fileID: 224206009082004428}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 622.89996, y: 0}
+  m_AnchoredPosition: {x: 622.89996, y: -296}
   m_SizeDelta: {x: 1240, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &222559250236329938
@@ -1468,9 +1468,9 @@ RectTransform:
   m_Father: {fileID: 224206009082004428}
   m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 622.89996, y: 0}
+  m_AnchoredPosition: {x: 622.89996, y: -740}
   m_SizeDelta: {x: 1240, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &222577496812319056
@@ -1873,9 +1873,9 @@ RectTransform:
   m_Father: {fileID: 224206009082004428}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 622.89996, y: 0}
+  m_AnchoredPosition: {x: 622.89996, y: -148}
   m_SizeDelta: {x: 1240, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &222846452265588650
@@ -3672,9 +3672,9 @@ RectTransform:
   m_Father: {fileID: 224206009082004428}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 622.89996, y: 0}
+  m_AnchoredPosition: {x: 622.89996, y: -222}
   m_SizeDelta: {x: 1240, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &222872675946339694
@@ -4020,9 +4020,9 @@ RectTransform:
   m_Father: {fileID: 224206009082004428}
   m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 622.89996, y: 0}
+  m_AnchoredPosition: {x: 622.89996, y: -518}
   m_SizeDelta: {x: 1240, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &222500803944493862
@@ -4483,9 +4483,9 @@ RectTransform:
   m_Father: {fileID: 224206009082004428}
   m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 622.89996, y: 0}
+  m_AnchoredPosition: {x: 622.89996, y: -370}
   m_SizeDelta: {x: 1240, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &222095624607795848
@@ -6361,9 +6361,9 @@ RectTransform:
   m_Father: {fileID: 224206009082004428}
   m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 622.89996, y: 0}
+  m_AnchoredPosition: {x: 622.89996, y: -592}
   m_SizeDelta: {x: 1240, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &222831754640883816

Assets/Prefabs/DongYouLiQing/BaseCommander/ZhanDouBanPanel.prefab

@@ -6892,7 +6892,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &224119438985441572
 RectTransform:
   m_ObjectHideFlags: 0
@@ -61417,6 +61417,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 224435228627855546}
     m_Modifications:
+    - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_Name
+      value: ExitButton
+      objectReference: {fileID: 0}
     - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -61522,11 +61527,6 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79,
-        type: 3}
-      propertyPath: m_Name
-      value: ExitButton
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 68d2d976d53f36643bc657c38931be79, type: 3}
 --- !u!224 &2748383912879035654 stripped

Assets/Prefabs/DongYouLiQing/BaseCommander/ZhongDuiPanel.prefab

@@ -30362,7 +30362,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &224139708893516956
 RectTransform:
   m_ObjectHideFlags: 0
@@ -62163,6 +62163,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 224609257569891380}
     m_Modifications:
+    - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_Name
+      value: ExitButton
+      objectReference: {fileID: 0}
     - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -62268,11 +62273,6 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79,
-        type: 3}
-      propertyPath: m_Name
-      value: ExitButton
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 68d2d976d53f36643bc657c38931be79, type: 3}
 --- !u!224 &1227157753397391204 stripped

Assets/Prefabs/DongYouLiQing/CanMou/CanMouPanel.prefab

@@ -2107,7 +2107,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &224748723713966920
 RectTransform:
   m_ObjectHideFlags: 0
@@ -21166,6 +21166,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 224534332134038426}
     m_Modifications:
+    - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_Name
+      value: ExitButton
+      objectReference: {fileID: 0}
     - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -21271,11 +21276,6 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79,
-        type: 3}
-      propertyPath: m_Name
-      value: ExitButton
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 68d2d976d53f36643bc657c38931be79, type: 3}
 --- !u!224 &2385980339624036238 stripped

Assets/Prefabs/DongYouLiQing/EventPanel.prefab.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: bcdf44e7aef61ae4eaccbd888f0d18b7
-timeCreated: 1529800507
-licenseType: Pro
-NativeFormatImporter:
-  mainObjectFileID: 100100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Prefabs/DongYouLiQing/OverAllReportPanel.prefab.meta

@@ -1,9 +1,7 @@
 fileFormatVersion: 2
 guid: 9ca1fe068e0c3d44fb4005cbf44b1a07
-timeCreated: 1529800502
+PrefabImporter:
-licenseType: Pro
+  externalObjects: {}
-NativeFormatImporter:
-  mainObjectFileID: 100100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Prefabs/DongYouLiQing/ZongZhiDa/DaDuiZhiHuiPanel.prefab

@@ -5246,7 +5246,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &224106465880836626
 RectTransform:
   m_ObjectHideFlags: 0
@@ -22153,6 +22153,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 224247944140956212}
     m_Modifications:
+    - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_Name
+      value: ExitButton
+      objectReference: {fileID: 0}
     - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -22258,11 +22263,6 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79,
-        type: 3}
-      propertyPath: m_Name
-      value: ExitButton
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 68d2d976d53f36643bc657c38931be79, type: 3}
 --- !u!224 &6077334707552001302 stripped

Assets/Prefabs/DongYouLiQing/ZongZhiDa/ZhiDuiZhiHuiPanel.prefab

@@ -2041,7 +2041,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &224806867869812032
 RectTransform:
   m_ObjectHideFlags: 0
@@ -22277,6 +22277,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 224112599686047538}
     m_Modifications:
+    - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_Name
+      value: ExitButton
+      objectReference: {fileID: 0}
     - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -22382,11 +22387,6 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79,
-        type: 3}
-      propertyPath: m_Name
-      value: ExitButton
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 68d2d976d53f36643bc657c38931be79, type: 3}
 --- !u!224 &192790284293878849 stripped

Assets/Prefabs/DongYouLiQing/ZongZhiDa/ZongDuiZhiHuiPanel.prefab

@@ -21455,7 +21455,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &224455090279717308
 RectTransform:
   m_ObjectHideFlags: 0
@@ -22277,6 +22277,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 224025558114677860}
     m_Modifications:
+    - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_Name
+      value: ExitButton
+      objectReference: {fileID: 0}
     - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -22382,11 +22387,6 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79,
-        type: 3}
-      propertyPath: m_Name
-      value: ExitButton
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 68d2d976d53f36643bc657c38931be79, type: 3}
 --- !u!224 &4012918980636462699 stripped

Assets/Resources/UI/ErrorInfoItem.prefab

@@ -0,0 +1,787 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &44186529450469672
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 364334798790717340}
+  - component: {fileID: 6764913982728979965}
+  - component: {fileID: 2676374608958049117}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &364334798790717340
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 44186529450469672}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 3549668955292770051}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.5, y: 0}
+  m_SizeDelta: {x: 1, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6764913982728979965
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 44186529450469672}
+  m_CullTransparentMesh: 0
+--- !u!114 &2676374608958049117
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 44186529450469672}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: 10c948ff69f358641b9e7c877aa88e87, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+--- !u!1 &2477042211477711717
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3549668955292770051}
+  - component: {fileID: 3641840378388988316}
+  - component: {fileID: 5420876471085937378}
+  m_Layer: 5
+  m_Name: EventText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &3549668955292770051
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2477042211477711717}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 364334798790717340}
+  m_Father: {fileID: 7382728396848158164}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -15.8, y: 0.39996}
+  m_SizeDelta: {x: 170.9, y: 45}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3641840378388988316
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2477042211477711717}
+  m_CullTransparentMesh: 0
+--- !u!114 &5420876471085937378
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2477042211477711717}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 18
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u96C6\u7ED3\u533A\u4F4D\u7F6E\u9519\u8BEF"
+--- !u!1 &2848783330440458739
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5486430369223838899}
+  - component: {fileID: 6185896418124206601}
+  - component: {fileID: 4978069502439107903}
+  m_Layer: 5
+  m_Name: RoleText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5486430369223838899
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2848783330440458739}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 2600007271017601490}
+  m_Father: {fileID: 7382728396848158164}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -149.8, y: 0.39996}
+  m_SizeDelta: {x: 200, y: 45}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6185896418124206601
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2848783330440458739}
+  m_CullTransparentMesh: 0
+--- !u!114 &4978069502439107903
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2848783330440458739}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 18
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7279\u52E4\u4E00\u4E2D\u961F\u6218\u6597\u73ED\u4E00\u822C"
+--- !u!1 &3238817735209463129
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 779542289297530760}
+  - component: {fileID: 5725704117330692401}
+  - component: {fileID: 917311148675897677}
+  m_Layer: 5
+  m_Name: ButtomImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &779542289297530760
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3238817735209463129}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 7382728396848158164}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0.5}
+  m_SizeDelta: {x: 0, y: 1}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5725704117330692401
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3238817735209463129}
+  m_CullTransparentMesh: 0
+--- !u!114 &917311148675897677
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3238817735209463129}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: 8e77dd088db71184bb5286d77d618f4e, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+--- !u!1 &3828375092991726493
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7382728396848158164}
+  - component: {fileID: 4450187018655209265}
+  - component: {fileID: 2517719435294134895}
+  - component: {fileID: 6653872893374699540}
+  m_Layer: 5
+  m_Name: ErrorInfoItem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7382728396848158164
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3828375092991726493}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 779542289297530760}
+  - {fileID: 5433678062107002808}
+  - {fileID: 5486430369223838899}
+  - {fileID: 3549668955292770051}
+  - {fileID: 4605704894622230534}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 807.2, y: 45}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4450187018655209265
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3828375092991726493}
+  m_CullTransparentMesh: 0
+--- !u!114 &2517719435294134895
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3828375092991726493}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+--- !u!114 &6653872893374699540
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3828375092991726493}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc8db7d3ac31fe445ba48753e0729340, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  TimeText: {fileID: 4994746633373797920}
+  RoleText: {fileID: 4978069502439107903}
+  DescribeText: {fileID: 3612034673166735251}
+--- !u!1 &5477826439038419699
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2901406224354760988}
+  - component: {fileID: 6768906614593710411}
+  - component: {fileID: 5856208055167460307}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2901406224354760988
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5477826439038419699}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5433678062107002808}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.5, y: 0}
+  m_SizeDelta: {x: 1, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6768906614593710411
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5477826439038419699}
+  m_CullTransparentMesh: 0
+--- !u!114 &5856208055167460307
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5477826439038419699}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: 10c948ff69f358641b9e7c877aa88e87, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+--- !u!1 &6859445300338891848
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4605704894622230534}
+  - component: {fileID: 5011466635225655059}
+  - component: {fileID: 3612034673166735251}
+  m_Layer: 5
+  m_Name: DescribeText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4605704894622230534
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6859445300338891848}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 5451727567089539987}
+  m_Father: {fileID: 7382728396848158164}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 176.9, y: 1.4}
+  m_SizeDelta: {x: 453.4, y: 45}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5011466635225655059
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6859445300338891848}
+  m_CullTransparentMesh: 0
+--- !u!114 &3612034673166735251
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6859445300338891848}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 18
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9AD8\u55B7\u8F66\u51FA\u6C34\u65F6\u53EA\u8FDE\u63A5\u4E00\u4E2A\u6C34\u6E90\u7684\u58EB\u5927\u592B\u5341\u5206"
+--- !u!1 &7912157362623173618
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5433678062107002808}
+  - component: {fileID: 1479064500960241950}
+  - component: {fileID: 4994746633373797920}
+  m_Layer: 5
+  m_Name: TimeText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5433678062107002808
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7912157362623173618}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 2901406224354760988}
+  m_Father: {fileID: 7382728396848158164}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -326.7, y: 0.39996}
+  m_SizeDelta: {x: 153.8, y: 45}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1479064500960241950
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7912157362623173618}
+  m_CullTransparentMesh: 0
+--- !u!114 &4994746633373797920
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7912157362623173618}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 18
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 00:00:00
+--- !u!1 &8276759109998941781
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5451727567089539987}
+  - component: {fileID: 7062963755228050522}
+  - component: {fileID: 4351449471571254477}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5451727567089539987
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8276759109998941781}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4605704894622230534}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.5, y: 0}
+  m_SizeDelta: {x: 1, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7062963755228050522
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8276759109998941781}
+  m_CullTransparentMesh: 0
+--- !u!114 &4351449471571254477
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8276759109998941781}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: 10c948ff69f358641b9e7c877aa88e87, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+--- !u!1 &8639302903593232628
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2600007271017601490}
+  - component: {fileID: 3846190071710953346}
+  - component: {fileID: 86377876250684265}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2600007271017601490
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8639302903593232628}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 5486430369223838899}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.5, y: 0}
+  m_SizeDelta: {x: 1, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3846190071710953346
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8639302903593232628}
+  m_CullTransparentMesh: 0
+--- !u!114 &86377876250684265
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8639302903593232628}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300000, guid: 10c948ff69f358641b9e7c877aa88e87, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0

Assets/Resources/UI/ErrorInfoItem.prefab.meta

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

Assets/Resources/UI/EventPanel.prefab.meta

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

Assets/Scenes/CommandCenter.unity

@@ -742,7 +742,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -29.150024}
+  m_AnchoredPosition: {x: 0, y: -29.150146}
   m_SizeDelta: {x: 0, y: -57.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &35815923
@@ -5024,6 +5024,7 @@ RectTransform:
   - {fileID: 349823188}
   - {fileID: 670372613}
   - {fileID: 638877652}
+  - {fileID: 989189243}
   m_Father: {fileID: 902160516}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5040,7 +5041,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 642872312}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
   m_Name: 
@@ -7925,6 +7926,136 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 0
+--- !u!1001 &989189242
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 642872313}
+    m_Modifications:
+    - target: {fileID: 4368387102949125001, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_Name
+      value: ExitButton
+      objectReference: {fileID: 0}
+    - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 714
+      objectReference: {fileID: 0}
+    - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 50
+      objectReference: {fileID: 0}
+    - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 50
+      objectReference: {fileID: 0}
+    - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2095911882945132050, guid: 68d2d976d53f36643bc657c38931be79,
+        type: 3}
+      propertyPath: mess
+      value: 
+      objectReference: {fileID: 1387800129}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 68d2d976d53f36643bc657c38931be79, type: 3}
+--- !u!224 &989189243 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 5031298119362188117, guid: 68d2d976d53f36643bc657c38931be79,
+    type: 3}
+  m_PrefabInstance: {fileID: 989189242}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1011596584
 GameObject:
   m_ObjectHideFlags: 0
@@ -10866,6 +10997,7 @@ RectTransform:
   m_Children:
   - {fileID: 902160516}
   - {fileID: 35815922}
+  - {fileID: 1387800128}
   m_Father: {fileID: 602138018}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -11144,6 +11276,146 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1387668104}
   m_CullTransparentMesh: 0
+--- !u!1001 &1387800127
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1379395812}
+    m_Modifications:
+    - target: {fileID: 1074993958489780, guid: 113a3fbbb9762c243a5af38e345e8e1a, type: 3}
+      propertyPath: m_Name
+      value: MessagePanel
+      objectReference: {fileID: 0}
+    - target: {fileID: 1074993958489780, guid: 113a3fbbb9762c243a5af38e345e8e1a, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 486
+      objectReference: {fileID: 0}
+    - target: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 279
+      objectReference: {fileID: 0}
+    - target: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 113a3fbbb9762c243a5af38e345e8e1a, type: 3}
+--- !u!224 &1387800128 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 224836084168518288, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+    type: 3}
+  m_PrefabInstance: {fileID: 1387800127}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1387800129 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 114553468016639754, guid: 113a3fbbb9762c243a5af38e345e8e1a,
+    type: 3}
+  m_PrefabInstance: {fileID: 1387800127}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e2b8eff52c33f3b4e9ca5b5d0bd72198, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1402776886
 GameObject:
   m_ObjectHideFlags: 0
@@ -16163,10 +16435,10 @@ RectTransform:
   m_Father: {fileID: 642872313}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 114, y: -29}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 228, y: 58}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2111163371
 MonoBehaviour:

Assets/Scripts/Common/ChatSystem/ChatManager.cs

@@ -260,8 +260,69 @@ public class ChatManager : Singleton<ChatManager>
         return tempData;
     }
 
+    public List<long> FindDirectionSubUserDataID() 
+    {
+        //查找要显示的上级用户数据
+        List<long> usersDatalist = new List<long>();
+        //练习模式组织机构可以变化
+        DirectionSubsId.Clear();
+        FindDirectionSupId(CurrentUserInfo.organization.ParentId);
+       
+        foreach (var item in CurrentUserInfo.room.UserList)
+        {
+            if (item.UserInfo.Id != CurrentUserInfo.mySelf.Id)
+            {
+                foreach (var id in DirectionSubsId)
+                {
+                    // 数据中不存在战斗班的数据
+                    if (item.Org.Id.Equals(id)
+                        && item.Org.Level != 5
+                        && item.Role != Role.总队指挥中心
+                        && item.Role != Role.支队指挥中心
+                        && item.Role != Role.导调组
+                        && item.Role != Role.观察团)
+                    {
+                        usersDatalist.Add(item.UserInfo.Id);
+                        break;
+                    }
+                }
+                // 在房间中查找战斗班数据-战斗班目前不存在下级
+            }
+        }
+        return usersDatalist;
+    }
+    public long  FindDirectionSupUserDataID() 
+    {
+        //查找要显示的上级用户数据
+        long tempData = 0;
+        //练习模式组织机构可以变化
+        DirectionSupId = 0;
+        FindDirectionSupId(CurrentUserInfo.organization.ParentId);
+        
+        foreach (var item in CurrentUserInfo.room.UserList)
+        {
+            if (item.UserInfo.Id != CurrentUserInfo.mySelf.Id)
+            {
+                    // 数据中不存在战斗班的数据
+                    if (item.Org.Id.Equals(DirectionSupId)
+                        && item.Org.Level != 5
+                        && item.Role != Role.总队指挥中心
+                        && item.Role != Role.支队指挥中心
+                        && item.Role != Role.导调组
+                        && item.Role != Role.观察团)
+                    {
+                        tempData = item.UserInfo.Id;
+                        break;
+                    }
+            }
+        }
+        return tempData;
+    }
+
     private List<int> SupsId = new List<int>();
     private List<int> SubsId = new List<int>();
+    private int DirectionSupId;
+    private List<int> DirectionSubsId = new List<int>();
     private List<Organization> orgs = new List<Organization>();
     public void SetOrgs(List<Organization> data)
     {
@@ -288,6 +349,30 @@ public class ChatManager : Singleton<ChatManager>
             }
         }
     }
+    public void FindDirectionSupId(int supId) 
+    {
+        foreach (var item in orgs)
+        {
+            //查看我是否存在上级
+            if (item.Id == supId && item.Level != 5)
+            {
+                //保存上级的ID
+                DirectionSupId = item.Id;
+            }
+        }
+    }
+    public void FindDirectionSubId(int id) 
+    {
+        foreach (var item in orgs)
+        {
+            //查看item是否是我的下级
+            if (item.ParentId == id)
+            {
+                //保存下级ID
+                DirectionSubsId.Add(item.Id);
+            }
+        }
+    }
     // 查找某个ID的所有下级ID
     public void FindAllSubID(int id)
     {
@@ -304,6 +389,7 @@ public class ChatManager : Singleton<ChatManager>
             }
         }
     }
+   
     /// <summary>
     /// 创建一个2人的房间
     /// </summary>
@@ -426,7 +512,7 @@ public class ChatManager : Singleton<ChatManager>
         textMsg.ChatGroup = ChatType.PrivateChat;
         NetworkManager.Default.SendAsync("PRIVATE_TEXT_MESSAGE_SYNC", textMsg);
     }
-    public void SendPrivateChatTaskMsg(string taskContent, ChatChannel channel)
+    public void SendPrivateChatTaskMsg(string taskContent, ChatChannel channel,UserData userdata)
     {
         ChatTaskMessage msg = new ChatTaskMessage();
         msg.SenderId = CurrentUserInfo.mySelf.Id;
@@ -435,6 +521,7 @@ public class ChatManager : Singleton<ChatManager>
         msg.TaskContent = taskContent;
         msg.ReplayFrameCount = InputManager.frameCount;
         msg.ChatGroup = ChatType.PrivateChat;
+        msg.ReceiverId = userdata.UserInfo.Id;
         NetworkManager.Default.SendAsync("PRIVATE_TASK_MESSAGE_SYNC", msg);
         // 记录发送过指令
         ReportDataMgr.SetSendCommand(msg);

Assets/Scripts/Common/ChatSystem/Items/UserInfoItemView.cs

@@ -87,4 +87,8 @@ public class UserInfoItemView : MonoBehaviour
             UnRead.SetActive(false);
         }
     }
+    public UserData GetItemUserData() 
+    {
+        return data.UserInfo; 
+    }
 }

Assets/Scripts/Common/ChatSystem/PrivateChat/PrivateChatPanel.cs

@@ -47,6 +47,7 @@ public class PrivateChatPanel : UIView
     // 录音时间
     private TimeSpan time;
     private DateTime startTime;
+    public UserData CurrentPrivateChatUserData;//当前私聊聊天窗口聊天对象的的用户信息
     public override UIViewType ViewType
     {
         get
@@ -251,7 +252,7 @@ public class PrivateChatPanel : UIView
         if (ChatManager.Instance.SelectTaskIndex != -1)
         {
             Debug.Log("发送指令消息:" + ChatManager.Instance.GetSelectedTaskName());
-            ChatManager.Instance.SendPrivateChatTaskMsg(inputContent, currentChannel);
+            ChatManager.Instance.SendPrivateChatTaskMsg(inputContent, currentChannel, GetSelectUserData());
         }
         // 清空输入内容
         ChatInputField.text = "";
@@ -421,4 +422,18 @@ public class PrivateChatPanel : UIView
         RefreshUserInfoLoopList();
         RefreshChatLoopList();
     }
+    public UserData GetSelectUserData() 
+    {
+        UserData data = new UserData();
+        UserInfoItemView[] userInfoItems = GetComponentsInChildren<UserInfoItemView>();
+        for (int i = 0; i < userInfoItems.Length; i++)
+        {
+            if (userInfoItems[i].GetComponent<Toggle>().isOn) 
+            {
+                data = userInfoItems[i].GetItemUserData();
+                break;
+            }
+        }
+        return data;
+    }
 }

Assets/Scripts/Common/Disasters/Wound_Trapped/BaseHaemalController.cs

@@ -174,7 +174,8 @@ public class BaseHaemalController : MonoBehaviour
         DrillBegin = GameSettings.othersSettings.isStartDrill;
         if (DrillBegin)
         {
-            if (CurrentUserInfo.mySelf.Id==CurrentUserInfo.room.Owner.UserInfo.Id)
+          
+            if (CurrentUserInfo.room!=null&&CurrentUserInfo.mySelf.Id==CurrentUserInfo.room.Owner.UserInfo.Id)
             {
                 if (IsStillAlive)
                 {

Assets/Scripts/Common/ErrorInfo.meta

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

Assets/Scripts/Common/ErrorInfo/ErrorInfoItem.cs

@@ -0,0 +1,19 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class ErrorInfoItem : MonoBehaviour
+{
+    public  Text TimeText;
+    public Text RoleText;
+    //private Text EventText;
+    public Text DescribeText;
+    // Start is called before the first frame update
+    public void SetValue(ReportErroeSyncData data) 
+    {
+        TimeText.text = data.Time;
+        RoleText.text = data.errorset;
+        DescribeText.text = data.describe;
+    }
+}

Assets/Scripts/Common/ErrorInfo/ErrorInfoItem.cs.meta

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

Assets/Scripts/Common/ErrorInfo/EventPanel.cs

@@ -0,0 +1,46 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EventPanel : MonoBehaviour
+{
+    public GameObject ErrorInfoItem;
+    public Transform Content;
+    public ButtonRecordByAC CloseButton;
+    private void Start()
+    {
+        CloseButton.OutInterFaceButton = Close;
+    }
+    // Start is called before the first frame update
+    private void OnEnable()
+    {
+        LoadItem();
+    }
+    private void Close() 
+    {
+        gameObject.SetActive(false);
+    }
+    private void LoadItem() 
+    {
+        CleartItem();
+        List<ReportErroeSyncData> errorList = REPORT_ERROR_SYNC.ErrorList;
+        for (int i = 0; i < errorList.Count; i++)
+        {
+            GameObject item = Instantiate(ErrorInfoItem,Content);
+            item.GetComponent<ErrorInfoItem>().SetValue(errorList[i]);
+        }
+    }
+
+    private void CleartItem() 
+    {
+        for (int i = 0; i < Content.childCount; i++)
+        {
+            Destroy(Content.GetChild(i).gameObject);
+        }
+    }
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Assets/Scripts/Common/ErrorInfo/EventPanel.cs.meta

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

Assets/Scripts/Common/NetworkSystem/NetWorkSync/NetworkSyncHelper.cs

@@ -425,7 +425,10 @@ public class TrappedFallDownSyncData : BaseNetworkSyncDate
 public class ReportErroeSyncData : BaseNetworkSyncDate
 {
     public string Time;//时间
-    public string errorset;//事件
+    /// <summary>
+    /// 内置判断错误触发人员
+    /// </summary>
+    public string errorset;
     public string describe;//详情
 }
 public class SprayRotateSyncData : BaseNetworkSyncDate

Assets/Scripts/Common/ReceiveCars/CloneStayingAreaTool.cs

@@ -6,6 +6,7 @@ using UnityEngine;
 using AX.InputSystem;
 using UnityEngine.AI;
 using AX.NetworkSystem;
+using System.Linq.Expressions.Reimplement;
 
 public class CloneStayingAreaTool : CloneBase//集结区调车时注意场景中是否还有名称显示的预设（TheHeadName）
 {
@@ -119,12 +120,12 @@ public class CloneStayingAreaTool : CloneBase//集结区调车时注意场景中
             {
                 //发送错误报告同步信息
                 ReportErroeSyncData arg = new ReportErroeSyncData();
-                if (GetComponent<TIME_SYNC>())
+                //if (GetComponent<TIME_SYNC>())
                 {
                     arg.Time = TIME_SYNC.time;
                 }
                 arg.SendUserID = CurrentUserInfo.mySelf.Id;
-                arg.errorset = "集结区设置错误";
+                arg.errorset = CurrentUserInfo.role.ToString();//"集结区设置错误";
                 arg.describe = "集结区设置在火灾下风口";
                 NetworkManager.Default.SendAsync("REPORT_ERROR_SYNC", arg);
             }
@@ -488,19 +489,30 @@ public class CloneStayingAreaTool : CloneBase//集结区调车时注意场景中
             else//防止范围内有火灾
             {
                 Vector3 windNormal = wind.transform.forward.normalized;//风向
-                Vector3 verticalNormal = Vector3.Cross(windNormal, Vector3.up).normalized;//风向垂直方向
-                float Slope = verticalNormal.z / verticalNormal.x;//斜率
-                float intercept = setpos.z - Slope * setpos.x;//截距
-                //集结区的中心点所在直线方程为：y=slope*x+intercept
                 for (int i = 0; i < DangerousList.Count; i++)
                 {
-                    float y = Slope * DangerousList[i].transform.position.x + intercept + Mathf.Sqrt(2) * (AreaPrefabSize / 2);
+                    Vector3 pos_fire = DangerousList[i].transform.position-setpos;//集结区-火的向量
-
+                    Vector2 xoz = new Vector2(pos_fire.x, pos_fire.z);//集结区-火的向量 的xoz平面向量
-                    if (y < DangerousList[i].transform.position.z)
+                    float dot_vec2 = Vector2.Dot(xoz, new Vector2(windNormal.x,windNormal.z));//该向量与风向的点成
+                    if (dot_vec2>0) 
                     {
                         safe = false;
+                        break;
                     }
                 }
+                //Vector3 verticalNormal = Vector3.Cross(windNormal, Vector3.up).normalized;//风向垂直方向
+                //float Slope = verticalNormal.z / verticalNormal.x;//斜率
+                //float intercept = setpos.z - Slope * setpos.x;//截距
+                ////集结区的中心点所在直线方程为：y=slope*x+intercept
+                //for (int i = 0; i < DangerousList.Count; i++)
+                //{
+                //    float y = Slope * DangerousList[i].transform.position.x + intercept + Mathf.Sqrt(2) * (AreaPrefabSize / 2);
+
+                //    if (y < DangerousList[i].transform.position.z)
+                //    {
+                //        safe = false;
+                //    }
+                //}
             }
         }
         return safe;

Assets/Scripts/Common/ReportSystem/RECEIVER_COMMAND_SYNC.cs

@@ -10,5 +10,6 @@ public class RECEIVER_COMMAND_SYNC : NetworkMessageBehaviour
     {
         ChatTaskMessage taskMsg = message.Body.Deserialize<ChatTaskMessage>();
         ReportDataMgr.AddReceiverCommand(taskMsg);
+       
     }
 }

Assets/Scripts/Common/ReportSystem/ReportDataMgr.cs

@@ -85,7 +85,7 @@ public class ReportDataMgr
     public static Dictionary<string, float> DefeatScore = new Dictionary<string, float>();
     // 提升投票
     public static Dictionary<string, float> LevelUpScore = new Dictionary<string, float>();
-
+    public static List<ChatTaskMessage> AllChatMessage = new List<ChatTaskMessage>();
     public static void SetSendCommand(ChatTaskMessage chatTaskMessage)
     {
         //SEND_COMMAND_SYNC
@@ -101,12 +101,28 @@ public class ReportDataMgr
     // 添加发送命令
     public static void AddSendCommand(ChatTaskMessage chatTaskMessage)
     {
-        allSendCommand.Add(chatTaskMessage);
+        List<long> chatidlist = new List<long>();
+        for (int i = 0; i < allSendCommand.Count; i++)
+        {
+            chatidlist.Add(allSendCommand[i].ID);
+        }
+        if (!chatidlist.Contains(chatTaskMessage.ID)) 
+        {
+            allSendCommand.Add(chatTaskMessage);
+        }
     }
     // 添加接收命令
     public static void AddReceiverCommand(ChatTaskMessage chatTaskMessage)
     {
-        allReceiverCommand.Add(chatTaskMessage);
+        List<long> chatidlist = new List<long>();
+        for (int i = 0; i < allReceiverCommand.Count; i++)
+        {
+            chatidlist.Add(allReceiverCommand[i].ID);
+        }
+        if (!chatidlist.Contains(chatTaskMessage.ID)) 
+        {
+            allReceiverCommand.Add(chatTaskMessage);
+        }
     }
     // 添加车辆信息
     public static void AddTruckObj(GameObject gameObject)
@@ -130,6 +146,12 @@ public class ReportDataMgr
         GetAllCommandCount();
         GetActInPersonCount();
     }
+    public static void GetAllCommand() 
+    {
+        totalSendCommand = 0;
+        totalReceiverCommand = 0;
+        GetAllCommandCount();
+    }
     // 获取答题人数
     public static void GetActInPersonCount()
     {
@@ -237,6 +259,7 @@ public class ReportDataMgr
     // 获取所有命令数量
     private static void GetAllCommandCount()
     {
+
         // 如果时导调组观察团
         if (CurrentUserInfo.role == Role.导调组 || CurrentUserInfo.role == Role.观察团)
         {
@@ -983,4 +1006,55 @@ public class ReportDataMgr
             return string.Format("参演人员认为，应当通过以下途径提升队伍战力：①{0}(<color=#ff0000>{1}</color>)②{2}(<color=#ff0000>{3}</color>)③{4}(<color=#ff0000>{5}</color>)。", item1.Key, item1.Value, item2.Key, item2.Value, item3.Key, item3.Value);
         }
     }
+    /// <summary>
+    /// 本客户端发送命令数量统计
+    /// </summary>
+    /// <returns></returns>
+    private static List<ChatMessage> GetSendMsg()
+    {
+        List<ChatMessage> sendchatlist = new List<ChatMessage>();
+        for (int i = 0; i < ReportDataMgr.AllChatMessage.Count; i++)
+        {
+            if (ReportDataMgr.AllChatMessage[i].SenderId == CurrentUserInfo.mySelf.Id)
+            {//当前客户端发送的
+             // if (ChatManager.Instance.FindDirectionSubUserDataID().Contains(ReportDataMgr.AllChatMessage[i].ReceiverId)) 
+                {//直接下级为接收方
+                    sendchatlist.Add(ReportDataMgr.AllChatMessage[i]);
+                }
+            }
+        }
+        return sendchatlist;
+    }
+    /// <summary>
+    /// 本客户端接受命令统计
+    /// </summary>
+    /// <returns></returns>
+    private static List<ChatMessage> GetReceiveMsg()
+    {
+        List<ChatMessage> receivechatlist = new List<ChatMessage>();
+        for (int i = 0; i < ReportDataMgr.AllChatMessage.Count; i++)
+        {
+            if (!(CurrentUserInfo.role == Role.导调组 || CurrentUserInfo.role == Role.观察团))
+            {
+                if (ReportDataMgr.AllChatMessage[i].ReceiverId == CurrentUserInfo.mySelf.Id)
+                {
+                    receivechatlist.Add(ReportDataMgr.AllChatMessage[i]);
+                }
+            }
+            else
+            {
+                receivechatlist.Add(ReportDataMgr.AllChatMessage[i]);
+            }
+
+        }
+        return receivechatlist;
+    }
+    public  static string GetReceiveMsgCount() 
+    {
+        return string.Format("{0}条", GetReceiveMsg().Count);
+    }
+    public static string GetSendMsgCount() 
+    {
+        return string.Format("{0}条", GetSendMsg().Count);
+    }
 }

Assets/Scripts/Common/ReportSystem/SEND_COMMAND_SYNC.cs

@@ -10,5 +10,10 @@ public class SEND_COMMAND_SYNC : NetworkMessageBehaviour
     {
         ChatTaskMessage taskMsg = message.Body.Deserialize<ChatTaskMessage>();
         ReportDataMgr.AddSendCommand(taskMsg);
+        
+        if (!ReportDataMgr.AllChatMessage.Contains(taskMsg))
+        {
+            ReportDataMgr.AllChatMessage.Add(taskMsg);
+        }
     }
 }

Assets/Scripts/Common/ReportSystem/UIViewReport.cs

@@ -52,7 +52,9 @@ public class UIViewReport : UIView
         MoverInfo.text = ReportDataMgr.GetAllFiremanCountString();
         SaverInfo.text = ReportDataMgr.GetAllSaveCountString();
         UseWaterInfo.text = ReportDataMgr.GetAllUserWaterString();
-        SendCommondInfo.text = ReportDataMgr.GetAllSendCommandString();
+        //SendCommondInfo.text = ReportDataMgr.GetAllSendCommandString();
-        ReceiverCommandInfo.text = ReportDataMgr.GetAllReceiverCommandString();
+        //ReceiverCommandInfo.text = ReportDataMgr.GetAllReceiverCommandString();
+        SendCommondInfo.text = ReportDataMgr.GetSendMsgCount();
+        ReceiverCommandInfo.text = ReportDataMgr.GetReceiveMsgCount();
     }
 }

Assets/Scripts/Common/RoomWaiting/ROOM_LEAVE_SYNC.cs

@@ -22,6 +22,10 @@ public class ROOM_LEAVE_SYNC : NetworkMessageBehaviour
                 //准备状态下的用户离开时需要初始化准备状态，避免再进入房间直接就是准备状态
                 UserData user = CurrentUserInfo.room.FindUserById(CurrentUserInfo.mySelf.Id);
                 user.IsReady = false;
+                if (CurrentUserInfo.role==Role.导调组&&GameSettings.othersSettings.isStartDrill) 
+                {//如果是导调组退出房间并且演练已经开始
+                    GameSettings.othersSettings.isStartDrill = false;
+                }
                 if (info.TargetScene.ToString() == "Lobby")
                 {//从房间返回大厅
                     CurrentUserInfo.room = null;

Assets/Scripts/DongYouLiQing/BaseCommander/FiremanSkill/Associated/TruckBindWaterSource.cs

@@ -303,7 +303,7 @@ public class TruckBindWaterSource : MonoBehaviour
                     RemainWater = remain.Value;
                     if (RemainWater != -100)
                     {
-                        if (RemainTime <= 0|| RemainWater <= 0)
+                        if (RemainTime <= 0 || RemainWater <= 0)
                         {//没水了
                             stopspraywaterorform();
                         }
@@ -663,11 +663,11 @@ public class TruckBindWaterSource : MonoBehaviour
                 }
                 if (allConnectWaterHose.Count <= 0 && allConnectWaterCurtainHose.Count <= 0)
                 {
-                    if(!GetComponent<TruckMessage>().IsFixedSupport)
+                    if (!GetComponent<TruckMessage>().IsFixedSupport)
                     {
                         GetComponent<AgentController>().pathFindEnable = true;
                     }
-                  
+
                 }
             }
 
@@ -1530,6 +1530,40 @@ public class TruckBindWaterSource : MonoBehaviour
         //GameObject water = Instantiate(WaterStraightPrefabs, Hose.transform);
         Hose.GetComponentInChildren<ParticleControlOfType>().SetScaleValue(0.7f);
         ParticleSize = 0.7f;
+        JudeHightCarSpray();
+    }
+    /// <summary>
+    /// 高喷车出水内置判断
+    /// </summary>
+    private void JudeHightCarSpray()
+    {
+        bool isconnecttwo = true;
+        if (waterSourceLine1.Count < 1 || waterSourceLine2.Count < 1)
+        {//如果有一条线路没链接，内置判断为错
+            isconnecttwo = false;
+        }
+        else 
+        {
+            long con1 = waterSourceLine1[0][0];//路线1 直接水源id
+            long con2 = waterSourceLine2[0][0];//路线2 直接水源id
+            if (con1==con2) 
+            {//两个直接水源一样，则连在一个水源车上，内置判断为错
+                isconnecttwo = false;
+            }
+        }
+        if (!isconnecttwo) 
+        {
+            //发送错误报告同步信息
+            ReportErroeSyncData arg = new ReportErroeSyncData();
+            // (GetComponent<TIME_SYNC>())
+            {
+                arg.Time = TIME_SYNC.time;
+            }
+            arg.SendUserID = CurrentUserInfo.mySelf.Id;
+            arg.errorset = CurrentUserInfo.role.ToString();
+            arg.describe = "高喷车出水只连接一个水源";
+            NetworkManager.Default.SendAsync("REPORT_ERROR_SYNC", arg);
+        }
     }
     /// <summary>
     /// 喷泡沫

Assets/Scripts/DongYouLiQing/BaseCommander/WaterFightFire/SpreadFireController.cs

@@ -41,6 +41,10 @@ public class SpreadFireController : MonoBehaviour
                 GetfireStruckContainDic();
                 flag = true;
             }
+            if (CurrentUserInfo.mySelf==null||CurrentUserInfo.room==null) 
+            {
+                return;
+            }
             if (CurrentUserInfo.mySelf.Id==CurrentUserInfo.room.Owner.UserInfo.Id)
             {
                 if (p_FireNormal.childCount > 0)

Assets/Scripts/DongYouLiQing/LeadGroup/DrillBeginButton.cs

@@ -125,7 +125,7 @@ public class DrillBeginButton : BaseButton
             failCount++;
             vicHint += vicHint=="" ?"燃烧时间超过指定值" : "\n燃烧时间超过指定值";            
         }
-        if (victory == false && failCount >=vicSetting.Count)
+        if (victory == false /*&& failCount >=vicSetting.Count*/)
         {
             vicHint += "\n演习失败";
             vicHint.Trim();

Assets/Scripts/DongYouLiQing/LeadGroup/ExitDrillButton.cs

@@ -24,9 +24,7 @@ public class ExitDrillButton : BaseButton
         EntitiesManager.Instance.Reset();//跳转场景时要清空实体管理器中的对象
 
         //准备状态下的用户离开时需要初始化准备状态，避免再进入房间直接就是准备状态
-        UserData user = CurrentUserInfo.room.FindUserById(CurrentUserInfo.mySelf.Id);
+       
-        user.IsReady = false;
-        CurrentUserInfo.room = null;
         EnterRoomPair data = new EnterRoomPair
         {
             RoomId = CurrentUserInfo.room == null ? -1 : CurrentUserInfo.room.Id,
@@ -39,6 +37,9 @@ public class ExitDrillButton : BaseButton
             },
             TargetScene = GoTo.RolesSelection,
         };
+        UserData user = CurrentUserInfo.room.FindUserById(CurrentUserInfo.mySelf.Id);
+        user.IsReady = false;
+        CurrentUserInfo.room = null;
         NetworkManager.Default.SendAsync("ROOM_LEAVE_SYNC", data);
         SceneManager.LoadScene(GoTo.RolesSelection.ToString());
     }

Assets/Scripts/DongYouLiQing/LeadGroup/REPORT_ERROR_SYNC.cs

@@ -8,6 +8,7 @@ using AX.MessageSystem;
 
 public class REPORT_ERROR_SYNC : NetworkMessageBehaviour
 {
+    public static List<ReportErroeSyncData> ErrorList = new List<ReportErroeSyncData>();
     protected override void Execute(BinaryMessage message)
     {
         InputHistory.Instance.RegisterInputHistory(message);
@@ -17,8 +18,9 @@ public class REPORT_ERROR_SYNC : NetworkMessageBehaviour
         if (InputManager.Instance)
         {
             if (CurrentUserInfo.role == Role.导调组||CurrentUserInfo.role==Role.观察团)
-            {                
+            {
-                MessageDispatcher.SendMessage("ReportError", info);                
+                //MessageDispatcher.SendMessage("ReportError", info);      
+                ErrorList.Add(info);
             }
         }
     }

Assets/Scripts/DongYouLiQing/LeadGroup/WarCommuniqueToggle.cs

@@ -19,7 +19,7 @@ public class WarCommuniqueToggle : BaseToggle {
     public override void RespondFun(bool value)
     {
         OverAllReportPanel.SetActive(value);
-       // EventPanel.SetActive(value);
+        EventPanel.SetActive(value);
         //transform.Find("Image").gameObject.SetActive(value);
     }
 

Assets/Scripts/DongYouLiQing/OverallReport/OverAllCloseButton.cs

@@ -0,0 +1,14 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class OverAllCloseButton : BaseButton
+{
+    public Transform overAllReportPanel;
+    public override void RespondFun()
+    {
+        overAllReportPanel.gameObject.SetActive(false);
+    }
+
+   
+}

Assets/Scripts/DongYouLiQing/OverallReport/OverAllCloseButton.cs.meta

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