Browse Source

提交修改

胡佳骏 1 year ago
parent
commit
19915c6dd3

+ 3 - 3
Assets/GHZScritps/AgoraRTCManager.cs

@@ -294,17 +294,17 @@ public class AgoraRTCManager : SingletonMono<AgoraRTCManager>
     public void AgoarRawImageVideoView(string peerId, RawImage rawImage)
     {
 
+        Debug.Log(" AgoarRawImageVideoView " + peerId);
         try
         {
             if (peerId == CommonMethod.MyPeer.PeerId)
             {
                 rawImage.gameObject.SetActive(true);
-                rawImage.rectTransform.localEulerAngles += new Vector3(0, 180, 180);
+                rawImage.rectTransform.localEulerAngles = new Vector3(0, 180, 180);
                 MakeVideoView(0, rawImage);
             }
             else if (dicPeeridAndUid.ContainsKey(peerId))
             {
-                Debug.Log(" AddListShowView " + peerId);
                 //  list_ShowView.Add(peerId, rawImage);
                 rawImage.gameObject.SetActive(true);
                 rawImage.rectTransform.localEulerAngles = new Vector3(0, 0, 180);
@@ -581,7 +581,7 @@ public class AgoraRTCManager : SingletonMono<AgoraRTCManager>
         }
         else
         {
-            rawImage.transform.localEulerAngles = new Vector3(-180,0,0);
+            rawImage.transform.localEulerAngles = new Vector3(-180,180,0);
             var videoSurface = MakeImageSurface(rawImage);
 
             if (ReferenceEquals(videoSurface, null)) return;

+ 1 - 1
Assets/GHZScritps/HttpsSendLog.cs

@@ -43,7 +43,7 @@ public class HttpsSendLog : SingletonMono<HttpsSendLog>
         times += Time.deltaTime;
         if(times>1&&qSendLog.Count>0)
         {
-            PostTest("", qSendLog.Dequeue());
+         //   PostTest("", qSendLog.Dequeue());
         }
     }
 

+ 2 - 3
Assets/Plugins/Android/AndroidManifest.xml

@@ -2,8 +2,7 @@
 <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"
-               android:requestLegacyExternalStorage="true">
+  <application android:theme="@style/UnityThemeSelector" android:icon="@mipmap/app_icon" android:label="@string/app_name" android:requestLegacyExternalStorage="true">
     <activity android:name="com.unity3d.player.UnityPlayerActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
@@ -11,9 +10,9 @@
       </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" />
-
   <uses-permission android:name="android.permission.RECORD_AUDIO" />
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
   <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />

+ 1 - 1
Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from YUNYUNGEGE at 2023/9/11 10:27:31
+Build from YUNYUNGEGE at 2023/9/13 10:20:53

+ 9 - 7
Assets/Studio/Scenes/Logo/Logo.unity

@@ -465,8 +465,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d4c33e92d8dc2934e919ffa2ff71afd6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  isARCamrea: 1
   CaptureImage: {fileID: 0}
   RGBCamTexture: {fileID: 0}
+  cameraManager: {fileID: 0}
 --- !u!1 &653649476
 GameObject:
   m_ObjectHideFlags: 0
@@ -1712,12 +1714,6 @@ Transform:
   m_Father: {fileID: 1512050909}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &1628008944 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 8475401995549084109, guid: 7cd0ceba7525bdc42a36be841a8aad16,
-    type: 3}
-  m_PrefabInstance: {fileID: 1836526756}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1727267707
 GameObject:
   m_ObjectHideFlags: 0
@@ -2037,6 +2033,12 @@ PrefabInstance:
       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
@@ -3924,7 +3926,7 @@ Transform:
   m_Children:
   - {fileID: 3694994520887372816}
   - {fileID: 3694994520946098762}
-  - {fileID: 1628008944}
+  - {fileID: 1836526757}
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 1 - 1
Assets/XR/XRGeneralSettings.asset

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