Browse Source

解決一些BUG

胡佳骏 1 year ago
parent
commit
62cd7a759c

+ 5 - 5
Assets/GHZScritps/AgoraRTCManager.cs

@@ -428,11 +428,11 @@ public class AgoraRTCManager : SingletonMono<AgoraRTCManager>
                 {
                     case REMOTE_VIDEO_STATE_REASON.REMOTE_VIDEO_STATE_REASON_INTERNAL:
                         break;
-                    case REMOTE_VIDEO_STATE_REASON.REMOTE_VIDEO_STATE_REASON_NETWORK_CONGESTION://网络阻塞ã€
+                    case REMOTE_VIDEO_STATE_REASON.REMOTE_VIDEO_STATE_REASON_NETWORK_CONGESTION://网络阻塞�
 
                         //  listCustomPeer[i].isVideo = false;
                         break;
-                    case REMOTE_VIDEO_STATE_REASON.REMOTE_VIDEO_STATE_REASON_NETWORK_RECOVERY:// 网络æ�¢å¤�正常ã€
+                    case REMOTE_VIDEO_STATE_REASON.REMOTE_VIDEO_STATE_REASON_NETWORK_RECOVERY:// 网络��正常�
 
                         //  listCustomPeer[i].isVideo = true;
                         break;
@@ -444,17 +444,17 @@ public class AgoraRTCManager : SingletonMono<AgoraRTCManager>
 
                         listCustomPeer[i].isOpenVideo = false;
                         break;
-                    case REMOTE_VIDEO_STATE_REASON.REMOTE_VIDEO_STATE_REASON_REMOTE_MUTED://远端用户å�œæ­¢å�‘é€�视频æµ�或远端用户ç¦�用视频模å�—ã€
+                    case REMOTE_VIDEO_STATE_REASON.REMOTE_VIDEO_STATE_REASON_REMOTE_MUTED://远端用户�止��视频�或远端用户�用视频模��
 
                         listCustomPeer[i].isVideo = false;
                         //  CloseAgoraMainImage(listCustomPeer[i].peerId, false);
                         break;
-                    case REMOTE_VIDEO_STATE_REASON.REMOTE_VIDEO_STATE_REASON_REMOTE_UNMUTED://远端用户æ�¢å¤�å�‘é€�视频æµ�或远端用户å�¯ç”¨è§†é¢‘模å�—ã€
+                    case REMOTE_VIDEO_STATE_REASON.REMOTE_VIDEO_STATE_REASON_REMOTE_UNMUTED://远端用户����视频�或远端用户�用视频模��
 
                         listCustomPeer[i].isVideo = true;
                         //  CloseAgoraMainImage(listCustomPeer[i].peerId, true);
                         break;
-                    case REMOTE_VIDEO_STATE_REASON.REMOTE_VIDEO_STATE_REASON_REMOTE_OFFLINE: //远端用户离开频é�“ã€
+                    case REMOTE_VIDEO_STATE_REASON.REMOTE_VIDEO_STATE_REASON_REMOTE_OFFLINE: //远端用户离开频��
 
                         listCustomPeer[i].isVideo = false;
                         break;

+ 1 - 1
Assets/Studio/MediaSoup/Scripts/SCRtc/SCRtcHandle.cs

@@ -33,7 +33,7 @@ public class SCRtcHandle
     public void goThread()
     {
         //Debug.Log("goThread=============>");
-        mSCRtcEngine.send(jsondata);
+       // mSCRtcEngine.send(jsondata);
     }
         //加入RTC
     public void InitRTC(SCRtcConfig scC)

+ 36 - 14
Assets/Studio/Scenes/Logo/Logo.unity

@@ -240,7 +240,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!114 &57375766
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -335,12 +335,6 @@ Transform:
   m_Father: {fileID: 1211878897}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &139663243 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7361397498185573409, guid: 7cd0ceba7525bdc42a36be841a8aad16,
-    type: 3}
-  m_PrefabInstance: {fileID: 1836526756}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &150047291
 GameObject:
   m_ObjectHideFlags: 0
@@ -386,6 +380,7 @@ GameObject:
   - component: {fileID: 623507475}
   - component: {fileID: 623507477}
   - component: {fileID: 623507476}
+  - component: {fileID: 623507478}
   m_Layer: 10
   m_Name: Quad
   m_TagString: Untagged
@@ -458,6 +453,20 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 623507474}
   m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &623507478
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 623507474}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d4c33e92d8dc2934e919ffa2ff71afd6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  CaptureImage: {fileID: 0}
+  RGBCamTexture: {fileID: 0}
 --- !u!1 &653649476
 GameObject:
   m_ObjectHideFlags: 0
@@ -1883,6 +1892,12 @@ Canvas:
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
+--- !u!4 &1780107079 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16,
+    type: 3}
+  m_PrefabInstance: {fileID: 1836526756}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1836526756
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1955,6 +1970,16 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9056915208821754902, guid: 7cd0ceba7525bdc42a36be841a8aad16,
+        type: 3}
+      propertyPath: m_CullingMask.m_Bits
+      value: 8759
+      objectReference: {fileID: 0}
+    - target: {fileID: 9076914349180199080, guid: 7cd0ceba7525bdc42a36be841a8aad16,
+        type: 3}
+      propertyPath: m_CullingMask.m_Bits
+      value: 8759
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
 --- !u!1 &1884441341
@@ -3678,15 +3703,12 @@ MonoBehaviour:
   m_HideMobileInput: 0
   m_CharacterValidation: 0
   m_CharacterLimit: 11
-  m_OnSubmit:
+  m_OnEndEdit:
     m_PersistentCalls:
       m_Calls: []
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_OnDidEndEdit:
-    m_PersistentCalls:
-      m_Calls: []
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_CustomCaretColor: 0
   m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
@@ -3699,7 +3721,6 @@ MonoBehaviour:
   m_CustomPosition: {x: 0, y: 0, z: 0}
   m_CustomRotation: {x: 0, y: 0, z: 0}
   m_CustomLocalScale: {x: 0, y: 0, z: 0}
-  m_ShouldActivateOnSelect: 0
 --- !u!224 &4695612440369256485
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3757,7 +3778,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 487e41395a576b843a17ce5c473a6679, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  buildConfig: {fileID: 0}
+  buildConfig: {fileID: 11400000, guid: cf8c566bc49517944a5f594a3f752899, type: 2}
   isOutLogEditor: 1
   mainBody: {fileID: 0}
   ARSDKName: SDKSystem
@@ -3823,7 +3844,7 @@ Transform:
   m_Children:
   - {fileID: 3694994520887372816}
   - {fileID: 3694994520946098762}
-  - {fileID: 139663243}
+  - {fileID: 1780107079}
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3856,6 +3877,7 @@ MonoBehaviour:
   _token: 
   _channelName: 
   isSwitchCamera: 0
+  cam2: {fileID: 1884441344}
 --- !u!114 &5394885976978340330
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 2 - 0
Assets/Studio/Scripts/PlayerView/PlayerViewComponent.cs

@@ -216,6 +216,7 @@ namespace ShadowStudio.Model
         {
             if (_peer.IsSlef)
             {
+                XRRGBCamera.Instance.playCamera();
                 AgoraRTCManager.Instance.MuteLocalVideoStream(true);
             }
             else
@@ -228,6 +229,7 @@ namespace ShadowStudio.Model
 
             if (_peer.IsSlef)
             {
+                XRRGBCamera.Instance.stopCamera();
                 AgoraRTCManager.Instance.MuteLocalVideoStream(false);
             }
             else