Browse Source

适配多种设备

胡佳骏 1 year ago
parent
commit
d65085f3f8

+ 88 - 7
Assets/GHZScritps/AgoraRTCManager.cs

@@ -6,6 +6,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.Remoting.Contexts;
 using UnityEngine;
+using UnityEngine.Rendering;
 using UnityEngine.Serialization;
 using UnityEngine.UI;
 using XRTool.Util;
@@ -108,16 +109,19 @@ public class AgoraRTCManager : SingletonMono<AgoraRTCManager>
         RtcEngine.EnableAudio();
         RtcEngine.EnableVideo();
 
+        // RtcEngine.DisableAudio();
+        //  RtcEngine.DisableVideo();
         VideoEncoderConfiguration config = new VideoEncoderConfiguration();
         config.dimensions = new VideoDimensions(1280, 720);
         config.frameRate = 15;
         config.bitrate = 0;
+        //    config.orientationMode = ORIENTATION_MODE.ORIENTATION_MODE_ADAPTIVE;
         RtcEngine.SetVideoEncoderConfiguration(config);
-       // RtcEngine.SetAudioProfile(0, AUDIO_SCENARIO_TYPE.AUDIO_SCENARIO_GAME_STREAMING);
-        RtcEngine.SetAudioProfile(AUDIO_PROFILE_TYPE.AUDIO_PROFILE_DEFAULT);
-        RtcEngine.SetAudioScenario(AUDIO_SCENARIO_TYPE.AUDIO_SCENARIO_GAME_STREAMING);
         RtcEngine.SetChannelProfile(CHANNEL_PROFILE_TYPE.CHANNEL_PROFILE_COMMUNICATION);
         RtcEngine.SetClientRole(CLIENT_ROLE_TYPE.CLIENT_ROLE_BROADCASTER);
+        // _channelName = roomid;
+        RtcEngine.SetExternalVideoSource(true, true, EXTERNAL_VIDEO_SOURCE_TYPE.VIDEO_FRAME, new SenderOptions());
+
         RtcEngine.JoinChannel(_token, _channelName, "", uid);
         if (!isSwitchCamera&&DeviceType.type != "Rhinox")
         {
@@ -125,8 +129,80 @@ public class AgoraRTCManager : SingletonMono<AgoraRTCManager>
             isSwitchCamera = !isSwitchCamera;
         }
         StartCoroutine(InitVideoAndAduio(1f));
+        StartCoroutine(RenderTexturesScreenCapture());
     }
 
+    Texture2D screenShot;
+    IEnumerator RenderTexturesScreenCapture()
+    {
+
+        Debug.Log("RenderTexturesScreenCapture窟僕夕頭1");
+        yield return new WaitForEndOfFrame();
+        if (screenShot == null)
+        {
+            screenShot = new Texture2D(1280, 720, TextureFormat.RGBA32, false);
+            StartCoroutine(GetRenederFPS());
+        }
+        while (true)
+        {
+            // if (isSendVideo)
+            //     continue;
+
+            //    img.texture = RemoteRtc.Instance.cam.activeTexture;
+            //  RenderTexture.active = ca.activeTexture;
+
+            //  screenShot.ReadPixels(new Rect(0, 0, ca.activeTexture.width, ca.activeTexture.height), 0, 0);
+            // screenShot.Apply();
+            //Camera.main.targetTexture = null;
+            //   RenderTexture.active = null;
+            yield return new WaitForSeconds(0.05f);
+            if (bts != null)
+            {
+                //  screenShot = HorizontalFlipTexture(screenShot2);
+                var timetick = System.DateTime.Now.Ticks / 10000;
+                ExternalVideoFrame externalVideoFrame = new ExternalVideoFrame();
+                externalVideoFrame.type = VIDEO_BUFFER_TYPE.VIDEO_BUFFER_RAW_DATA;
+                externalVideoFrame.format = VIDEO_PIXEL_FORMAT.VIDEO_PIXEL_RGBA;
+                externalVideoFrame.buffer = bts;// screenShot.GetRawTextureData();
+                externalVideoFrame.stride = (int)screenShot.width;
+                externalVideoFrame.height = (int)screenShot.height;
+                externalVideoFrame.rotation = 180;
+                externalVideoFrame.cropLeft = 1;
+                externalVideoFrame.cropRight = 1;
+                externalVideoFrame.timestamp = timetick;
+                RtcEngine.PushVideoFrame(externalVideoFrame);
+
+                Debug.Log("窟僕嶄。。。。。");
+            }
+        }
+    }
+    public Camera cam2;
+    byte[] bts;
+    IEnumerator GetRenederFPS()
+    {
+        while (true)
+        {
+            var req = AsyncGPUReadback.Request(cam2.activeTexture);
+            yield return new WaitUntil(() => req.done);
+            if (!req.hasError)
+            {
+
+                if (bts == null)
+                {
+                    bts = new byte[req.layerDataSize];
+                }
+                req.GetData<byte>().CopyTo(bts);
+                //   screenShot.LoadRawTextureData(bts);
+                //  screenShot.Apply();
+                //  tex.SetPixels32(req.GetData<Color32>().ToArray());
+                //  img.texture = screenShot;
+            }
+            else
+            {
+                Debug.LogError("Error AsyncGPUReadbackRequest.hasError");
+            }
+        }
+    }
     public void LeaveChannel()
     {
         Debug.Log("LeaveChannel ");
@@ -482,17 +558,23 @@ public class AgoraRTCManager : SingletonMono<AgoraRTCManager>
         //}
 
         // create a GameObject and assign to this new user
-        var videoSurface = MakeImageSurface(rawImage);
         // var videoSurface = MakePlaneSurface(uid.ToString());
-        if (ReferenceEquals(videoSurface, null)) return;
         // configure videoSurface
         if (uid == 0)
         {
-            videoSurface.SetForUser(uid, channelId);
+            rawImage.transform.localEulerAngles = Vector3.zero;
+            //videoSurface.SetForUser(uid, channelId);
+            rawImage.texture = AgoraRTCManager.Instance.cam2.activeTexture;
         }
         else
         {
+            rawImage.transform.localEulerAngles = new Vector3(-180,0,0);
+            var videoSurface = MakeImageSurface(rawImage);
+
+            if (ReferenceEquals(videoSurface, null)) return;
+
             videoSurface.SetForUser(uid, channelId, VIDEO_SOURCE_TYPE.VIDEO_SOURCE_REMOTE);
+            videoSurface.SetEnable(true);
         }
 
         //videoSurface.OnTextureSizeModify += (int width, int height) =>
@@ -502,7 +584,6 @@ public class AgoraRTCManager : SingletonMono<AgoraRTCManager>
         //    Debug.Log("OnTextureSizeModify: " + width + "  " + height);
         //};
 
-        videoSurface.SetEnable(true);
     }
     internal static void OnUserJoined(uint uid)
     {

+ 1 - 1
Assets/GHZScritps/HttpsSendLog.cs

@@ -8,7 +8,7 @@ using UnityEngine.Networking;
 
 public class HttpsSendLog : SingletonMono<HttpsSendLog>
 {
-    private Queue<string> qSendLog;
+    private Queue<string> qSendLog = new Queue<string>();
     private float times;
     Dictionary<string, string> requestHeader = new Dictionary<string, string>();  //  header
     void Awake()

+ 23 - 0
Assets/InitRtc.cs

@@ -0,0 +1,23 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class InitRtc : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        Invoke("SetParent",1f);
+    }
+    public void SetParent()
+    {
+        this.transform.parent = OpenXRCamera.Instance.head;
+        this.transform.localPosition = Vector3.zero;
+        this.transform.localEulerAngles = Vector3.zero;
+    }
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

+ 11 - 0
Assets/InitRtc.cs.meta

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

+ 0 - 16
Assets/Plugins/Android/AndroidManifest.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.unity3d.player" xmlns:tools="http://schemas.android.com/tools" android:installLocation="preferExternal">
-  <uses-sdk tools:overrideLibrary="com.nreal.glasses_sdk" />
-  <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true" />
-  <application android:theme="@style/UnityThemeSelector" android:icon="@mipmap/app_icon" android:label="@string/app_name">
-    <activity android:name="com.unity3d.player.UnityPlayerActivity">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity>
-    <meta-data android:name="nreal_sdk" android:value="true" />
-    <meta-data android:name="com.nreal.supportDevices" android:value="NrealLight|NrealAir" />
-  </application>
-  <uses-permission android:name="android.permission.BLUETOOTH" />
-</manifest>

+ 368 - 0
Assets/RTC.prefab

@@ -0,0 +1,368 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3261079296200053995
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4545480692828593037}
+  m_Layer: 0
+  m_Name: RTC
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4545480692828593037
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3261079296200053995}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4545480691616186319}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &4545480691616186312
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4545480691616186319}
+  - component: {fileID: 4545480691616186318}
+  m_Layer: 0
+  m_Name: Camera2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4545480691616186319
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4545480691616186312}
+  m_LocalRotation: {x: -0.043619405, y: 0, z: 0, w: 0.9990483}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4545480692338971103}
+  - {fileID: 4545480692278401367}
+  m_Father: {fileID: 4545480692828593037}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: -5, y: 0, z: 0}
+--- !u!20 &4545480691616186318
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4545480691616186312}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 33.8
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 1024
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 8400000, guid: b01e94f8329a5ee429717fa81c4d12a0, type: 2}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!1 &4545480692278401360
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4545480692278401367}
+  - component: {fileID: 4545480692278401364}
+  - component: {fileID: 4545480692278401365}
+  - component: {fileID: 4545480692278401366}
+  m_Layer: 10
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4545480692278401367
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4545480692278401360}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4545480692708950147}
+  m_Father: {fileID: 4545480691616186319}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!223 &4545480692278401364
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4545480692278401360}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 1
+  m_Camera: {fileID: 4545480691616186318}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &4545480692278401365
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4545480692278401360}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!114 &4545480692278401366
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4545480692278401360}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!1 &4545480692338971096
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4545480692338971103}
+  - component: {fileID: 4545480692338971101}
+  - component: {fileID: 4545480692338971102}
+  m_Layer: 10
+  m_Name: Quad
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &4545480692338971103
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4545480692338971096}
+  m_LocalRotation: {x: 1, y: 0, z: 0, w: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 14.5}
+  m_LocalScale: {x: 16, y: 9, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4545480691616186319}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 180, y: 0, z: 0}
+--- !u!33 &4545480692338971101
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4545480692338971096}
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &4545480692338971102
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4545480692338971096}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 85ff73f920c1ca240a9b39c391739a4d, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &4545480692708950268
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4545480692708950147}
+  - component: {fileID: 4545480692708950145}
+  - component: {fileID: 4545480692708950146}
+  m_Layer: 10
+  m_Name: RawImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4545480692708950147
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4545480692708950268}
+  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4545480692278401367}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 180, 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 &4545480692708950145
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4545480692708950268}
+  m_CullTransparentMesh: 1
+--- !u!114 &4545480692708950146
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4545480692708950268}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  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_Texture: {fileID: 8400000, guid: 2515c6a63a25f954f87089e5f3fc4a59, type: 2}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1

+ 2 - 2
Assets/Plugins/Android/AndroidManifest.xml.meta → Assets/RTC.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 74a338c96fc281044965d1854cd1c348
-TextScriptImporter:
+guid: 250e36dc2dad7f745b2c72a96bb0e1cf
+PrefabImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

+ 37 - 0
Assets/RTCTexture.renderTexture

@@ -0,0 +1,37 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!84 &8400000
+RenderTexture:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: RTCTexture
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  serializedVersion: 3
+  m_Width: 1280
+  m_Height: 720
+  m_AntiAliasing: 1
+  m_MipCount: -1
+  m_DepthFormat: 2
+  m_ColorFormat: 8
+  m_MipMap: 0
+  m_GenerateMips: 1
+  m_SRGB: 0
+  m_UseDynamicScale: 0
+  m_BindMS: 0
+  m_EnableCompatibleFormat: 1
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 0
+    m_MipBias: 0
+    m_WrapU: 1
+    m_WrapV: 1
+    m_WrapW: 1
+  m_Dimension: 2
+  m_VolumeDepth: 1

+ 8 - 0
Assets/RTCTexture.renderTexture.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2515c6a63a25f954f87089e5f3fc4a59
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 8400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 37 - 0
Assets/RTCTexture2.renderTexture

@@ -0,0 +1,37 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!84 &8400000
+RenderTexture:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: RTCTexture2
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  serializedVersion: 3
+  m_Width: 1280
+  m_Height: 720
+  m_AntiAliasing: 1
+  m_MipCount: -1
+  m_DepthFormat: 2
+  m_ColorFormat: 8
+  m_MipMap: 0
+  m_GenerateMips: 1
+  m_SRGB: 0
+  m_UseDynamicScale: 0
+  m_BindMS: 0
+  m_EnableCompatibleFormat: 1
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 0
+    m_MipBias: 0
+    m_WrapU: 1
+    m_WrapV: 1
+    m_WrapW: 1
+  m_Dimension: 2
+  m_VolumeDepth: 1

+ 8 - 0
Assets/RTCTexture2.renderTexture.meta

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

+ 1 - 1
Assets/Resources/VuforiaConfiguration.asset

@@ -42,7 +42,7 @@ MonoBehaviour:
     autoStartTracker: 0
     arcoreRequirement: 1
     autoImportArcore: 1
-    thirdPartyARCoreClientDetected: 0
+    thirdPartyARCoreClientDetected: 1
   playmode:
     mSequencePath: 
     playModeType: 0

+ 1 - 1
Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from YUNYUNGEGE at 2023/7/20 11:04:32
+Build from YUNYUNGEGE at 2023/7/24 14:04:05

+ 105 - 28
Assets/Studio/Resources/Container/Component/PlayerViewComponent.prefab

@@ -12,7 +12,7 @@ GameObject:
   - component: {fileID: 5343722121875596151}
   - component: {fileID: 4311742920815826289}
   - component: {fileID: 655489642928803604}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: ShowVideo (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -112,7 +112,11 @@ GameObject:
   m_Component:
   - component: {fileID: 5758809693931322683}
   - component: {fileID: 5758809693931322648}
-  m_Layer: 5
+  - component: {fileID: 8395268583249363898}
+  - component: {fileID: 3094229958413628748}
+  - component: {fileID: 796545184215631965}
+  - component: {fileID: 3071183569941446050}
+  m_Layer: 13
   m_Name: PlayerViewComponent
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -167,6 +171,79 @@ MonoBehaviour:
   closeAudio: {fileID: 5758809693931322730}
   VolumnGo: {fileID: 5758809693931322748}
   agoraShowVideo: {fileID: 2347380948039149061}
+--- !u!223 &8395268583249363898
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5758809693931322720}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &3094229958413628748
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5758809693931322720}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!114 &796545184215631965
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5758809693931322720}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &3071183569941446050
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5758809693931322720}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 948b9ab040508dc48a294230f85b39e2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &5758809693931322721
 GameObject:
   m_ObjectHideFlags: 0
@@ -179,7 +256,7 @@ GameObject:
   - component: {fileID: 5758809693931322724}
   - component: {fileID: 5758809693931322722}
   - component: {fileID: 5758809693931322745}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: ShowVideo
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -280,7 +357,7 @@ GameObject:
   - component: {fileID: 5758809693931322694}
   - component: {fileID: 5758809693931322704}
   - component: {fileID: 5758809693931322659}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: Text
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -363,7 +440,7 @@ GameObject:
   - component: {fileID: 5758809693931322657}
   - component: {fileID: 4221721232534222101}
   - component: {fileID: 7901825606150102217}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: VideoBtnPause
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -551,7 +628,7 @@ GameObject:
   - component: {fileID: 5758809693931322658}
   - component: {fileID: 3074106987674206094}
   - component: {fileID: 3217947041013243399}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: CloseBtn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -734,7 +811,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5758809693931322681}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: AudioCer
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -774,7 +851,7 @@ GameObject:
   - component: {fileID: 5758809693931322686}
   - component: {fileID: 5758809693931322706}
   - component: {fileID: 5758809693931322663}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: Text
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -854,7 +931,7 @@ GameObject:
   - component: {fileID: 5758809693931322687}
   - component: {fileID: 5758809693931322711}
   - component: {fileID: 5758809693931322651}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: BG
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -932,7 +1009,7 @@ GameObject:
   - component: {fileID: 5758809693931322709}
   - component: {fileID: 5758809693931322650}
   - component: {fileID: 5758809693931322662}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: Close
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1056,7 +1133,7 @@ GameObject:
   - component: {fileID: 5758809693931322649}
   - component: {fileID: 7313187662518703696}
   - component: {fileID: 4504392803242618417}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: CloseBtn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1239,7 +1316,7 @@ GameObject:
   - component: {fileID: 5758809693931322666}
   - component: {fileID: 8935769573929253917}
   - component: {fileID: 814818982575365112}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: VideoBtnClose
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1426,7 +1503,7 @@ GameObject:
   - component: {fileID: 5758809693931322667}
   - component: {fileID: 560350446429551300}
   - component: {fileID: 6389890138484558080}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: redbg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1560,7 +1637,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5758809693931322688}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: VideoCer
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1598,7 +1675,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5758809693931322689}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: Video
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1638,7 +1715,7 @@ GameObject:
   - component: {fileID: 5758809693931322690}
   - component: {fileID: 5758809693931322719}
   - component: {fileID: 5758809693931322671}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: Touxiang
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1715,7 +1792,7 @@ GameObject:
   - component: {fileID: 5758809693931322691}
   - component: {fileID: 5758809693931322716}
   - component: {fileID: 5758809693931322668}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: add (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1791,7 +1868,7 @@ GameObject:
   - component: {fileID: 5758809693931322692}
   - component: {fileID: 5758809693931322718}
   - component: {fileID: 5758809693931322670}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: red
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1867,7 +1944,7 @@ GameObject:
   - component: {fileID: 5758809693931322693}
   - component: {fileID: 5758809693931322725}
   - component: {fileID: 5758809693931322723}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: VideoEmpty
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1958,7 +2035,7 @@ GameObject:
   - component: {fileID: 5758809693931322673}
   - component: {fileID: 307842231678669417}
   - component: {fileID: 315417197569170920}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: VideoBtnOpen
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2145,7 +2222,7 @@ GameObject:
   - component: {fileID: 5758809693931322676}
   - component: {fileID: 6377885340034710135}
   - component: {fileID: 6622630150203020752}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: add
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2284,7 +2361,7 @@ GameObject:
   - component: {fileID: 5758809693931322675}
   - component: {fileID: 1010404695226363847}
   - component: {fileID: 4333455492653511315}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: PauseBtn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2467,7 +2544,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5758809693931322698}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: VolumnGo
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2506,7 +2583,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5758809693931322699}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: Audio
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2550,7 +2627,7 @@ GameObject:
   - component: {fileID: 5758809693931322678}
   - component: {fileID: 4361840478188492257}
   - component: {fileID: 3798177805692343913}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: OpenBtn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2735,7 +2812,7 @@ GameObject:
   - component: {fileID: 5758809693931322701}
   - component: {fileID: 5758809693931322712}
   - component: {fileID: 5758809693931322679}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: name
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2814,7 +2891,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 5758809694748682105}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: view
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -2862,7 +2939,7 @@ GameObject:
   - component: {fileID: 8162804594127173601}
   - component: {fileID: 242730104939493131}
   - component: {fileID: 2347380948039149061}
-  m_Layer: 5
+  m_Layer: 13
   m_Name: AgoraShowVideo
   m_TagString: Untagged
   m_Icon: {fileID: 0}

+ 218 - 32
Assets/Studio/Scenes/Logo/Logo.unity

@@ -452,12 +452,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 623507474}
   m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
---- !u!4 &646664786 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 5142388694048500748, guid: 7cd0ceba7525bdc42a36be841a8aad16,
-    type: 3}
-  m_PrefabInstance: {fileID: 1836526756}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &653649476
 GameObject:
   m_ObjectHideFlags: 0
@@ -1890,10 +1884,15 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 5394885976978340327}
     m_Modifications:
-    - target: {fileID: 5142388695032135296, guid: 7cd0ceba7525bdc42a36be841a8aad16,
+    - target: {fileID: 2411008272923392955, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
-      propertyPath: isHand
-      value: 0
+      propertyPath: m_CullingMask.m_Bits
+      value: 8247
+      objectReference: {fileID: 0}
+    - target: {fileID: 4181028404793140007, guid: 7cd0ceba7525bdc42a36be841a8aad16,
+        type: 3}
+      propertyPath: m_CullingMask.m_Bits
+      value: 8247
       objectReference: {fileID: 0}
     - target: {fileID: 6007065485426161915, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
@@ -1955,8 +1954,29 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7361397498185573409, guid: 7cd0ceba7525bdc42a36be841a8aad16,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      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!4 &1836526757 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7361397498185573409, guid: 7cd0ceba7525bdc42a36be841a8aad16,
+    type: 3}
+  m_PrefabInstance: {fileID: 1836526756}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1884441341
 GameObject:
   m_ObjectHideFlags: 0
@@ -2033,6 +2053,145 @@ Camera:
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
+--- !u!1001 &1905675434
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3261079296200053995, guid: 250e36dc2dad7f745b2c72a96bb0e1cf,
+        type: 3}
+      propertyPath: m_Name
+      value: RTC
+      objectReference: {fileID: 0}
+    - target: {fileID: 4545480691616186318, guid: 250e36dc2dad7f745b2c72a96bb0e1cf,
+        type: 3}
+      propertyPath: m_CullingMask.m_Bits
+      value: 1079
+      objectReference: {fileID: 0}
+    - target: {fileID: 4545480692708950146, guid: 250e36dc2dad7f745b2c72a96bb0e1cf,
+        type: 3}
+      propertyPath: m_RaycastTarget
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4545480692708950147, guid: 250e36dc2dad7f745b2c72a96bb0e1cf,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4545480692708950147, guid: 250e36dc2dad7f745b2c72a96bb0e1cf,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4545480692708950147, guid: 250e36dc2dad7f745b2c72a96bb0e1cf,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4545480692828593037, guid: 250e36dc2dad7f745b2c72a96bb0e1cf,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 4545480692828593037, guid: 250e36dc2dad7f745b2c72a96bb0e1cf,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4545480692828593037, guid: 250e36dc2dad7f745b2c72a96bb0e1cf,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4545480692828593037, guid: 250e36dc2dad7f745b2c72a96bb0e1cf,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4545480692828593037, guid: 250e36dc2dad7f745b2c72a96bb0e1cf,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4545480692828593037, guid: 250e36dc2dad7f745b2c72a96bb0e1cf,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4545480692828593037, guid: 250e36dc2dad7f745b2c72a96bb0e1cf,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4545480692828593037, guid: 250e36dc2dad7f745b2c72a96bb0e1cf,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4545480692828593037, guid: 250e36dc2dad7f745b2c72a96bb0e1cf,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4545480692828593037, guid: 250e36dc2dad7f745b2c72a96bb0e1cf,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4545480692828593037, guid: 250e36dc2dad7f745b2c72a96bb0e1cf,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 250e36dc2dad7f745b2c72a96bb0e1cf, type: 3}
+--- !u!20 &1905675435 stripped
+Camera:
+  m_CorrespondingSourceObject: {fileID: 4545480691616186318, guid: 250e36dc2dad7f745b2c72a96bb0e1cf,
+    type: 3}
+  m_PrefabInstance: {fileID: 1905675434}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1905675436 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3261079296200053995, guid: 250e36dc2dad7f745b2c72a96bb0e1cf,
+    type: 3}
+  m_PrefabInstance: {fileID: 1905675434}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1905675437
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1905675436}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e47cdfd02765de74aac08f6db7ad7dcf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &1905675438 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4545480692708950268, guid: 250e36dc2dad7f745b2c72a96bb0e1cf,
+    type: 3}
+  m_PrefabInstance: {fileID: 1905675434}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1905675439
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1905675438}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d4c33e92d8dc2934e919ffa2ff71afd6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isARCamrea: 1
+  CaptureImage: {fileID: 0}
+  RGBCamTexture: {fileID: 0}
 --- !u!1 &1996614596
 GameObject:
   m_ObjectHideFlags: 0
@@ -2985,7 +3144,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2309188711661632037}
   - component: {fileID: 2309188711661632034}
-  - component: {fileID: 2309188711661632035}
+  - component: {fileID: 2309188711661632038}
   m_Layer: 0
   m_Name: EventSystem
   m_TagString: Untagged
@@ -3008,26 +3167,6 @@ MonoBehaviour:
   m_FirstSelected: {fileID: 0}
   m_sendNavigationEvents: 1
   m_DragThreshold: 10
---- !u!114 &2309188711661632035
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2309188711661632032}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_SendPointerHoverToParent: 1
-  m_HorizontalAxis: Horizontal
-  m_VerticalAxis: Vertical
-  m_SubmitButton: Submit
-  m_CancelButton: Cancel
-  m_InputActionsPerSecond: 10
-  m_RepeatDelay: 0.5
-  m_ForceModuleActive: 0
 --- !u!4 &2309188711661632037
 Transform:
   m_ObjectHideFlags: 0
@@ -3043,6 +3182,47 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2309188711661632038
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2309188711661632032}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_SendPointerHoverToParent: 1
+  m_MoveRepeatDelay: 0.5
+  m_MoveRepeatRate: 0.1
+  m_XRTrackingOrigin: {fileID: 0}
+  m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018,
+    type: 3}
+  m_DeselectOnBackgroundClick: 1
+  m_PointerBehavior: 0
+  m_CursorLockBehavior: 0
 --- !u!114 &3694994520631113235
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3822,7 +4002,7 @@ Transform:
   m_Children:
   - {fileID: 3694994520887372816}
   - {fileID: 3694994520946098762}
-  - {fileID: 646664786}
+  - {fileID: 1836526757}
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3847,9 +4027,15 @@ MonoBehaviour:
   m_GameObject: {fileID: 5394885976978340325}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e43ea5875156c3743943701fec0f757a, type: 3}
+  m_Script: {fileID: 11500000, guid: b1ce24e1d47f4ff42879f59114bf691b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _appIdInput: {fileID: 11400000, guid: 300c6525f002a4dbaac41a5c4b054e35, type: 2}
+  _appID: 
+  _token: 
+  _channelName: 
+  isSwitchCamera: 0
+  cam2: {fileID: 1905675435}
 --- !u!222 &8059137849200321610
 CanvasRenderer:
   m_ObjectHideFlags: 0

File diff suppressed because it is too large
+ 425 - 666
Assets/Studio/Scenes/Show/Show.unity


+ 24 - 15
Assets/Studio/Scripts/Room/StudioRtc.cs

@@ -74,29 +74,38 @@ public class StudioRtc : SCRtcManager
     public Texture2D tex;
     public void startCamera()
     {
+        Debug.Log("startCamera===>");
             if (!CheckDeviceType.checkIsPhone())
+        {
+            if (DeviceType.type == "Phone")
+            {
+
+            }
+            else
             {
                 ConsoleDlg.Instance.vufora_camera.enabled = false;
                 Vuforia.VuforiaBehaviour.Instance.enabled = false;
             }
+            }
             if (rt == null)
             {
                 rt = new RenderTexture(CustomInfo.mWidth, CustomInfo.mHight, 1);
-            }
-            //cam.targetTexture = rt;
-            //me.setMyCamera(rt);
-            //if (tex == null)
-            //{
-            //    tex = new Texture2D(CustomInfo.mWidth, CustomInfo.mHight, TextureFormat.RGBA32, false);
-            //}
-            //if (!CheckDeviceType.checkIsPhone())
-            //{
-            //    meshRender.material.mainTexture = tex;
-            //    SCRtcFactory.Instance.mSCRtcHandle.addCameraLocal(meshRender.material.mainTexture.GetNativeTexturePtr().ToInt32());
-            //    SCRtcFactory.Instance.mSCRtcHandle.startCamera();
-            //    meshRender.transform.localEulerAngles = new Vector3(0, 180, 180);
-            //    meshRender.gameObject.SetActive(true);
-            //}
+        }
+        XRRGBCamera.Instance.playCamera();
+        //cam.targetTexture = rt;
+        //me.setMyCamera(rt);
+        //if (tex == null)
+        //{
+        //    tex = new Texture2D(CustomInfo.mWidth, CustomInfo.mHight, TextureFormat.RGBA32, false);
+        //}
+        //if (!CheckDeviceType.checkIsPhone())
+        //{
+        //    meshRender.material.mainTexture = tex;
+        //    SCRtcFactory.Instance.mSCRtcHandle.addCameraLocal(meshRender.material.mainTexture.GetNativeTexturePtr().ToInt32());
+        //    SCRtcFactory.Instance.mSCRtcHandle.startCamera();
+        //    meshRender.transform.localEulerAngles = new Vector3(0, 180, 180);
+        //    meshRender.gameObject.SetActive(true);
+        //}
     }
 
     public void stopCamera()

+ 14 - 1
Assets/Studio/_3HomeScene/HomeSceneScripts_new/UI/MenuUI.cs

@@ -7,6 +7,7 @@ using UnityEngine.EventSystems;
 using UnityEngine.UI;
 using SC.XR.Unity;
 using XRTool.Util;
+using SC.XR.Unity.Module_InputSystem.InputDeviceHead;
 
 public class MenuUI : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler
 {
@@ -207,7 +208,13 @@ public class MenuUI : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHa
         Destroy(ob);
         SCPointEventData sed = eventData as SCPointEventData;
         ob = new GameObject();
-        ob.transform.parent = sed.inputDevicePartBase.transform;
+       if( DeviceType.type== "Rhinox")
+        ob.transform.parent = sed.inputDevicePartBase.inputDevicePartUIBase.transform;
+       else
+        {
+            ob.transform.parent = sed.inputDevicePartBase.transform;
+
+        }
         ob.transform.position = (eventData as SCPointEventData).PressPosition3D;
         ob.transform.localEulerAngles = Vector3.zero;
         bx = ob.transform.localPosition.x;
@@ -216,6 +223,12 @@ public class MenuUI : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHa
     public void OnDrag(PointerEventData eventData)
     {
         SCPointEventData sed = eventData as SCPointEventData;
+        if(sed.inputDevicePartBase is InputDeviceHeadPart)
+        {
+            sed.inputDevicePartBase.transform.position = OpenXRCamera.Instance.head.position;
+            sed.inputDevicePartBase.transform.eulerAngles = OpenXRCamera.Instance.head.eulerAngles;
+
+        }
         ob.transform.position = (eventData as SCPointEventData).PressPosition3D;
         float ox = ob.transform.localPosition.x;
         //  return;

+ 16 - 2
Assets/Studio/_4ShowScene/BoardFunctionModule/Scripts/BoardDlg.cs

@@ -425,11 +425,25 @@ namespace ShadowStudio.Tool
             }
             if (ConsoleDlg.Instance!=null && ConsoleDlg.Instance.vufora_camera != null)
             {
-                ConsoleDlg.Instance.vufora_camera.enabled = false;
+                if (DeviceType.type == "Phone")
+                {
+
+                }
+                else
+                {
+                    ConsoleDlg.Instance.vufora_camera.enabled = false;
+                }
             }
             if (Vuforia.VuforiaBehaviour.Instance != null)
             {
-                Vuforia.VuforiaBehaviour.Instance.enabled = false;
+                if (DeviceType.type == "Phone")
+                {
+                }
+                else
+                {
+                    Vuforia.VuforiaBehaviour.Instance.enabled = false;
+
+                }
             }
             if (ConsoleDlg.Instance != null && ConsoleDlg.Instance.vufora_camera != null)
             {

+ 36 - 13
Assets/Studio/_4ShowScene/ConsoleFunctionModule/DlgScripts/ConsoleDlg.cs

@@ -118,12 +118,25 @@ namespace ShadowStudio.UI
 
         private void InitScan()
         {
-            vufora_camera.enabled = false;
-            Vuforia.VuforiaBehaviour.Instance.enabled = false;
+            if (DeviceType.type == "Phone")
+            {
+            }
+            else
+            {
+                vufora_camera.enabled = false;
+                Vuforia.VuforiaBehaviour.Instance.enabled = false;
+
+            }
+            XRRGBCamera.Instance.playCamera();
         }
 
         public void ClickOnScan()
         {
+            if(DeviceType.type== "Phone")
+            {
+                return;
+            }
+
             if (vufora_camera.enabled == true)
             {
                 CommonMethod.ShowScanEffect(false);
@@ -133,6 +146,10 @@ namespace ShadowStudio.UI
                 //{
                 //  //  StudioRtc.Instance.startCamera();
                 //}
+                XRRGBCamera.Instance.playCamera();
+                Debug.Log("startCamera===>");
+
+
                 if (ScanPictureBtn.Instance.Bg)
                 {
                     ScanPictureBtn.Instance.Bg.gameObject.SetActive(false);
@@ -150,7 +167,8 @@ namespace ShadowStudio.UI
             }
             else
             {
-                if(AgoraRTCManager.Instance.isSwitchCamera)
+                XRRGBCamera.Instance.stopCamera();
+                if (AgoraRTCManager.Instance.isSwitchCamera)
                 {
                     AgoraRTCManager.Instance.RtcEngine.SwitchCamera();
                     AgoraRTCManager.Instance.isSwitchCamera = !AgoraRTCManager.Instance.isSwitchCamera;
@@ -173,16 +191,21 @@ namespace ShadowStudio.UI
 
         public void CloseScan()
         {
-            //if (vufora_camera.enabled == true)
-            //{
-            //    CommonMethod.ShowScanEffect(false);
-            //    vufora_camera.enabled = false;
-            //    Vuforia.VuforiaBehaviour.Instance.enabled = false;
-            //    //if (StudioRtc.Instance != null && StudioRtc.Instance.me != null)
-            //    //{
-            //    //    StudioRtc.Instance.startCamera();
-            //    //}
-            //}
+            if (DeviceType.type == "Phone")
+            { 
+                return;
+            }
+            if (vufora_camera.enabled == true)
+            {
+                CommonMethod.ShowScanEffect(false);
+                vufora_camera.enabled = false;
+                Vuforia.VuforiaBehaviour.Instance.enabled = false;
+                //if (StudioRtc.Instance != null && StudioRtc.Instance.me != null)
+                //{
+                //    StudioRtc.Instance.startCamera();
+                //}
+                XRRGBCamera.Instance.playCamera();
+            }
         }
 
         private void shortcutkeyShow()

+ 35 - 4
Assets/Studio/_4ShowScene/ScanpicFunctionModule/Scripts/VuforiaFindAction.cs

@@ -38,11 +38,25 @@ public class VuforiaFindAction : DefaultObserverEventHandler// DefaultTrackableE
                 {
                     if (ConsoleDlg.Instance && ConsoleDlg.Instance.vufora_camera)
                     {
-                        ConsoleDlg.Instance.vufora_camera.enabled = false;
+                        if (DeviceType.type == "Phone")
+                        {
+
+                        }
+                        else
+                        {
+                            ConsoleDlg.Instance.vufora_camera.enabled = false;
+                        }
                     }
                     if (VuforiaBehaviour.Instance)
                     {
-                        VuforiaBehaviour.Instance.enabled = false;
+                        if (DeviceType.type == "Phone")
+                        {
+                            
+                        }else
+                        {
+
+                            VuforiaBehaviour.Instance.enabled = false;
+                        }
                     }
                 }
                 CommonMethod.ShowScanEffect(false);
@@ -56,6 +70,7 @@ public class VuforiaFindAction : DefaultObserverEventHandler// DefaultTrackableE
                 //{
                 //    StudioRtc.Instance.startCamera();
                 //}
+                XRRGBCamera.Instance.playCamera();
                 AgoraRTCManager.Instance.JoinChannel();
             }
         }
@@ -74,10 +89,25 @@ public class VuforiaFindAction : DefaultObserverEventHandler// DefaultTrackableE
             {
                 if (ConsoleDlg.Instance && ConsoleDlg.Instance.vufora_camera)
                 {
-                    ConsoleDlg.Instance.vufora_camera.enabled = false;
+                    if (DeviceType.type == "Phone")
+                    {
+
+                    }
+                    else
+                    {
+                        ConsoleDlg.Instance.vufora_camera.enabled = false;
+                    }
                 }
-                if (VuforiaBehaviour.Instance)
+            }
+            if (VuforiaBehaviour.Instance)
+            {
+                if (DeviceType.type == "Phone")
                 {
+
+                }
+                else
+                {
+
                     VuforiaBehaviour.Instance.enabled = false;
                 }
             }
@@ -85,6 +115,7 @@ public class VuforiaFindAction : DefaultObserverEventHandler// DefaultTrackableE
             //{
             //    StudioRtc.Instance.startCamera();
             //}
+            XRRGBCamera.Instance.playCamera();
             CommonMethod.ShowScanEffect(false);
             if (ScanPictureBtn.Instance.Bg)
             {

+ 1 - 1
Assets/XR/XRGeneralSettings.asset

@@ -44,7 +44,7 @@ MonoBehaviour:
   m_AutomaticLoading: 0
   m_AutomaticRunning: 0
   m_Loaders:
-  - {fileID: 11400000, guid: e1339d3b24f7bd145a9ec425510ff76d, type: 2}
+  - {fileID: 11400000, guid: 97a54d00d2333ae4ba370524d38b1b1d, type: 2}
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0

Some files were not shown because too many files changed in this diff