修改诸多Bug

Assets/Game/Blue/Controller/ShowHide_Toggle.cs

@@ -8,6 +8,7 @@ public class ShowHide_Toggle : MonoBehaviour, IPointerEnterHandler, IPointerExit
 {
     public List<Sprite> SpriteList;
     public Image mImage;
+    public bool isRoomMain;
     private Toggle toggle;
     private IQueueSystem mQueueSystem;
 
@@ -22,7 +23,25 @@ public class ShowHide_Toggle : MonoBehaviour, IPointerEnterHandler, IPointerExit
     private void OnEnable()
     {
         Debug.Log($"打开的数量：{mQueueSystem.Level3QueueCount.Value}");
-        isShow = toggle.isOn;
+
+        if(isRoomMain)
+        {
+            bool state = false;
+            foreach (var item in mQueueSystem.Level3List)
+            {
+                state = item.activeSelf;
+            }
+            toggle.isOn = state;
+            isShow = toggle.isOn;
+            ShowHideLevel3(state);
+        }
+        else
+        {
+            toggle.isOn = true;
+            isShow = toggle.isOn;
+            ShowHideLevel3(true);
+        }
+      
     }
 
     public void OnPointerEnter(PointerEventData eventData)

Assets/Game/Blue/RTC/Service/RTCService.cs

@@ -33,10 +33,17 @@ public class RTCService : IRTCService
             HttpTool.Instance.SendHttp(HttpActionLang.rtc_CreateRoom, "", message =>
             {
                 JObject jobject = JObject.Parse(message);
+                Debug.Log("DGJ ===>  CreateRoom  "+ message);
+
+            //    "Request Timeout"
                 if (jobject["code"].ToString() == "200" && !string.IsNullOrWhiteSpace(jobject["data"].ToString()))
                 {
                     this.SendEvent(new RTCCreatRoomSuccessEvent() { rtcRoomInfo = jobject["data"].ToString() });
                 }
+                else if(jobject["code"].ToString() == "503")
+                {
+                    RTCRoomManager.Instance.isRTCreate = true;
+                }
             }, "application/x-www-form-urlencoded"));
     }
 

Assets/Game/ShowChoose/ChooseManager.cs

@@ -78,7 +78,7 @@ public class ChooseManager : MonoBehaviour,IController
         Debug.Log("DGJ  =======> " +transform.position);
 
         BladeServerManager.Instance.isDaoHang = false;
-
+        ShowHideLevel3(true);
     }
 
     private void Update()
@@ -98,6 +98,8 @@ public class ChooseManager : MonoBehaviour,IController
         }
     }
 
+  
+
     #region 事件监听
     private void mQueueSystemCountNotNull(int newCount)
     {

Assets/Game/ShowLogin/LangChaoLogin.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using Agora.Rtc.LitJson;
+using Blue;
 using Newtonsoft.Json.Linq;
 using SC.XR.Unity;
 using UnityEngine;
@@ -27,9 +28,17 @@ namespace GHZLangChao
             mAccount_Input.onEndEdit.AddListener(OnAccountEndEdit);
             mPassword_Input.onEndEdit.AddListener(OnPasswordEndEdit);
             mLogin_Btn.onClick.AddListener(OnClickLogin);
+
+            mAccountStr = "13910723157";
+            mPasswordStr = "1";
 #if UNITY_EDITOR
-           // OnClickLogin();
+            // OnClickLogin();
+            mAccountStr = "18767144539";
 #endif
+            mAccount_Input.text = mAccountStr;
+            mPassword_Input.text = mPasswordStr;
+
+
         }
 
         /// <summary>
@@ -54,8 +63,8 @@ namespace GHZLangChao
         private void OnClickLogin()
         {
 #if UNITY_EDITOR
-            mAccountStr = "dgj1";
-            mPasswordStr = "1";
+            //mAccountStr = "13910723157";
+            //mPasswordStr = "1";
 #endif
             mAccount_Input.text = mAccountStr;
             mPassword_Input.text = mPasswordStr;
@@ -123,12 +132,16 @@ namespace GHZLangChao
               
 
                 MQTTManager.Instance.Signal();
+
+               
             }
             else
             {
                 Debug.LogError("获取用户信息失败 ！！！" + obj["code"].ToString());
             }
         }
+
+       
     }
 
 

Assets/Game/ShowSupport/ShowRtc.prefab

@@ -930,9 +930,9 @@ RectTransform:
   m_Father: {fileID: 372168226550290580}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 1034.8295, y: -420}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1600, y: 144}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2467664462275900261
@@ -1519,9 +1519,9 @@ RectTransform:
   m_Father: {fileID: 372168226550290580}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 1034.8295, y: -246}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1600, y: 144}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2792716997211558038
@@ -2481,6 +2481,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 45952f334976d2647ba6af3e2fb5bb0e, type: 3}
   - {fileID: 21300000, guid: 7416d0026c4d26248a5fd85a85becef5, type: 3}
   mImage: {fileID: 3312468753262583349}
+  isRoomMain: 0
 --- !u!1 &5947253808657440819
 GameObject:
   m_ObjectHideFlags: 0
@@ -2592,9 +2593,9 @@ RectTransform:
   m_Father: {fileID: 372168226550290580}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 1034.8295, y: -72}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1600, y: 144}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1586159309132858650

Assets/Game/ShowSupport/SupportControl.cs

@@ -129,6 +129,8 @@ public class SupportControl : AbstractController
       
     }
 
+    
+
     public void LeaveRoom()
     {
         RTCRoomManager.Instance.LeaveChannel();

Assets/Game/ShowXunJian/XunJianManager.cs

@@ -25,12 +25,20 @@ namespace GHZLangChao
         [SerializeField] private Button Nav_Btn; // 导航按钮
         [SerializeField] private GameObject Retract_go; // 收起
         [SerializeField] private GameObject Expand_go; // 展开
+
+        private IQueueSystem mQueueSystem;
+
         public GameObject UI_go;
 
         public UnityEvent OnReset = new UnityEvent();
         public UnityEvent OnRetract = new UnityEvent();
         public UnityEvent OnExpand = new UnityEvent();
 
+        private void Awake()
+        {
+            mQueueSystem = this.GetService<IQueueSystem>();
+            mQueueSystem.Level3QueueCount.Register(mQueueSystemCountNotNull).UnRegisterWhenGameObjectDestroyed(gameObject);
+        }
         void Start()
         {
 #if UNITY_EDITOR
@@ -42,6 +50,7 @@ namespace GHZLangChao
             Titile_Btn.onClick.AddListener(ClickTitle);
             //UICallManager.Instance.MachineRoomInit();
             XRRGBCamera.Instance.stopCamera();
+           
             Init();
         }
 
@@ -193,5 +202,23 @@ namespace GHZLangChao
 #endif
             OnReset?.Invoke();
         }
+
+        private void OnEnable()
+        {
+            ShowHideLevel3(true);
+        }
+
+        private void ShowHideLevel3(bool on)
+        {
+            Debug.Log("Level3Queue:" + mQueueSystem.Level3List.Count);
+            foreach (var go in mQueueSystem.Level3List)
+            {
+                go.SetActive(on);
+            }
+        }
+        private void mQueueSystemCountNotNull(int newCount)
+        {
+            Debug.Log($"打开的数量：{mQueueSystem.Level3QueueCount.Value}");
+        }
     }
 }

Assets/LangChaoRTC/Remote/PopPublic/PDFViewer.prefab

@@ -6239,7 +6239,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: -0.016418457}
+  m_AnchoredPosition: {x: 0, y: -0.0030822754}
   m_SizeDelta: {x: -20, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &3062369171293304398
@@ -6458,6 +6458,7 @@ MonoBehaviour:
   canTwoHandScale: 0
   minScaleRatio: 0.8
   maxScaleRatio: 3
+  isParentDrag: 0
 --- !u!114 &3062369171311368098
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -6478,13 +6479,10 @@ MonoBehaviour:
   scaleMinimum: 0.2
   activeScaleMaxRestrict: 0
   scaleMaximum: 2
-  scaleHandleSize: 0.016
   BoundBoxCollider: {fileID: 0}
-  rotationHandleSize: 0.016
   showRotationHandleForX: 1
   showRotationHandleForY: 1
   showRotationHandleForZ: 0
-  axisScaleHandleSize: 0.016
   activeAxis: 4
   RotateStartAudio: 4
   RotateStopAudio: 3
@@ -6824,7 +6822,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -0.03100586, y: -0.01675415}
+  m_AnchoredPosition: {x: 0.04425049, y: 0.012680054}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3062369171367763196
@@ -7766,8 +7764,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 3062369170313225778}
   m_HandleRect: {fileID: 3062369170313225776}
   m_Direction: 0
-  m_Value: 0
-  m_Size: 1
+  m_Value: 1
+  m_Size: 0.9999706
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -10507,8 +10505,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 3062369170679136094}
   m_HandleRect: {fileID: 3062369170679136092}
   m_Direction: 2
-  m_Value: 0
-  m_Size: 1
+  m_Value: 1
+  m_Size: 0.99996513
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -10834,8 +10832,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 3062369170267795881}
   m_HandleRect: {fileID: 3062369170267795887}
   m_Direction: 2
-  m_Value: 0
-  m_Size: 1
+  m_Value: 1
+  m_Size: 0.9999647
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -13313,7 +13311,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 807604210ed46d341b987bf85827d6a4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 8022a6ad5c7296446b27c19fc1b4dac4, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/LangChaoRTC/Remote/PopPublic/PopCall.prefab

@@ -274,4 +274,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1d1178d01127a344196d3aaf52e0dcf0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  mp4Item: {fileID: 2283116017620586622, guid: a51449b53667299408997cdcdf37b2d5, type: 3}
+  mp4Item: {fileID: 2283116017620586622, guid: 43e4582d7e49ad448a649b353a42b8aa, type: 3}

Assets/LangChaoRTC/Remote/ShowRoom/RemoteVideoControl.cs

@@ -36,6 +36,7 @@ public class RemoteVideoControl : MonoBehaviour
         {
             //  videoPlayer?.Play();
             avProVideoPlayer?.Play();
+            slider.value = 0;
         }
         else
         {
@@ -136,7 +137,10 @@ public class RemoteVideoControl : MonoBehaviour
                 float nowTimer = avProVideoPlayer.GetNowTimer();
                 textTotalTime.text = string.Format("{0}:{1}", (maxTimer / 60).ToString("00"), (maxTimer % 60).ToString("00"));
                 currentTime.text = string.Format("{0}:{1}", (nowTimer / 60).ToString("00"), (nowTimer % 60).ToString("00"));
-                slider.value = nowTimer/ maxTimer;
+
+              //  if(slider.value!=1)
+              float value = nowTimer / maxTimer;
+                slider.value = value;
 
                 //if (textTotalTime.text == currentTime.text)
                 //{

Assets/LangChaoRTC/Remote/ShowRoom/RoomFile.prefab

@@ -552,10 +552,10 @@ MonoBehaviour:
   m_Padding:
     m_Left: 5
     m_Right: 0
-    m_Top: 5
-    m_Bottom: 0
+    m_Top: 10
+    m_Bottom: 10
   m_ChildAlignment: 0
-  m_Spacing: 4
+  m_Spacing: 10
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -591,7 +591,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   Item: {fileID: 326842007013501043, guid: 8159e16c99a3d9548b98bc48e0a86dda, type: 3}
   MesItem: {fileID: 5295285540490895468, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
-  FileContent: {fileID: 0}
+  FileContent: {fileID: 7873290928976605117}
 --- !u!114 &5943655452686084605
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1555,9 +1555,13 @@ PrefabInstance:
       propertyPath: m_AnchorMin.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5295285539923751734, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5295285539923751734, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 20
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5295285539923751734, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -1593,7 +1597,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5295285540247215454, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 138.455
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5295285540247215454, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -1669,7 +1673,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5295285540490895475, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -1705,7 +1709,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5295285541080847994, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 537.75
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a5c61b9b0b4aa184cbc1f6ef6eb326fe, type: 3}

Assets/LangChaoRTC/Remote/ShowRoom/RoomInvite/Prefab/InviteDlg.prefab

@@ -757,7 +757,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
+  m_PresetInfoIsWorld: 1
 --- !u!114 &2799213986232774074
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/LangChaoRTC/Remote/ShowRoom/RoomInvite/Prefab/Mp4Item.prefab

@@ -1018,7 +1018,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 807604210ed46d341b987bf85827d6a4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 8022a6ad5c7296446b27c19fc1b4dac4, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1458,7 +1458,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0.4509804, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/LangChaoRTC/Remote/ShowRoom/RoomInvite/Prefab/Mp4Item.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a51449b53667299408997cdcdf37b2d5
+guid: 43e4582d7e49ad448a649b353a42b8aa
 PrefabImporter:
   externalObjects: {}
   userData: 

Assets/LangChaoRTC/Remote/ShowRoom/RoomInvite/Prefab/MsgItem.prefab

@@ -37,7 +37,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 20, y: 0}
-  m_SizeDelta: {x: 717.5, y: 0}
+  m_SizeDelta: {x: 685.0027, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5295285539923751739
 CanvasRenderer:
@@ -609,7 +609,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 502.75, y: 0}
+  m_AnchoredPosition: {x: 487.3098, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5295285541080847998

Assets/LangChaoRTC/Remote/ShowRoom/RoomInvite/Prefab/PngJpgItem.prefab

@@ -66,7 +66,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 807604210ed46d341b987bf85827d6a4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 8022a6ad5c7296446b27c19fc1b4dac4, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/LangChaoRTC/Remote/ShowRoom/RoomInvite/Prefab/PrintscreenItem.prefab

@@ -30,6 +30,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 0, z: -0.0039520683}
   m_LocalScale: {x: 0.000053900163, y: 0.000053900163, z: 0.000053900134}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2283116017620586623}
   m_RootOrder: 5
@@ -62,12 +63,12 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 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: 807604210ed46d341b987bf85827d6a4, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 8022a6ad5c7296446b27c19fc1b4dac4, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -111,6 +112,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls:
       - m_Target: {fileID: 0}
+        m_TargetAssemblyTypeName: 
         m_MethodName: Click
         m_Mode: 1
         m_Arguments:
@@ -121,28 +123,18 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   onEnter:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   onDown:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   onUp:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   onExit:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   initScale: {x: 0, y: 0, z: 0}
   initPosition: {x: 0, y: 0, z: 0}
 --- !u!1 &2283116017366872120
@@ -173,6 +165,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.003438143}
   m_LocalScale: {x: 0.1199842, y: 0.1199842, z: 0.1199842}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2283116017620586623}
   m_RootOrder: 0
@@ -205,11 +198,11 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 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: a4fd6618ad6705f45a29ed74b820f9d1, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
@@ -248,6 +241,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.003438143}
   m_LocalScale: {x: 0.000035724504, y: 0.000035724504, z: 0.000035724504}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2283116017620586623}
   m_RootOrder: 2
@@ -280,11 +274,11 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 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: 50
@@ -330,6 +324,7 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0.4, y: 0, z: 0.8}
   m_LocalScale: {x: 2.7922, y: 2.7922, z: 2.7922}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2283116017366872121}
   - {fileID: 2847491637754489257}
@@ -368,26 +363,15 @@ MonoBehaviour:
   activation: 1
   flattenAxis: 4
   activeHandle: 6
-  boxFocusDisplayMat: {fileID: 2100000, guid: 4a9aae3094118f44593e7f8000e24c31, type: 2}
-  boxGrabDisplayMat: {fileID: 2100000, guid: 7e4095c5609075846b657c8917aae797, type: 2}
-  HandleMaterial: {fileID: 2100000, guid: 986558eab447a9847bbe138149edc1b4, type: 2}
-  HandleGrabMaterial: {fileID: 2100000, guid: bf37b5eab60b288498d02fd524325d10, type: 2}
-  CornerPrefab: {fileID: 1361136173122186969, guid: ba9083550f965e545a628b53bfa80c9e,
-    type: 3}
-  CornerSlatePrefab: {fileID: 1134031327877807717, guid: c45e552a6d92491468c421c35c5dd63d,
-    type: 3}
+  m_HandlerAssets: {fileID: 0}
+  activeScaleMinRestrict: 1
   scaleMinimum: 0.2
+  activeScaleMaxRestrict: 0
   scaleMaximum: 2
-  scaleHandleSize: 0.016
   BoundBoxCollider: {fileID: 0}
-  SidePrefab: {fileID: 3868891704370700786, guid: 969c9b04d1b1848489de0d6efe6250fc,
-    type: 3}
-  rotationHandleSize: 0.016
   showRotationHandleForX: 0
   showRotationHandleForY: 1
   showRotationHandleForZ: 0
-  facePrefab: {fileID: 0}
-  axisScaleHandleSize: 0.016
   activeAxis: 36
   RotateStartAudio: 4
   RotateStopAudio: 3
@@ -396,33 +380,21 @@ MonoBehaviour:
   RotateStarted:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   RotateStopped:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   ScaleStarted:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   ScaleStopped:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   Rotating:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   Scaling:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
 --- !u!114 &2283116017620586616
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -451,41 +423,32 @@ MonoBehaviour:
   PointerEnter:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: PointerUnityEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
-      PublicKeyToken=null
   PointerDown:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: PointerUnityEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
-      PublicKeyToken=null
   PointerClick:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: PointerUnityEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
-      PublicKeyToken=null
   PointerUp:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: PointerUnityEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
-      PublicKeyToken=null
   PointerExit:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: PointerUnityEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
-      PublicKeyToken=null
   PointerDrag:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: PointerUnityEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
-      PublicKeyToken=null
   Target: {fileID: 0}
   StartAudio: 6
   EndAudio: 5
+  headRotate: 0
+  oneGameControllerRotate: 0
   canOneHandRotate: 0
   canTwoHandRotate: 0
   canTwoHandScale: 0
   minScaleRatio: 0.8
   maxScaleRatio: 3
+  isParentDrag: 0
 --- !u!114 &5613522415721168734
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -532,6 +495,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.0039520683}
   m_LocalScale: {x: 0.000053900134, y: 0.000053900134, z: 0.000053900134}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2283116017620586623}
   m_RootOrder: 4
@@ -564,12 +528,12 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 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: e3b9bce004c69cd42ac3592aaf78e3d8, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 8022a6ad5c7296446b27c19fc1b4dac4, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -612,28 +576,18 @@ MonoBehaviour:
   onClick:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   onEnter:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   onDown:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   onUp:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   onExit:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   initScale: {x: 0, y: 0, z: 0}
   initPosition: {x: 0, y: 0, z: 0}
 --- !u!1 &4243057379313034182
@@ -664,6 +618,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.003438143}
   m_LocalScale: {x: 0.00035814047, y: 0.00035814047, z: 0.00035814047}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2283116017620586623}
   m_RootOrder: 3
@@ -696,11 +651,11 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 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_Texture: {fileID: 2800000, guid: 10d95306bc82062499b518502f699cf1, type: 3}
   m_UVRect:
     serializedVersion: 2
@@ -736,6 +691,7 @@ RectTransform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0.003438143}
   m_LocalScale: {x: 0.1199842, y: 0.1199842, z: 0.1199842}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2283116017620586623}
   m_RootOrder: 1
@@ -768,11 +724,11 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 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: d6e3829de74df9442ad78437fcdd60b2, type: 3}
   m_Type: 0
   m_PreserveAspect: 0

Assets/LangChaoRTC/Remote/ShowRoom/RoomInvite/Scripts/FileList.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UI;
 using XRTool.Util;
 
 public class FileList : UnitySingleton<FileList>
@@ -57,7 +58,8 @@ public class FileList : UnitySingleton<FileList>
         if (FileContent == null)
             FileContent = transform.GetComponent<RectTransform>();
         else
-            FileContent.anchoredPosition3D += new Vector3(0, 100, 0);
+            FileContent.anchoredPosition3D += new Vector3(0, 300, 0);
+        LayoutRebuilder.ForceRebuildLayoutImmediate(FileContent);
     }
 
     public void AddMsgItem(Sprite head, string name , string msg)
@@ -69,7 +71,8 @@ public class FileList : UnitySingleton<FileList>
         if (FileContent == null)
             FileContent = transform.GetComponent<RectTransform>();
         else
-            FileContent.anchoredPosition3D += new Vector3(0, 100, 0);
+            FileContent.anchoredPosition3D += new Vector3(0, 300, 0);
+        LayoutRebuilder.ForceRebuildLayoutImmediate(FileContent);
     }
 
     public void RemoveItem(FileConfig fileConfig)

Assets/LangChaoRTC/Remote/ShowRoom/RoomMain.prefab

@@ -4421,6 +4421,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 45952f334976d2647ba6af3e2fb5bb0e, type: 3}
   - {fileID: 21300000, guid: 7416d0026c4d26248a5fd85a85becef5, type: 3}
   mImage: {fileID: 8041133824467914880}
+  isRoomMain: 1
 --- !u!1 &5918645315284992090
 GameObject:
   m_ObjectHideFlags: 0

Assets/Resources/DataItem.prefab

@@ -216,7 +216,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 2147483647
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &8016706206688060885
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Scenes/LangChaoDemo2.unity

@@ -9827,6 +9827,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 3098302889536018303, guid: 0301f7e8d5359e544955cd429da8a623, type: 3}
+      propertyPath: field of view
+      value: 34
+      objectReference: {fileID: 0}
     - target: {fileID: 3098302889823845645, guid: 0301f7e8d5359e544955cd429da8a623, type: 3}
       propertyPath: participantViewPrefab
       value: 
@@ -20617,6 +20621,7 @@ MonoBehaviour:
   phone: 
   roleId: 
   resourcePool: 
+  resourcePoolId: 0
   expertType: 
   _username: 
   room: 
@@ -28273,9 +28278,14 @@ MonoBehaviour:
   global: 1
   expertView: {fileID: 0}
   rawImage: {fileID: 877159229}
+  mRTCRoomInfo:
+    roomId: 
+    token: 
+    host: 
   question: 0
   rtcState: 0
   controlPhone: 
+  isRTCreate: 0
 --- !u!114 &973110132107938483
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Scripts/Data/DataItem.cs

@@ -136,7 +136,7 @@ public class DataItem : MonoBehaviour
         //}
 
        float dis = Vector3.Distance(new Vector3(transform.position.x, 0, transform.position.z), new Vector3(OpenXRCamera.Instance.head.transform.position.x, 0, OpenXRCamera.Instance.head.transform.position.z));
-
+        Debug.Log(dis + " Dis   DGJ   ===>  " + BladeServerManager.Instance.fadeDis);
         if (dis > BladeServerManager.Instance.fadeDis)
             Hide();
 

Assets/Scripts/MQTT/MQTTManager.cs

@@ -6,8 +6,9 @@ using System.Collections.Generic;
 using System.Text;
 using UnityEngine;
 using static LangChaoRommMinIo;
+using Blue;
 
-public class MQTTManager : MonoSingleton<MQTTManager>
+public class MQTTManager : MonoSingleton<MQTTManager>,IController
 {
 
     public string front = "client/";
@@ -57,6 +58,8 @@ public class MQTTManager : MonoSingleton<MQTTManager>
             MQTTManager.Instance.id = obj["data"]["clientId"].ToString();
             MQTTManager.Instance.username = obj["data"]["username"].ToString();
             MQTTClient.Instance.Connect();
+
+          //  StartCoroutine(TestCreateRoom());
         }
         else
         {
@@ -64,6 +67,16 @@ public class MQTTManager : MonoSingleton<MQTTManager>
         }
     }
 
+    private IEnumerator TestCreateRoom()
+    {
+        yield return new WaitForSeconds(5);
+        while (!RTCRoomManager.Instance.isRTCreate)
+        {
+            yield return new WaitForSeconds(1);
+            this.GetService<IRTCService>().CreatRoom();
+        }
+    }
+
     private void UserInfoCallBack(string msg)
     {
         Debug.Log(msg);
@@ -151,13 +164,30 @@ public class MQTTManager : MonoSingleton<MQTTManager>
 
                 if(obj["control"] !=null)
                 {
-                    //string roomid = obj["rtcRoom"].ToString();
                     string phone = obj["control"]["phone"].ToString();
-                    //string resourcePool = obj["control"]["resourcePoo1"].ToString();
-                    UICallManager.Instance.EventInvite(obj["control"].ToString(),"");
-                    Debug.Log(phone);
                     RTCRoomManager.Instance.controlPhone = phone;
                    
+                    if(RTCRoomManager.Instance.rtcState != RTCEnum.OFF) // 当前已经在房间内 直接发送当前房间号
+                    {
+                        JsonData data = new JsonData();
+                        data["action"] = "invite";
+                        data["rtcRoom"] =RTCRoomManager.Instance.mRTCRoomInfo.roomId.ToString();
+                        data["personnel"] = new JsonData();
+                        data["personnel"]["id"] = MQTTManager.Instance.id;
+                        data["personnel"]["name"] = MQTTManager.Instance._username;
+                        data["personnel"]["resourcePoo1"] = MQTTManager.Instance.resourcePool;
+                        data["personnel"]["room"] = MQTTManager.Instance.room;
+                        data["personnel"]["phone"] = MQTTManager.Instance.phone;
+                        // 用MQTT 向中考发送邀请
+                        MQTTManager.Instance.PushMsg(MQTTManager.Instance.front + "online/" + phone, data.ToJson());
+                    }
+                    else // 不在房间内，创建房间后 发送邀请
+                    {
+                        //string roomid = obj["rtcRoom"].ToString();                       
+                        //string resourcePool = obj["control"]["resourcePoo1"].ToString();
+                        UICallManager.Instance.EventInvite(obj["control"].ToString(), "");
+                        Debug.Log(phone);
+                    }
                 }
                 else
                 {

Assets/Scripts/RTC/RTCRoomManager.cs

@@ -13,7 +13,7 @@ public class RTCRoomManager : MonoSingleton<RTCRoomManager>, IController
 
     public RawImage rawImage;
 
-    private RTCRoomInfo mRTCRoomInfo;
+    public RTCRoomInfo mRTCRoomInfo;
 
     public QuestionEnum question;
 
@@ -23,12 +23,15 @@ public class RTCRoomManager : MonoSingleton<RTCRoomManager>, IController
 
     public JObject expertData;
     public JObject controlData;
+
+    public bool isRTCreate;
     private void Start()
     {
         this.RegisterEvent<RTCCreatRoomSuccessEvent>(CreatRoomSuccess).UnRegisterWhenGameObjectDestroyed(gameObject);
 
         rtcState = RTCEnum.OFF;
         question = QuestionEnum.NetWork;
+        isRTCreate = false;
     }
     private void Update()
     {
@@ -38,6 +41,11 @@ public class RTCRoomManager : MonoSingleton<RTCRoomManager>, IController
             OnLocalUserJoined();
         }
 
+        if(isRTCreate)
+        {
+            isRTCreate = false;
+            this.GetService<IRTCService>().CreatRoom();
+        }
        
     }
 
@@ -236,12 +244,13 @@ public class RTCRoomManager : MonoSingleton<RTCRoomManager>, IController
                 break;
         }
 
-        if(rtcState != RTCEnum.OFF&& ScenesManager.Instance.getWindow() != ScenesManager.SceneType.ShowRoom)
+        if(rtcState != RTCEnum.OFF&& !(ScenesManager.Instance.getWindow() == ScenesManager.SceneType.ShowRoom|| ScenesManager.Instance.getWindow() == ScenesManager.SceneType.ShowRTC))
         {
             Debug.Log(" GETWindow Scenes   " + ScenesManager.Instance.getWindow());
             // 退出房间
             LeaveChannel();
         }
+         
     }
 
     public void LeaveChannel()
@@ -250,7 +259,7 @@ public class RTCRoomManager : MonoSingleton<RTCRoomManager>, IController
         RTCManager.Instance.LeaveChannel();
         rtcState = RTCEnum.OFF;
         ClearRoomData();
-       
+
     }
 
     private void ClearRoomData()

Assets/Scripts/UICallManager.cs

@@ -84,6 +84,7 @@ public class UICallManager : MonoSingleton<UICallManager>,IController
     {
         // this.GetService<IRTCService>().JoinRoom(roomId);
         this.GetService<IRTCService>().CreatRoom();
+      
     }
 
     public void OntimeOut()