Merge branch 'F/0703_XRSDK-1.0' of https://gogs.ghz-tech.com:8843/GHzGlass/GHZMRSpaceXR into F/0703_XRSDK-1.0

# Conflicts:
#	Assets/StreamingAssets/build_info
#	Assets/Studio/Scenes/Logo/Logo.unity
#	Packages/manifest.json
#	Packages/packages-lock.json
#	ProjectSettings/ProjectSettings.asset

Assets/GHZScritps/AgoraRTCManager.cs

@@ -123,7 +123,7 @@ public class AgoraRTCManager : SingletonMono<AgoraRTCManager>
         RtcEngine.SetExternalVideoSource(true, true, EXTERNAL_VIDEO_SOURCE_TYPE.VIDEO_FRAME, new SenderOptions());
 
         RtcEngine.JoinChannel(_token, _channelName, "", uid);
-        if (!isSwitchCamera&&DeviceType.type != "Rhinox")
+        if (!isSwitchCamera&&(DeviceType.type != "Rhinox"|| DeviceType.type!= "Phone"))
         {
             RtcEngine.SwitchCamera();
             isSwitchCamera = !isSwitchCamera;
@@ -210,10 +210,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;
         }
        
@@ -327,11 +327,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;
         }
     }
@@ -346,10 +346,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;
         }
     }
@@ -364,12 +364,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;
         }
 
@@ -386,10 +386,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;
         }
     }
@@ -428,33 +428,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:// 缃戠粶鎭㈠�姝ｅ父銆�
 
                         //  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;

Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from YUNYUNGEGE at 2023/8/1 16:26:29
+Build from SK-20211220VCWK at 2023/7/20 15:48:34

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
@@ -1884,15 +1890,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 5394885976978340327}
     m_Modifications:
-    - target: {fileID: 2411008272923392955, guid: 7cd0ceba7525bdc42a36be841a8aad16,
+    - target: {fileID: 5142388695032135296, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
-      propertyPath: m_CullingMask.m_Bits
-      value: 8247
-      objectReference: {fileID: 0}
-    - target: {fileID: 4181028404793140007, guid: 7cd0ceba7525bdc42a36be841a8aad16,
-        type: 3}
-      propertyPath: m_CullingMask.m_Bits
-      value: 8247
+      propertyPath: isHand
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6007065485426161915, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
@@ -1954,29 +1955,8 @@ 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
@@ -2053,145 +2033,6 @@ 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
@@ -3144,7 +2985,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2309188711661632037}
   - component: {fileID: 2309188711661632034}
-  - component: {fileID: 2309188711661632038}
+  - component: {fileID: 2309188711661632035}
   m_Layer: 0
   m_Name: EventSystem
   m_TagString: Untagged
@@ -3167,6 +3008,26 @@ 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
@@ -3182,47 +3043,6 @@ 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
@@ -3969,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
@@ -4002,7 +3823,7 @@ Transform:
   m_Children:
   - {fileID: 3694994520887372816}
   - {fileID: 3694994520946098762}
-  - {fileID: 1836526757}
+  - {fileID: 139663243}
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4035,7 +3856,18 @@ MonoBehaviour:
   _token: 
   _channelName: 
   isSwitchCamera: 0
-  cam2: {fileID: 1905675435}
+--- !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
 CanvasRenderer:
   m_ObjectHideFlags: 0

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;
@@ -296,7 +296,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;

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;

Assets/Studio/_4ShowScene/ConsoleFunctionModule/DrawPenFunctionModule/Scripts/DrawPener.cs

@@ -313,8 +313,8 @@ namespace ShadowStudio.Tool
             //Vector3 pointPos = part.pointerBase.cursorBase.transform.position;
             if (API_Module_InputSystem.InputDeviceStatus(InputDeviceType.KS))
             {
-                pointPos = API_Module_InputSystem_KS.KSPosition(API_Module_InputSystem_KS.GCType.Right);
-                pointPos += API_Module_InputSystem_KS.KSTransform(API_Module_InputSystem_KS.GCType.Right).forward.normalized * SystemSettingMgr.Instance.settings.RayDis;
+              //  pointPos = API_Module_InputSystem_KS.KSPosition(API_Module_InputSystem_KS.GCType.Right);
+              //  pointPos += API_Module_InputSystem_KS.KSTransform(API_Module_InputSystem_KS.GCType.Right).forward.normalized * SystemSettingMgr.Instance.settings.RayDis;
             }
 
 
@@ -340,8 +340,8 @@ namespace ShadowStudio.Tool
                 Vector3 posks = part.detectorBase.pointerBase.cursorBase.transform.position;
                 if (API_Module_InputSystem.InputDeviceStatus(InputDeviceType.KS))
                 {
-                    posks = API_Module_InputSystem_KS.KSPosition(API_Module_InputSystem_KS.GCType.Right);
-                    posks += API_Module_InputSystem_KS.KSTransform(API_Module_InputSystem_KS.GCType.Right).forward.normalized * SystemSettingMgr.Instance.settings.RayDis;
+                  //  posks = API_Module_InputSystem_KS.KSPosition(API_Module_InputSystem_KS.GCType.Right);
+                  //  posks += API_Module_InputSystem_KS.KSTransform(API_Module_InputSystem_KS.GCType.Right).forward.normalized * SystemSettingMgr.Instance.settings.RayDis;
                 }
                 if (currentLine.Line.positionCount < 1 || Vector3.Distance(posks, pointPos) >= (obj ? (minDis / 5f) : minDis))
                 {

Assets/Studio/_4ShowScene/_ShowSceneCommonScripts/ShowViewMgr.cs

@@ -100,8 +100,12 @@ public class ShowViewMgr : UnitySingleton<ShowViewMgr>
 
         if (CommonMethod.roomConfig.Is_created == "0")
         {
-            GameObject.Find("CreateSenceBtn").GetComponent<Button>().enabled = false;
             Debug.LogError("非房主进入房间");
+            if (CommonMethod.roomConfig.Room_type == "1")
+            {
+                Debug.Log("公开浏览");
+                GameObject.Find("CreateSenceBtn").GetComponent<Button>().enabled = false;
+            }
         }
         else
             Debug.LogError("房主进入房间");

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

Packages/manifest.json

@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "com.ghz.avideoplayer": "file:D:/JiHe/VideoPlayerXR/package",
     "com.ptc.vuforia.engine": "file:com.ptc.vuforia.engine-10.13.3.tgz",
     "com.unity.ide.rider": "3.0.16",
     "com.unity.ide.visualstudio": "2.0.16",
@@ -12,8 +11,7 @@
     "com.unity.visualscripting": "1.7.8",
     "com.unity.xr.arcore": "4.2.8",
     "com.unity.xr.openxr": "1.5.3",
-    "com.ximmerse.xr": "file:D:/JiHe/XRSDK/package",
-    "jh.trilib.engine": "file:D:/JiHe/TriLibXR/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",

Packages/packages-lock.json

@@ -1,11 +1,5 @@
 {
   "dependencies": {
-    "com.ghz.avideoplayer": {
-      "version": "file:D:/JiHe/VideoPlayerXR/package",
-      "depth": 0,
-      "source": "local",
-      "dependencies": {}
-    },
     "com.ptc.vuforia.engine": {
       "version": "file:com.ptc.vuforia.engine-10.13.3.tgz",
       "depth": 0,
@@ -127,37 +121,24 @@
       },
       "url": "https://packages.unity.cn"
     },
-    "com.unity.xr.arsubsystems": {
+    "com.unity.xr.arfoundation": {
       "version": "4.2.8",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.subsystemregistration": "1.1.0",
-        "com.unity.xr.management": "4.0.1"
-      },
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.xr.core-utils": {
-      "version": "2.0.0",
-      "depth": 2,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.modules.xr": "1.0.0"
+        "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.interaction.toolkit": {
-      "version": "2.0.4",
+    "com.unity.xr.arsubsystems": {
+      "version": "4.2.8",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.inputsystem": "1.3.0",
-        "com.unity.ugui": "1.0.0",
-        "com.unity.xr.core-utils": "2.0.0",
-        "com.unity.xr.legacyinputhelpers": "2.1.8",
-        "com.unity.modules.audio": "1.0.0",
-        "com.unity.modules.imgui": "1.0.0",
-        "com.unity.modules.physics": "1.0.0"
+        "com.unity.subsystemregistration": "1.1.0",
+        "com.unity.xr.management": "4.0.1"
       },
       "url": "https://packages.unity.cn"
     },
@@ -195,25 +176,19 @@
       },
       "url": "https://packages.unity.cn"
     },
-    "com.ximmerse.xr": {
-      "version": "file:D:/JiHe/XRSDK/package",
+    "jh.xr.engine": {
+      "version": "file:G:/GUnityProject/XRSDK/package",
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.unity.xr.management": "3.2.9",
-        "com.unity.xr.legacyinputhelpers": "2.1.4",
-        "com.unity.xr.arsubsystems": "4.1.9",
-        "com.unity.xr.interaction.toolkit": "2.0.0",
-        "com.unity.inputsystem": "1.3.0",
+        "com.unity.xr.management": "4.0.1",
+        "com.unity.xr.legacyinputhelpers": "2.1.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"
       }
     },
-    "jh.trilib.engine": {
-      "version": "file:D:/JiHe/TriLibXR/package",
-      "depth": 0,
-      "source": "local",
-      "dependencies": {}
-    },
     "com.unity.modules.ai": {
       "version": "1.0.0",
       "depth": 0,

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: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3}
-  - {fileID: -7757256057747849950, guid: bf1be7b556e14e44aadbe8ccbd6b4a1d, type: 2}
-  - {fileID: 3407827143893180361, guid: 93ed3b462c7c82d4594fa4d925b91911, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -192,7 +189,7 @@ PlayerSettings:
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
   ForceInternetPermission: 1
-  ForceSDCardPermission: 1
+  ForceSDCardPermission: 0
   CreateWallpaper: 0
   APKExpansionFiles: 0
   keepLoadedShadersAlive: 0
@@ -581,7 +578,7 @@ PlayerSettings:
   openGLRequireES32: 0
   m_TemplateCustomTags: {}
   mobileMTRendering:
-    Android: 1
+    Android: 0
     iPhone: 1
     tvOS: 1
   m_BuildTargetGroupLightmapEncodingQuality: