Browse Source

关闭多余的LogError,修改手机版声网获取摄像头和ARCore冲突问题

DGJ 1 year ago
parent
commit
0ea1985a77

+ 18 - 18
Assets/GHZScritps/AgoraRTCManager.cs

@@ -119,7 +119,7 @@ public class AgoraRTCManager : SingletonMono<AgoraRTCManager>
         RtcEngine.SetChannelProfile(CHANNEL_PROFILE_TYPE.CHANNEL_PROFILE_COMMUNICATION);
         RtcEngine.SetClientRole(CLIENT_ROLE_TYPE.CLIENT_ROLE_BROADCASTER);
         RtcEngine.JoinChannel(_token, _channelName, "", uid);
-        if (!isSwitchCamera&&DeviceType.type != "Rhinox")
+        if (!isSwitchCamera&&(DeviceType.type != "Rhinox"|| DeviceType.type!= "Phone"))
         {
             RtcEngine.SwitchCamera();
             isSwitchCamera = !isSwitchCamera;
@@ -134,10 +134,10 @@ public class AgoraRTCManager : SingletonMono<AgoraRTCManager>
         switch (msg)
         {
             case 0:
-                Debug.Log( "成功退出频道: " + _channelName);
+                Debug.Log( "鎴愬姛閫€鍑洪�閬擄細 " + _channelName);
                 break;
             default:
-                Debug.Log("退出频道失败: " + msg);
+                Debug.Log("閫€鍑洪�閬撳け璐ワ細 " + msg);
                 break;
         }
        
@@ -251,11 +251,11 @@ public class AgoraRTCManager : SingletonMono<AgoraRTCManager>
         switch (msg)
         {
             case 0:
-                Debug.Log(isAudio ? "打开本地音频成功" : "关闭本地音频成功 ");
+                Debug.Log(isAudio ? "鎵撳紑鏈�湴闊抽�鎴愬姛" : "鍏抽棴鏈�湴闊抽�鎴愬姛 ");
                 MyPeer.isOpenAduio = !isAudio;
                 break;
             default:
-                Debug.LogError("开关本地音频失败: " + msg);
+                Debug.LogError("寮€鍏虫湰鍦伴煶棰戝け璐ワ細 " + msg);
                 break;
         }
     }
@@ -270,10 +270,10 @@ public class AgoraRTCManager : SingletonMono<AgoraRTCManager>
         switch (msg)
         {
             case 0:
-                Debug.Log(isAudio ? "订阅远端音频成功" : "取订远端音频成功 ");
+                Debug.Log(isAudio ? "璁㈤槄杩滅�闊抽�鎴愬姛" : "鍙栬�杩滅�闊抽�鎴愬姛 ");
                 break;
             default:
-                Debug.LogError("开关本地音频失败: " + msg);
+                Debug.LogError("寮€鍏虫湰鍦伴煶棰戝け璐ワ細 " + msg);
                 break;
         }
     }
@@ -288,12 +288,12 @@ public class AgoraRTCManager : SingletonMono<AgoraRTCManager>
         switch (msg)
         {
             case 0:
-                Debug.Log(isVideo ? "打开本地视频成功 " : "关闭本地视频成功 ");
+                Debug.Log(isVideo ? "鎵撳紑鏈�湴瑙嗛�鎴愬姛 " : "鍏抽棴鏈�湴瑙嗛�鎴愬姛 ");
                 //  myPeer.isCloseVideo = !isVideo;
                 MyPeer.isOpenVideo = !isVideo;
                 break;
             default:
-                Debug.LogError("开关本地视频失败: " + msg);
+                Debug.LogError("寮€鍏虫湰鍦拌�棰戝け璐ワ細 " + msg);
                 break;
         }
 
@@ -310,10 +310,10 @@ public class AgoraRTCManager : SingletonMono<AgoraRTCManager>
         switch (msg)
         {
             case 0:
-                Debug.Log(isVideo ? "订阅远端视频成功" : "取订远端视频成功 ");
+                Debug.Log(isVideo ? "璁㈤槄杩滅�瑙嗛�鎴愬姛" : "鍙栬�杩滅�瑙嗛�鎴愬姛 ");
                 break;
             default:
-                Debug.LogError("开关本地音频失败: " + msg);
+                Debug.LogError("寮€鍏虫湰鍦伴煶棰戝け璐ワ細 " + msg);
                 break;
         }
     }
@@ -352,33 +352,33 @@ 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:// 缃戠粶鎭㈠�姝e父銆�
 
                         //  listCustomPeer[i].isVideo = true;
                         break;
-                    case REMOTE_VIDEO_STATE_REASON.REMOTE_VIDEO_STATE_REASON_LOCAL_MUTED://本地用户停止接收远端视频流或本地用户禁用视频模块
+                    case REMOTE_VIDEO_STATE_REASON.REMOTE_VIDEO_STATE_REASON_LOCAL_MUTED://鏈�湴鐢ㄦ埛鍋滄�鎺ユ敹杩滅�瑙嗛�娴佹垨鏈�湴鐢ㄦ埛绂佺敤瑙嗛�妯″潡
 
                         listCustomPeer[i].isOpenVideo = true;
                         break;
-                    case REMOTE_VIDEO_STATE_REASON.REMOTE_VIDEO_STATE_REASON_LOCAL_UNMUTED://本地用户恢复接收远端视频流或本地用户启动视频模块
+                    case REMOTE_VIDEO_STATE_REASON.REMOTE_VIDEO_STATE_REASON_LOCAL_UNMUTED://鏈�湴鐢ㄦ埛鎭㈠�鎺ユ敹杩滅�瑙嗛�娴佹垨鏈�湴鐢ㄦ埛鍚�姩瑙嗛�妯″潡
 
                         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/StreamingAssets/build_info

@@ -1 +1 @@
-Build from YUNYUNGEGE at 2023/7/20 11:04:32
+Build from SK-20211220VCWK at 2023/7/20 15:48:34

+ 26 - 8
Assets/Studio/Scenes/Logo/Logo.unity

@@ -335,6 +335,12 @@ 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
@@ -452,12 +458,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
@@ -3789,6 +3789,7 @@ GameObject:
   - component: {fileID: 5394885976978340326}
   - component: {fileID: 5394885976978340328}
   - component: {fileID: 5394885976978340329}
+  - component: {fileID: 5394885976978340330}
   m_Layer: 0
   m_Name: GameSession
   m_TagString: Untagged
@@ -3822,7 +3823,7 @@ Transform:
   m_Children:
   - {fileID: 3694994520887372816}
   - {fileID: 3694994520946098762}
-  - {fileID: 646664786}
+  - {fileID: 139663243}
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3847,7 +3848,24 @@ 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
+--- !u!114 &5394885976978340330
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5394885976978340325}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d6f4dd70a4dd94b42ac93af72b907ec2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
 --- !u!222 &8059137849200321610

+ 2 - 2
Assets/Studio/Scripts/Room/Container/Base/ArtContainerHandler.cs

@@ -1,4 +1,4 @@
-using BeinLab.Util;
+using BeinLab.Util;
 using DG.Tweening;
 using LitJson;
 using PublicTools.Unity;
@@ -297,7 +297,7 @@ namespace ShadowStudio.Model
                     Vector3 startScale = endScale / 2f;
                     transform.localScale = startScale;
                 }
-                Debug.LogError(transform.name + " DoScale   1  ");
+              //  Debug.LogError(transform.name + " DoScale   1  ");
                 transform.DOScale(endScale, 0.8f).SetEase<Tween>(Ease.OutCubic).SetDelay(0.2f).OnComplete(() =>
                 {
                     TransferState = TransferState.Over;

+ 5 - 5
Assets/Studio/XRLib/Codes/XRUI/WorldDlg.cs

@@ -1,4 +1,4 @@
-using BeinLab.Util;
+using BeinLab.Util;
 using DG.Tweening;
 using ShadowStudio.Tool;
 using System;
@@ -332,7 +332,7 @@ namespace XRTool.WorldUI
             Ease ease = Ease.OutBack;
             if (scaleDefault != Vector3.zero)
             {
-                Debug.LogError("showNormalYEffect");
+               // Debug.LogError("showNormalYEffect");
                 transform.DOKill();
                 transform.localScale = new Vector3(scaleDefault.x, scaleDefault.y / 100, scaleDefault.z);
                 float activeTime = 0.3f;
@@ -349,7 +349,7 @@ namespace XRTool.WorldUI
             Ease ease = Ease.OutBack;
             if (scaleDefault != Vector3.zero)
             {
-                Debug.LogError("showNormalEffect");
+              //  Debug.LogError("showNormalEffect");
                 transform.DOKill();
                 transform.localScale = scaleDefault / 100;
                 float activeTime = 0.3f;
@@ -363,7 +363,7 @@ namespace XRTool.WorldUI
 
         void hideNormalYEffect(Action action)
         {
-            Debug.LogError("hideNormalYEffect");
+            //Debug.LogError("hideNormalYEffect");
             Ease ease = Ease.InBack;
             transform.DOKill();
             float activeTime = 0.3f;
@@ -377,7 +377,7 @@ namespace XRTool.WorldUI
 
         void hideNormalEffect(Action action)
         {
-            Debug.LogError("hideNormalEffect");
+           // Debug.LogError("hideNormalEffect");
             Ease ease = Ease.InBack;
             transform.DOKill();
             float activeTime = 0.3f;

+ 86 - 0
GHZMRSpaceXR.sln

@@ -0,0 +1,86 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{615ACB60-7481-2B11-05CA-D1D7ECE4D507}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Runtime", "AVProVideo.Runtime.csproj", "{E0401D9F-2E5D-4E0F-11E8-5C010DF18BAD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarsPB", "MarsPB.csproj", "{39D8A39D-551A-7EE4-DF2B-683F2184A386}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Demos", "AVProVideo.Demos.csproj", "{B4FA4F2C-5A03-B7CA-FE63-252418910BB9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Extensions.Timeline", "AVProVideo.Extensions.Timeline.csproj", "{645EC6B1-0F78-6394-2887-4A5829512E27}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Extensions.UnityUI", "AVProVideo.Extensions.UnityUI.csproj", "{EF6AD545-1FEC-FF18-19E4-AC36EACDB8A3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Extensions.VisualEffectGraph", "AVProVideo.Extensions.VisualEffectGraph.csproj", "{DAE146D9-4257-171E-34CA-698928D18F2D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{1ADC403E-5E2E-EDDF-7F74-E8800AE7222B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Editor", "AVProVideo.Editor.csproj", "{20F5FB08-E1A3-5AAC-E3D6-A85B89A5EEF9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{0B921971-FAAE-A324-DFD6-5664460350D6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demos.StandardShader.Inspectors", "Demos.StandardShader.Inspectors.csproj", "{C6035E5C-13BC-80B4-D80F-D23A6A3C3C0D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AVProVideo.Extensions.UnityUI.Editor", "AVProVideo.Extensions.UnityUI.Editor.csproj", "{E0B7EE78-46C7-1D1F-B7A4-57FB6C3E0FEA}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{615ACB60-7481-2B11-05CA-D1D7ECE4D507}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{615ACB60-7481-2B11-05CA-D1D7ECE4D507}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{615ACB60-7481-2B11-05CA-D1D7ECE4D507}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{615ACB60-7481-2B11-05CA-D1D7ECE4D507}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E0401D9F-2E5D-4E0F-11E8-5C010DF18BAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0401D9F-2E5D-4E0F-11E8-5C010DF18BAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E0401D9F-2E5D-4E0F-11E8-5C010DF18BAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E0401D9F-2E5D-4E0F-11E8-5C010DF18BAD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39D8A39D-551A-7EE4-DF2B-683F2184A386}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39D8A39D-551A-7EE4-DF2B-683F2184A386}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39D8A39D-551A-7EE4-DF2B-683F2184A386}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39D8A39D-551A-7EE4-DF2B-683F2184A386}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4FA4F2C-5A03-B7CA-FE63-252418910BB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4FA4F2C-5A03-B7CA-FE63-252418910BB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4FA4F2C-5A03-B7CA-FE63-252418910BB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4FA4F2C-5A03-B7CA-FE63-252418910BB9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{645EC6B1-0F78-6394-2887-4A5829512E27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{645EC6B1-0F78-6394-2887-4A5829512E27}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{645EC6B1-0F78-6394-2887-4A5829512E27}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{645EC6B1-0F78-6394-2887-4A5829512E27}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF6AD545-1FEC-FF18-19E4-AC36EACDB8A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF6AD545-1FEC-FF18-19E4-AC36EACDB8A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF6AD545-1FEC-FF18-19E4-AC36EACDB8A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF6AD545-1FEC-FF18-19E4-AC36EACDB8A3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DAE146D9-4257-171E-34CA-698928D18F2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DAE146D9-4257-171E-34CA-698928D18F2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DAE146D9-4257-171E-34CA-698928D18F2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DAE146D9-4257-171E-34CA-698928D18F2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1ADC403E-5E2E-EDDF-7F74-E8800AE7222B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1ADC403E-5E2E-EDDF-7F74-E8800AE7222B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1ADC403E-5E2E-EDDF-7F74-E8800AE7222B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1ADC403E-5E2E-EDDF-7F74-E8800AE7222B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20F5FB08-E1A3-5AAC-E3D6-A85B89A5EEF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20F5FB08-E1A3-5AAC-E3D6-A85B89A5EEF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20F5FB08-E1A3-5AAC-E3D6-A85B89A5EEF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20F5FB08-E1A3-5AAC-E3D6-A85B89A5EEF9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B921971-FAAE-A324-DFD6-5664460350D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B921971-FAAE-A324-DFD6-5664460350D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B921971-FAAE-A324-DFD6-5664460350D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B921971-FAAE-A324-DFD6-5664460350D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C6035E5C-13BC-80B4-D80F-D23A6A3C3C0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6035E5C-13BC-80B4-D80F-D23A6A3C3C0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6035E5C-13BC-80B4-D80F-D23A6A3C3C0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C6035E5C-13BC-80B4-D80F-D23A6A3C3C0D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E0B7EE78-46C7-1D1F-B7A4-57FB6C3E0FEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0B7EE78-46C7-1D1F-B7A4-57FB6C3E0FEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E0B7EE78-46C7-1D1F-B7A4-57FB6C3E0FEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E0B7EE78-46C7-1D1F-B7A4-57FB6C3E0FEA}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

+ 1 - 1
Packages/manifest.json

@@ -11,7 +11,7 @@
     "com.unity.visualscripting": "1.7.8",
     "com.unity.xr.arcore": "4.2.8",
     "com.unity.xr.openxr": "1.5.3",
-    "jh.xr.engine": "file:D:/JiHe/XRSDK/package",
+    "jh.xr.engine": "file:G:/GUnityProject/XRSDK/package",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

+ 16 - 2
Packages/packages-lock.json

@@ -121,6 +121,17 @@
       },
       "url": "https://packages.unity.cn"
     },
+    "com.unity.xr.arfoundation": {
+      "version": "4.2.8",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.xr.arsubsystems": "4.2.8",
+        "com.unity.xr.management": "4.0.1",
+        "com.unity.modules.particlesystem": "1.0.0"
+      },
+      "url": "https://packages.unity.cn"
+    },
     "com.unity.xr.arsubsystems": {
       "version": "4.2.8",
       "depth": 1,
@@ -166,13 +177,16 @@
       "url": "https://packages.unity.cn"
     },
     "jh.xr.engine": {
-      "version": "file:D:/JiHe/XRSDK/package",
+      "version": "file:G:/GUnityProject/XRSDK/package",
       "depth": 0,
       "source": "local",
       "dependencies": {
         "com.unity.xr.management": "4.0.1",
         "com.unity.xr.legacyinputhelpers": "2.1.2",
-        "com.unity.inputsystem": "1.4.2"
+        "com.unity.inputsystem": "1.4.2",
+        "com.unity.xr.arcore": "4.2.8",
+        "com.unity.xr.arfoundation": "4.2.8",
+        "com.unity.xr.openxr": "1.5.3"
       }
     },
     "com.unity.modules.ai": {

+ 4 - 7
ProjectSettings/ProjectSettings.asset

@@ -8,7 +8,7 @@ PlayerSettings:
   AndroidProfiler: 0
   AndroidFilterTouchesWhenObscured: 0
   AndroidEnableSustainedPerformanceMode: 0
-  defaultScreenOrientation: 0
+  defaultScreenOrientation: 3
   targetDevice: 2
   useOnDemandResources: 0
   accelerometerFrequency: 60
@@ -152,9 +152,6 @@ PlayerSettings:
   - {fileID: 0}
   - {fileID: 0}
   - {fileID: 0}
-  - {fileID: -7757256057747849950, guid: bf1be7b556e14e44aadbe8ccbd6b4a1d, type: 2}
-  - {fileID: 3407827143893180361, guid: 93ed3b462c7c82d4594fa4d925b91911, type: 2}
-  - {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -928,6 +925,7 @@ PlayerSettings:
   metroSplashScreenUseBackgroundColor: 1
   platformCapabilities:
     WindowsStoreApps:
+      EnterpriseAuthentication: False
       OfflineMapsManagement: False
       HumanInterfaceDevice: False
       Location: False
@@ -939,7 +937,6 @@ PlayerSettings:
       PrivateNetworkClientServer: False
       InternetClientServer: False
       VideosLibrary: False
-      BackgroundMediaPlayback: False
       Objects3D: False
       RemoteSystem: False
       BlockedChatMessages: False
@@ -962,9 +959,9 @@ PlayerSettings:
       RecordedCallsFolder: False
       Contacts: False
       InternetClient: True
-      Proximity: False
       CodeGeneration: False
-      EnterpriseAuthentication: False
+      BackgroundMediaPlayback: False
+      Proximity: False
   metroTargetDeviceFamilies:
     Desktop: False
     Holographic: False