From 9dd7c20e5d7f3d2586e06e583e858f4b912c559c Mon Sep 17 00:00:00 2001
From: YangHua <1475658476@qq.com>
Date: Thu, 1 Feb 2024 09:19:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TEXTURES/mat_galaxy.mat                   |   2 +-
 .../TEXTURES/mat_moon.mat                     |   4 +-
 Assets/Prefeb/Loading.prefab                  | 155 ++++++++++++++++++
 Assets/Prefeb/Loading.prefab.meta             |   7 +
 Assets/Temp/Scripts/View_Panel2.cs            |  70 ++++----
 Assets/Zion/Scenes/InitConnect.unity          |   2 +
 Assets/Zion/Scenes/SampleScene.unity          | 132 ++++++++++++++-
 Assets/Zion/Scripts/Adam/UIBootstrap.cs       |  29 +++-
 .../Scripts/Adam/Utility/Net/AsyncWebReq.cs   |   5 +-
 9 files changed, 366 insertions(+), 40 deletions(-)
 create mode 100644 Assets/Prefeb/Loading.prefab
 create mode 100644 Assets/Prefeb/Loading.prefab.meta

diff --git a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_galaxy.mat b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_galaxy.mat
index dc853151..3519bd27 100644
--- a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_galaxy.mat	
+++ b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_galaxy.mat	
@@ -48,7 +48,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
-    - _GIntensity: 0
+    - _GIntensity: 0.1
     - _Intensity: 0
     - _SIntensity: 1
     - _perturbation: 0.405
diff --git a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat
index 44f8ade1..36f8bdcf 100644
--- a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat	
+++ b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat	
@@ -32,8 +32,8 @@ Material:
     - _dispStrength: 1
     - _overBright: 1
     m_Colors:
-    - _AmbientTint: {r: 0, g: 0, b: 0, a: 1}
-    - _Color: {r: 0.25, g: 0.25, b: 0.25, a: 0.040000003}
+    - _AmbientTint: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 0, g: 0, b: 0, a: 1}
     - _GlowColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
     - _PrimaryTint: {r: 1, g: 1, b: 1, a: 1}
     - _TintColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/Prefeb/Loading.prefab b/Assets/Prefeb/Loading.prefab
new file mode 100644
index 00000000..c1995414
--- /dev/null
+++ b/Assets/Prefeb/Loading.prefab
@@ -0,0 +1,155 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &460561659324528917
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 460561659324528916}
+  - component: {fileID: 460561659324528914}
+  - component: {fileID: 460561659324528915}
+  m_Layer: 5
+  m_Name: Loading
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &460561659324528916
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 460561659324528917}
+  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: 460561660068337304}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  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: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &460561659324528914
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 460561659324528917}
+  m_CullTransparentMesh: 0
+--- !u!114 &460561659324528915
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 460561659324528917}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.14150941, g: 0.14150941, b: 0.14150941, a: 0.36862746}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &460561660068337305
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 460561660068337304}
+  - component: {fileID: 460561660068337302}
+  - component: {fileID: 460561660068337303}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &460561660068337304
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 460561660068337305}
+  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: 460561659324528916}
+  m_RootOrder: 0
+  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: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &460561660068337302
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 460561660068337305}
+  m_CullTransparentMesh: 0
+--- !u!114 &460561660068337303
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 460561660068337305}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 72
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 72
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u52A0\u8F7D\u4E2D......"
diff --git a/Assets/Prefeb/Loading.prefab.meta b/Assets/Prefeb/Loading.prefab.meta
new file mode 100644
index 00000000..d106db13
--- /dev/null
+++ b/Assets/Prefeb/Loading.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d61f98bb55a26ec48b6a05359f4ecc8e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Temp/Scripts/View_Panel2.cs b/Assets/Temp/Scripts/View_Panel2.cs
index 98d6fe3d..2e88b8a5 100644
--- a/Assets/Temp/Scripts/View_Panel2.cs
+++ b/Assets/Temp/Scripts/View_Panel2.cs
@@ -92,6 +92,7 @@ public class View_Panel2 : XUIPanel
     public Button start_training_btn;//开始训练按钮
     public Button entering_key_btn;//进入导调按钮
     public Button scenario_btn;//想定编辑
+    public Button refresh_btn;//刷新房间按钮
     public View_Panel2() : base(UIType.Normal, UIMode.HideOther, UICollider.Normal)
     {
         uiPath = "UIPanel/View_Panel2";
@@ -100,6 +101,7 @@ public class View_Panel2 : XUIPanel
     {
         roomModelDropdown = this.transform.Find("append_room_panl/roomModelDropdown").GetComponent<Dropdown>();
         thinkingDropdown = this.transform.Find("append_room_panl/thinkingDropdown").GetComponent<Dropdown>();
+        refresh_btn = this.transform.Find("UPBG/Refresh_btn").GetComponent<Button>();
 
         append_room_panl = GameObject.Find("View_Panel2(Clone)").transform.GetChild(2).GetComponent<Image>();
         Fork_off_btn = GameObject.Find("View_Panel2(Clone)").transform.GetChild(2).transform.GetChild(1).GetComponent<Button>();
@@ -132,7 +134,7 @@ public class View_Panel2 : XUIPanel
         Cancel4_btn = GameObject.Find("View_Panel2(Clone)").transform.GetChild(5).transform.GetChild(1).GetComponent<Button>();
         root_pan = Resources.Load<GameObject>("UIPanel/generate_panl");
 
-        this.transform.Find("UPBG/Refresh_btn").GetComponent<Button>().onClick.AddListener(() =>
+        refresh_btn.onClick.AddListener(() =>
         {
             GetAllRoomData();
         });
@@ -261,7 +263,6 @@ public class View_Panel2 : XUIPanel
     public async void GetAllRoomData()
     {
         roomdata = await AsyncWebReq.Post<RoomData>(Url_RoomList, null);
-        UIBootstrap.Instance.SetRoomdata(roomdata);
         if (place.childCount > 0)
         {
             for (int i = 0; i < place.childCount; i++)
@@ -269,7 +270,9 @@ public class View_Panel2 : XUIPanel
                 GameObject.Destroy(place.GetChild(i).gameObject);
             }
         }
-        CreateRoom();
+        UIBootstrap.Instance.SetRoomdata(roomdata);
+        UIBootstrap.Instance.CheckShowLoad(CreateRoom);
+        //CreateRoom();
     }
 
     public async void GetAllUserData()
@@ -309,7 +312,6 @@ public class View_Panel2 : XUIPanel
                 {
                     currentAccount = "";
                 }
-                Debug.Log($"currentAccount{currentAccount}");
             });
             currentAllAccount.Add(obj);
         }
@@ -475,7 +477,7 @@ public class View_Panel2 : XUIPanel
         ///进入训练
         start_training_btn.onClick.AddListener(() =>
         {
-            GameMain.model = false; 
+            GameMain.model = false;
             //SceneManager.LoadScene("AdamTraining_pilot_terminal_panl 1");
             //加入房间
             Debug.Log("进入训练");
@@ -751,32 +753,11 @@ public class View_Panel2 : XUIPanel
     /// </summary>
     private void Submit()
     {
-        seatSubmit_btn.onClick.AddListener(async () =>
-        {
-            append_room_panl.gameObject.SetActive(false);
-            distribution_panl.gameObject.SetActive(false);
-            selector_panl.gameObject.SetActive(false);
-            string accountInfo = AccountsInfo();
-            ReturnRoomID returnRoomId = await AsyncWebReq.Post<ReturnRoomID>(Url_GetRoomID + currentRoomName + "&MissionModel=" + currentMissionModel + "&ThinkingId=" + currentThinkingId + "&AccountsInfo=" + accountInfo, null);
-            if (returnRoomId.state)
-            {
-                string roomID = returnRoomId.data;
-
-                RoomState roomState = await AsyncWebReq.Post<RoomState>(Url_UpdateRoomState + roomID + "&state=0", null);
-                //创建房间
-                if (roomState.message == "success")
-                {
-                    CreateRoomBase(returnRoomId.data, currentRoomName);
-                }
-                Debug.Log($"<color=yellow> roomState=={roomState.message}</color>");
-                string RoomName = "createroom " + returnRoomId.data;
-                _ = AdamSync.SyncCreateRoom.SendMessageAsync(RoomName);
-            }
-            else
-            {
-                Debug.Log(returnRoomId.message);
-            }
-        });
+        seatSubmit_btn.onClick.AddListener(() =>
+       {
+            //UIBootstrap.Instance.CheckShowLoad(WaitShow);
+            WaitShow();
+       });
 
 
         off3_btn.onClick.AddListener(() =>
@@ -785,6 +766,33 @@ public class View_Panel2 : XUIPanel
         });
     }
 
+    private async void WaitShow()
+    {
+        append_room_panl.gameObject.SetActive(false);
+        distribution_panl.gameObject.SetActive(false);
+        selector_panl.gameObject.SetActive(false);
+        string accountInfo = AccountsInfo();
+        ReturnRoomID returnRoomId = await AsyncWebReq.Post<ReturnRoomID>(Url_GetRoomID + currentRoomName + "&MissionModel=" + currentMissionModel + "&ThinkingId=" + currentThinkingId + "&AccountsInfo=" + accountInfo, null);
+        if (returnRoomId.state)
+        {
+            string roomID = returnRoomId.data;
+
+            RoomState roomState = await AsyncWebReq.Post<RoomState>(Url_UpdateRoomState + roomID + "&state=0", null);
+            //创建房间
+            if (roomState.message == "success")
+            {
+                CreateRoomBase(returnRoomId.data, currentRoomName);
+                refresh_btn.onClick?.Invoke();
+            }
+            string RoomName = "createroom " + returnRoomId.data;
+            _ = AdamSync.SyncCreateRoom.SendMessageAsync(RoomName);
+        }
+        else
+        {
+            Debug.Log(returnRoomId.message);
+        }
+    }
+
 
     public string AccountsInfo()
     {
diff --git a/Assets/Zion/Scenes/InitConnect.unity b/Assets/Zion/Scenes/InitConnect.unity
index e6684906..959c8ee5 100644
--- a/Assets/Zion/Scenes/InitConnect.unity
+++ b/Assets/Zion/Scenes/InitConnect.unity
@@ -210,6 +210,8 @@ MonoBehaviour:
     state: 
     message: 
     data: []
+  loadingPanel: {fileID: 460561659324528917, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+    type: 3}
 --- !u!1 &2132962757
 GameObject:
   m_ObjectHideFlags: 0
diff --git a/Assets/Zion/Scenes/SampleScene.unity b/Assets/Zion/Scenes/SampleScene.unity
index ffbdf151..beb5a54e 100644
--- a/Assets/Zion/Scenes/SampleScene.unity
+++ b/Assets/Zion/Scenes/SampleScene.unity
@@ -470,7 +470,7 @@ PrefabInstance:
     - target: {fileID: 3263964912047736458, guid: c57206d8b4c25124a855fec64c26cd1e,
         type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3263964912052003704, guid: c57206d8b4c25124a855fec64c26cd1e,
         type: 3}
@@ -1312,6 +1312,12 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!224 &786631979 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+    type: 3}
+  m_PrefabInstance: {fileID: 460561659972351039}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &835460215
 GameObject:
   m_ObjectHideFlags: 0
@@ -1691,7 +1697,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1002176553
 RectTransform:
   m_ObjectHideFlags: 0
@@ -6622,6 +6628,7 @@ RectTransform:
   - {fileID: 1275324136}
   - {fileID: 544024020}
   - {fileID: 1473291347}
+  - {fileID: 786631979}
   m_Father: {fileID: 0}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -6707,6 +6714,125 @@ RectTransform:
   m_AnchoredPosition: {x: 301, y: -194}
   m_SizeDelta: {x: 400, y: 300}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1001 &460561659972351039
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1986907560}
+    m_Modifications:
+    - target: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 460561659324528916, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 460561659324528917, guid: d61f98bb55a26ec48b6a05359f4ecc8e,
+        type: 3}
+      propertyPath: m_Name
+      value: Loading
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d61f98bb55a26ec48b6a05359f4ecc8e, type: 3}
 --- !u!1001 &4190038652210028901
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -6722,7 +6848,7 @@ PrefabInstance:
     - target: {fileID: 4190038651080416002, guid: d69f70259c2b9364aaaebff19f477e6c,
         type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4190038651080416013, guid: d69f70259c2b9364aaaebff19f477e6c,
         type: 3}
diff --git a/Assets/Zion/Scripts/Adam/UIBootstrap.cs b/Assets/Zion/Scripts/Adam/UIBootstrap.cs
index 57a50dbe..638feccc 100644
--- a/Assets/Zion/Scripts/Adam/UIBootstrap.cs
+++ b/Assets/Zion/Scripts/Adam/UIBootstrap.cs
@@ -1,8 +1,10 @@
 using AdamThinkDevicesData;
 using PData;
 using RDate;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Events;
 using UnityEngine.SceneManagement;
 using static InterfaceManager;
 
@@ -16,11 +18,15 @@ public class UIBootstrap : MonoSingleton<UIBootstrap>
     public List<Traininginformation> traininginformations = new List<Traininginformation>();
     public AdamThinkDevicesData.DeviceData thinkDevicesData = new AdamThinkDevicesData.DeviceData();
     public RoomData roomdata = new RoomData();
+    public GameObject loadingPanel;
+    public GameObject go;
+    public GameObject loadTem;
     //public RSData.RoomSubjectData currentRoomData = new RSData.RoomSubjectData();
 
     // Start is called before the first frame update
     private async void Start()
     {
+
         sceneInfoUrl = Url_GetSceneInfo;
         //Debug.LogError(Url_GetAllThinkData);
         editinformation = await AsyncWebReq.Post<Editinformation>(Url_GetAllThinkData, null);
@@ -31,7 +37,7 @@ public class UIBootstrap : MonoSingleton<UIBootstrap>
             traininginformations.Add(t);
         }
         AdamSync.SyncCreateRoom.leaveRoomRequset += OnLeaveRoomInfo;
-      
+
     }
 
 
@@ -115,7 +121,7 @@ public class UIBootstrap : MonoSingleton<UIBootstrap>
         return false;
     }
 
-   
+
 
     public void OnLeaveRoomInfo(string msg)
     {
@@ -123,7 +129,26 @@ public class UIBootstrap : MonoSingleton<UIBootstrap>
         SceneManager.LoadScene("SampleScene");
     }
 
+    /// <summary>
+    /// 控制load界面显示隐藏
+    /// </summary>
+    public void CheckShowLoad(UnityAction callback = null)
+    {
+        if (go == null)
+            go = GameObject.Find("UIRoot");
+        if (loadTem == null)
+            loadTem = Instantiate(loadingPanel, go.transform);
+        StopCoroutine(ShowLoad(callback));
+        StartCoroutine(ShowLoad(callback));
+    }
 
+    private IEnumerator ShowLoad(UnityAction callback = null)
+    {
+        loadTem.SetActive(true);
+        yield return new WaitForSeconds(0.1f);
+        loadTem.SetActive(false);
+        callback?.Invoke();
+    }
 
 
     private void OnDisable()
diff --git a/Assets/Zion/Scripts/Adam/Utility/Net/AsyncWebReq.cs b/Assets/Zion/Scripts/Adam/Utility/Net/AsyncWebReq.cs
index 311efb03..902fee4b 100644
--- a/Assets/Zion/Scripts/Adam/Utility/Net/AsyncWebReq.cs
+++ b/Assets/Zion/Scripts/Adam/Utility/Net/AsyncWebReq.cs
@@ -6,6 +6,7 @@ using System.Text;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using System.Collections;
+using System.Threading.Tasks;
 
 /// <summary>
 /// 异步封装unityWebRequest请求
@@ -14,6 +15,7 @@ public static class AsyncWebReq
 {
     public static async UniTask<T> Get<T>(string endpoint)
     {
+        //Task.Delay(10000).Wait();
         var getRequest = CreateRequest(endpoint);
         await getRequest.SendWebRequest();
 #if UNITY_EDITOR
@@ -27,6 +29,7 @@ public static class AsyncWebReq
 
     public static async UniTask<T> Post<T>(string endpoint, object payload)
     {
+        //Task.Delay(10000).Wait();
         var postRequest = CreateRequest(endpoint, RequestType.POST, payload);
         await postRequest.SendWebRequest();
 #if UNITY_EDITOR
@@ -56,7 +59,7 @@ public static class AsyncWebReq
         return request;
     }
 
-    public static IEnumerator PostData2(string url, Dictionary<string, string> keyValuePairs, System.Action<string> action=null)
+    public static IEnumerator PostData2(string url, Dictionary<string, string> keyValuePairs, System.Action<string> action = null)
     {
         WWWForm form = new WWWForm();