Bladeren bron

图片下载逻辑

胡佳骏 1 jaar geleden
bovenliggende
commit
d91accb439
27 gewijzigde bestanden met toevoegingen van 86 en 754 verwijderingen
  1. 86 4
      Assets/Game/Blue/Controller/LangChaoMinIo.cs
  2. 0 1
      Assets/Game/ShowXunJian/StartXunJian.cs
  3. 0 8
      Assets/LangChaoRTC/XR.meta
  4. 0 8
      Assets/LangChaoRTC/XR/Loaders.meta
  5. 0 14
      Assets/LangChaoRTC/XR/Loaders/AR Core Loader.asset
  6. 0 8
      Assets/LangChaoRTC/XR/Loaders/AR Core Loader.asset.meta
  7. 0 14
      Assets/LangChaoRTC/XR/Loaders/Open XR Loader.asset
  8. 0 8
      Assets/LangChaoRTC/XR/Loaders/Open XR Loader.asset.meta
  9. 0 15
      Assets/LangChaoRTC/XR/Loaders/Ximmerse XR Loader.asset
  10. 0 8
      Assets/LangChaoRTC/XR/Loaders/Ximmerse XR Loader.asset.meta
  11. 0 8
      Assets/LangChaoRTC/XR/Settings.meta
  12. 0 17
      Assets/LangChaoRTC/XR/Settings/AR Core Settings.asset
  13. 0 8
      Assets/LangChaoRTC/XR/Settings/AR Core Settings.asset.meta
  14. 0 434
      Assets/LangChaoRTC/XR/Settings/OpenXR Package Settings.asset
  15. 0 8
      Assets/LangChaoRTC/XR/Settings/OpenXR Package Settings.asset.meta
  16. 0 23
      Assets/LangChaoRTC/XR/Settings/Ximmerse XR Settings.asset
  17. 0 8
      Assets/LangChaoRTC/XR/Settings/Ximmerse XR Settings.asset.meta
  18. 0 48
      Assets/LangChaoRTC/XR/XRGeneralSettings.asset
  19. 0 8
      Assets/LangChaoRTC/XR/XRGeneralSettings.asset.meta
  20. 0 8
      Assets/LangChaoRTC/XRI.meta
  21. 0 8
      Assets/LangChaoRTC/XRI/Settings.meta
  22. 0 8
      Assets/LangChaoRTC/XRI/Settings/Resources.meta
  23. 0 47
      Assets/LangChaoRTC/XRI/Settings/Resources/InteractionLayerSettings.asset
  24. 0 8
      Assets/LangChaoRTC/XRI/Settings/Resources/InteractionLayerSettings.asset.meta
  25. 0 16
      Assets/LangChaoRTC/XRI/Settings/XRInteractionEditorSettings.asset
  26. 0 8
      Assets/LangChaoRTC/XRI/Settings/XRInteractionEditorSettings.asset.meta
  27. 0 1
      Assets/Scripts/RTC/RTCRoomManager.cs

+ 86 - 4
Assets/Game/Blue/Controller/LangChaoMinIo.cs

@@ -47,6 +47,12 @@ public class LangChaoMinIo : MonoSingleton<LangChaoMinIo>
                     isUpdate = true;
                     Run().Wait();
                 }
+                if ( gfdQueue.Count > 0 && !isDownLoad)
+                {
+                    isDownLoad = true;
+                    nowgfd = gfdQueue.Dequeue();
+                    RunFile().Wait();
+                }
             }
             Thread.Sleep(1000);
         }
@@ -118,7 +124,7 @@ public class LangChaoMinIo : MonoSingleton<LangChaoMinIo>
       //      File.Delete(filePathname);
         File.WriteAllBytes(filePathname, bytes);
 
-        PlayerPrefs.SetString(fileName, filePathname);
+       // PlayerPrefs.SetString(fileName, filePathname);
         putFile(filePathname, fileName, callBack);
 
     }
@@ -155,6 +161,9 @@ public class LangChaoMinIo : MonoSingleton<LangChaoMinIo>
     {
         this.projectId = projectId;
 
+
+
+       
         string fileName = DicName + "_" + projectId + "_" + Index + "_" + imgIndex + ".png";
         string filePathname = PlayerPrefs.GetString(fileName);
         if (filePathname != "")
@@ -163,10 +172,54 @@ public class LangChaoMinIo : MonoSingleton<LangChaoMinIo>
         }
         else
         {
-            callBack.Invoke(null);
+        GetFileData gfd = new GetFileData();
+        gfd.bucket = bucket;
+        gfd.objectName = DicName + "_" + projectId + "_" + Index + "_" + imgIndex + ".png";
+        gfd.callBack = callBack;
+        gfdQueue.Enqueue(gfd);
         }
     }
+    GetFileData nowgfd;
+    Queue<byte[]> backQueue = new Queue<byte[]>();
+    Queue<GetFileData> gfdQueue = new Queue<GetFileData>();
+    // File uploader task.
+    private async Task RunFile()
+    {
+        Debug.LogError(bucket);
+        Debug.LogError(path + "/" + nowgfd.objectName);
+        try
+        {
 
+            StatObjectArgs statObjectArgs = new StatObjectArgs()
+                                              .WithBucket(bucket)
+                                              .WithObject(path + "/" + nowgfd.objectName);
+            await minio.StatObjectAsync(statObjectArgs);
+
+            // Get input stream to have content of 'my-objectname' from 'my-bucketname'
+            GetObjectArgs getObjectArgs = new GetObjectArgs()
+                                              .WithBucket(bucket)
+                                              .WithObject(path + "/" + nowgfd.objectName)
+                                              .WithCallbackStream(async (stream) =>
+                                              {
+                                                  backQueue.Enqueue(StreamToBytes(stream));
+
+                                              });
+            await minio.GetObjectAsync(getObjectArgs);
+
+        }
+        catch
+        {
+            backQueue.Enqueue(null);
+
+        }
+    }
+     static byte[] StreamToBytes(Stream stream)
+    {
+        byte[] bytes = new byte[stream.Length];
+        stream.Read(bytes, 0, bytes.Length);
+        stream.Seek(0, SeekOrigin.Begin);
+        return bytes;
+    }
     /// <summary>
     /// ÇëÇóͼƬ
     /// </summary>
@@ -216,6 +269,8 @@ public class LangChaoMinIo : MonoSingleton<LangChaoMinIo>
                 .WithContentType(contentType);
             await minio.PutObjectAsync(putObjectArgs).ConfigureAwait(false);
             Debug.Log("33333333333333333");
+
+            PlayerPrefs.SetString(Nowfd.fileName, Nowfd.filePath);
             isUpdate = false;
             Nowfd.callBack?.Invoke(Nowfd.fileName);
             Nowfd = null;
@@ -228,6 +283,7 @@ public class LangChaoMinIo : MonoSingleton<LangChaoMinIo>
             Nowfd = null;
         }
     }
+    bool isDownLoad;
     FileData Nowfd;
     private void Update()
     {
@@ -244,9 +300,32 @@ public class LangChaoMinIo : MonoSingleton<LangChaoMinIo>
                 {
                     isminioUpdate = false;
                 });
-
             }
         }
+        if(backQueue.Count>0)
+        {
+            byte[] bytes = backQueue.Dequeue();
+         
+                if(bytes!=null)
+                {
+
+                    Debug.Log("444444444444");
+                    Texture2D t2d = new Texture2D(10, 10);
+                    t2d.LoadImage(bytes);
+                    t2d.Apply();
+                    nowgfd.callBack?.Invoke(t2d);
+                }else
+
+                {
+                    Debug.Log("55555555555555");
+                    nowgfd.callBack?.Invoke(null);
+
+                }
+
+          
+            isDownLoad = false;
+            nowgfd = null;
+        }
     }
 
     public class FileData
@@ -258,6 +337,9 @@ public class LangChaoMinIo : MonoSingleton<LangChaoMinIo>
 
     public class GetFileData
     {
-
+        public string bucket;
+        public string objectName;
+        public Action<Texture2D> callBack;
     }
+
 }

+ 0 - 1
Assets/Game/ShowXunJian/StartXunJian.cs

@@ -7,7 +7,6 @@ using UnityEngine.UI;
 using TMPro;
 using UnityEngine.Networking;
 using System.Collections;
-using UnityEditor.Experimental.GraphView;
 using BestHTTP.JSON;
 
 namespace GHZLangChao

+ 0 - 8
Assets/LangChaoRTC/XR.meta

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

+ 0 - 8
Assets/LangChaoRTC/XR/Loaders.meta

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

+ 0 - 14
Assets/LangChaoRTC/XR/Loaders/AR Core Loader.asset

@@ -1,14 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 06042c85f885b4d1886f3ca5a1074eca, type: 3}
-  m_Name: AR Core Loader
-  m_EditorClassIdentifier: 

+ 0 - 8
Assets/LangChaoRTC/XR/Loaders/AR Core Loader.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 91ac05be33e73554c9292a9f4b841f9d
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 14
Assets/LangChaoRTC/XR/Loaders/Open XR Loader.asset

@@ -1,14 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d3552e428dc7646a88de3ed3650f87da, type: 3}
-  m_Name: Open XR Loader
-  m_EditorClassIdentifier: 

+ 0 - 8
Assets/LangChaoRTC/XR/Loaders/Open XR Loader.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 79060d551302dc34da4d696b883b24bf
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 15
Assets/LangChaoRTC/XR/Loaders/Ximmerse XR Loader.asset

@@ -1,15 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 44820cf310472441e952b611b9f17c14, type: 3}
-  m_Name: Ximmerse XR Loader
-  m_EditorClassIdentifier: 
-  settings: {fileID: 11400000, guid: a059e51dfed9d514bbd8eef2e5dc70f1, type: 2}

+ 0 - 8
Assets/LangChaoRTC/XR/Loaders/Ximmerse XR Loader.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ea6b4fa5606b423479ad49b5a843cefe
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
Assets/LangChaoRTC/XR/Settings.meta

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

+ 0 - 17
Assets/LangChaoRTC/XR/Settings/AR Core Settings.asset

@@ -1,17 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9dae4501572e1418791be3e3bf1f7faa, type: 3}
-  m_Name: AR Core Settings
-  m_EditorClassIdentifier: 
-  m_Requirement: 0
-  m_Depth: 0
-  m_IgnoreGradleVersion: 0

+ 0 - 8
Assets/LangChaoRTC/XR/Settings/AR Core Settings.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a3576b2a67b66c74094ed50fa1d5cdee
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 434
Assets/LangChaoRTC/XR/Settings/OpenXR Package Settings.asset

@@ -1,434 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &-8518578136542053239
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b5a1f07dc5afe854f9f12a4194aca3fb, type: 3}
-  m_Name: Standalone
-  m_EditorClassIdentifier: 
-  features:
-  - {fileID: -4448670067404219194}
-  - {fileID: -3009839975264185929}
-  - {fileID: -2277564850291146485}
-  - {fileID: 1814202586350794680}
-  - {fileID: 2033646296230948293}
-  - {fileID: 4848290089245841408}
-  - {fileID: 3671675726770217328}
-  - {fileID: 8291224647683656851}
-  - {fileID: -1594860259184541231}
-  - {fileID: -3190836381105478493}
-  m_renderMode: 1
-  m_depthSubmissionMode: 0
---- !u!114 &-7608744386944206268
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7de993716e042c6499d0c18eed3a773c, type: 3}
-  m_Name: MockRuntime Android
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: Mock Runtime
-  version: 0.0.2
-  featureIdInternal: com.unity.openxr.feature.mockruntime
-  openxrExtensionStrings: XR_UNITY_null_gfx XR_UNITY_android_present
-  company: Unity
-  priority: 0
-  required: 0
-  ignoreValidationErrors: 0
---- !u!114 &-7266971609238374727
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 056125dd64c0ed540b40a4af74f7b495, type: 3}
-  m_Name: RuntimeDebuggerOpenXRFeature Android
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: Runtime Debugger
-  version: 1
-  featureIdInternal: com.unity.openxr.features.runtimedebugger
-  openxrExtensionStrings: 
-  company: Unity
-  priority: 0
-  required: 0
-  cacheSize: 1048576
-  perThreadCacheSize: 51200
---- !u!114 &-4448670067404219194
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 486b5e28864f9a94b979b9620ce5006d, type: 3}
-  m_Name: ConformanceAutomationFeature Standalone
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: Conformance Automation
-  version: 0.0.1
-  featureIdInternal: com.unity.openxr.feature.conformance
-  openxrExtensionStrings: XR_EXT_conformance_automation
-  company: Unity
-  priority: 0
-  required: 0
---- !u!114 &-4301709117214073800
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 486b5e28864f9a94b979b9620ce5006d, type: 3}
-  m_Name: ConformanceAutomationFeature Android
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: Conformance Automation
-  version: 0.0.1
-  featureIdInternal: com.unity.openxr.feature.conformance
-  openxrExtensionStrings: XR_EXT_conformance_automation
-  company: Unity
-  priority: 0
-  required: 0
---- !u!114 &-3729674713201632444
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f928d0d73a35f294fbe357ca17aa3547, type: 3}
-  m_Name: MicrosoftHandInteraction Android
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: Microsoft Hand Interaction Profile
-  version: 0.0.1
-  featureIdInternal: com.unity.openxr.feature.input.handtracking
-  openxrExtensionStrings: XR_MSFT_hand_interaction
-  company: Unity
-  priority: 0
-  required: 0
---- !u!114 &-3190836381105478493
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0d6ccd3d0ef0f1d458e69421dccbdae1, type: 3}
-  m_Name: ValveIndexControllerProfile Standalone
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: Valve Index Controller Profile
-  version: 0.0.1
-  featureIdInternal: com.unity.openxr.feature.input.valveindex
-  openxrExtensionStrings: 
-  company: Unity
-  priority: 0
-  required: 0
---- !u!114 &-3009839975264185929
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b3cf79659a011bd419c7a2a30eb74e9a, type: 3}
-  m_Name: EyeGazeInteraction Standalone
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: Eye Gaze Interaction Profile
-  version: 0.0.1
-  featureIdInternal: com.unity.openxr.feature.input.eyetracking
-  openxrExtensionStrings: XR_EXT_eye_gaze_interaction
-  company: Unity
-  priority: 0
-  required: 0
---- !u!114 &-2277564850291146485
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 274c02963f889a64e90bc2e596e21d13, type: 3}
-  m_Name: HTCViveControllerProfile Standalone
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: HTC Vive Controller Profile
-  version: 0.0.1
-  featureIdInternal: com.unity.openxr.feature.input.htcvive
-  openxrExtensionStrings: 
-  company: Unity
-  priority: 0
-  required: 0
---- !u!114 &-1594860259184541231
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 056125dd64c0ed540b40a4af74f7b495, type: 3}
-  m_Name: RuntimeDebuggerOpenXRFeature Standalone
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: Runtime Debugger
-  version: 1
-  featureIdInternal: com.unity.openxr.features.runtimedebugger
-  openxrExtensionStrings: 
-  company: Unity
-  priority: 0
-  required: 0
-  cacheSize: 1048576
-  perThreadCacheSize: 51200
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9f0ebc320a151d3408ea1e9fce54d40e, type: 3}
-  m_Name: OpenXR Package Settings
-  m_EditorClassIdentifier: 
-  Keys: 0100000007000000
-  Values:
-  - {fileID: -8518578136542053239}
-  - {fileID: 1707767742241832562}
---- !u!114 &1707767742241832562
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b5a1f07dc5afe854f9f12a4194aca3fb, type: 3}
-  m_Name: Android
-  m_EditorClassIdentifier: 
-  features:
-  - {fileID: -4301709117214073800}
-  - {fileID: 3030168499105954266}
-  - {fileID: 5685071766989385600}
-  - {fileID: -3729674713201632444}
-  - {fileID: -7608744386944206268}
-  - {fileID: 8850658405018414322}
-  - {fileID: 6343019218702741410}
-  - {fileID: -7266971609238374727}
-  m_renderMode: 1
-  m_depthSubmissionMode: 0
---- !u!114 &1814202586350794680
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0f6bfdbcb316ed242b30a8798c9eb853, type: 3}
-  m_Name: KHRSimpleControllerProfile Standalone
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: Khronos Simple Controller Profile
-  version: 0.0.1
-  featureIdInternal: com.unity.openxr.feature.input.khrsimpleprofile
-  openxrExtensionStrings: 
-  company: Unity
-  priority: 0
-  required: 0
---- !u!114 &2033646296230948293
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f928d0d73a35f294fbe357ca17aa3547, type: 3}
-  m_Name: MicrosoftHandInteraction Standalone
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: Microsoft Hand Interaction Profile
-  version: 0.0.1
-  featureIdInternal: com.unity.openxr.feature.input.handtracking
-  openxrExtensionStrings: XR_MSFT_hand_interaction
-  company: Unity
-  priority: 0
-  required: 0
---- !u!114 &3030168499105954266
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b3cf79659a011bd419c7a2a30eb74e9a, type: 3}
-  m_Name: EyeGazeInteraction Android
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: Eye Gaze Interaction Profile
-  version: 0.0.1
-  featureIdInternal: com.unity.openxr.feature.input.eyetracking
-  openxrExtensionStrings: XR_EXT_eye_gaze_interaction
-  company: Unity
-  priority: 0
-  required: 0
---- !u!114 &3671675726770217328
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7de993716e042c6499d0c18eed3a773c, type: 3}
-  m_Name: MockRuntime Standalone
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: Mock Runtime
-  version: 0.0.2
-  featureIdInternal: com.unity.openxr.feature.mockruntime
-  openxrExtensionStrings: XR_UNITY_null_gfx XR_UNITY_android_present
-  company: Unity
-  priority: 0
-  required: 0
-  ignoreValidationErrors: 0
---- !u!114 &4848290089245841408
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 761fdd4502cb7a84e9ec7a2b24f33f37, type: 3}
-  m_Name: MicrosoftMotionControllerProfile Standalone
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: Microsoft Motion Controller Profile
-  version: 0.0.1
-  featureIdInternal: com.unity.openxr.feature.input.microsoftmotioncontroller
-  openxrExtensionStrings: 
-  company: Unity
-  priority: 0
-  required: 0
---- !u!114 &5685071766989385600
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0f6bfdbcb316ed242b30a8798c9eb853, type: 3}
-  m_Name: KHRSimpleControllerProfile Android
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: Khronos Simple Controller Profile
-  version: 0.0.1
-  featureIdInternal: com.unity.openxr.feature.input.khrsimpleprofile
-  openxrExtensionStrings: 
-  company: Unity
-  priority: 0
-  required: 0
---- !u!114 &6343019218702741410
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: feeef8d85de8db242bdda70cc7ff5acd, type: 3}
-  m_Name: OculusTouchControllerProfile Android
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: Oculus Touch Controller Profile
-  version: 0.0.1
-  featureIdInternal: com.unity.openxr.feature.input.oculustouch
-  openxrExtensionStrings: 
-  company: Unity
-  priority: 0
-  required: 0
---- !u!114 &8291224647683656851
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: feeef8d85de8db242bdda70cc7ff5acd, type: 3}
-  m_Name: OculusTouchControllerProfile Standalone
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: Oculus Touch Controller Profile
-  version: 0.0.1
-  featureIdInternal: com.unity.openxr.feature.input.oculustouch
-  openxrExtensionStrings: 
-  company: Unity
-  priority: 0
-  required: 0
---- !u!114 &8850658405018414322
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9ef793c31862a37448e907829482ef80, type: 3}
-  m_Name: OculusQuestFeature Android
-  m_EditorClassIdentifier: 
-  m_enabled: 0
-  nameUi: Oculus Quest Support
-  version: 1.0.0
-  featureIdInternal: com.unity.openxr.feature.oculusquest
-  openxrExtensionStrings: XR_OCULUS_android_initialize_loader
-  company: Unity
-  priority: 0
-  required: 0
-  targetQuest: 1
-  targetQuest2: 1

+ 0 - 8
Assets/LangChaoRTC/XR/Settings/OpenXR Package Settings.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1a1d14ff6628c11499dfd78d30397967
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 23
Assets/LangChaoRTC/XR/Settings/Ximmerse XR Settings.asset

@@ -1,23 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8f9643084e7b84786a72ba40c223a7fd, type: 3}
-  m_Name: Ximmerse XR Settings
-  m_EditorClassIdentifier: 
-  displayReticle: 1
-  reticleTexture: {fileID: 0}
-  defaultTrackingProfile: {fileID: 11400000, guid: c641667a0d27d3b4484c44ccba14b111,
-    type: 2}
-  defaultGroundPlaneLayoutConfig: {fileID: 11400000, guid: 6f7a3e78cb3c0364fab924de8d67d3a7,
-    type: 2}
-  DrawTrackedMarkerGizmos: 0
-  DrawDetailTrackedInfo: 0
-  HandTracking: 0

+ 0 - 8
Assets/LangChaoRTC/XR/Settings/Ximmerse XR Settings.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a059e51dfed9d514bbd8eef2e5dc70f1
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 48
Assets/LangChaoRTC/XR/XRGeneralSettings.asset

@@ -1,48 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &-968004925683208553
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4c3631f5e58749a59194e0cf6baf6d5, type: 3}
-  m_Name: Android Providers
-  m_EditorClassIdentifier: 
-  m_RequiresSettingsUpdate: 0
-  m_AutomaticLoading: 0
-  m_AutomaticRunning: 0
-  m_Loaders:
-  - {fileID: 11400000, guid: ea6b4fa5606b423479ad49b5a843cefe, type: 2}
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d2dc886499c26824283350fa532d087d, type: 3}
-  m_Name: XRGeneralSettings
-  m_EditorClassIdentifier: 
-  Keys: 07000000
-  Values:
-  - {fileID: 799516907108274431}
---- !u!114 &799516907108274431
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d236b7d11115f2143951f1e14045df39, type: 3}
-  m_Name: Android Settings
-  m_EditorClassIdentifier: 
-  m_LoaderManagerInstance: {fileID: -968004925683208553}
-  m_InitManagerOnStart: 1

+ 0 - 8
Assets/LangChaoRTC/XR/XRGeneralSettings.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: bc82c4904d3145f42acc37a970fdc037
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
Assets/LangChaoRTC/XRI.meta

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

+ 0 - 8
Assets/LangChaoRTC/XRI/Settings.meta

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

+ 0 - 8
Assets/LangChaoRTC/XRI/Settings/Resources.meta

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

+ 0 - 47
Assets/LangChaoRTC/XRI/Settings/Resources/InteractionLayerSettings.asset

@@ -1,47 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 191492db6e452eb468b95433ec162164, type: 3}
-  m_Name: InteractionLayerSettings
-  m_EditorClassIdentifier: 
-  m_LayerNames:
-  - Default
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 
-  - 

+ 0 - 8
Assets/LangChaoRTC/XRI/Settings/Resources/InteractionLayerSettings.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 56b8ae4291bff3844aa8b88026df8151
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 16
Assets/LangChaoRTC/XRI/Settings/XRInteractionEditorSettings.asset

@@ -1,16 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2d38fb1463c5c804b8847c20e8873623, type: 3}
-  m_Name: XRInteractionEditorSettings
-  m_EditorClassIdentifier: 
-  m_InteractionLayerUpdaterShown: 1
-  m_ShowOldInteractionLayerMaskInInspector: 0

+ 0 - 8
Assets/LangChaoRTC/XRI/Settings/XRInteractionEditorSettings.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e73f2dc09e64dd24f86d685b3ca26d4f
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 11400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 1
Assets/Scripts/RTC/RTCRoomManager.cs

@@ -46,7 +46,6 @@ public class RTCRoomManager : MonoSingleton<RTCRoomManager>, IController
 
         Debug.Log("DGJ   =====>  JoinRoomSuccess");
         mRTCRoomInfo = JsonConvert.DeserializeObject<RTCRoomInfo>(e.rtcRoomInfo);
-
         UILogManager.Instance.text2.text = mRTCRoomInfo.roomId.ToString();
         UICallManager.Instance.SetMQTTRoomId(mRTCRoomInfo.roomId.ToString());