Merge branch 'F/0710_2.1+2.0' of ssh://gogs.ghz-tech.com:30979/GHzGlass/GHZMRNavigatorProXR into F/0710_2.1+2.0

Packages/manifest.json

@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "com.ghz.avideoplayer": "https://gogs.ghz-tech.com:8843/GHzGlass/VideoPlayerXR.git",
     "com.ptc.vuforia.engine": "file:com.ptc.vuforia.engine-10.15.4.tgz",
     "com.unity.feature.development": "1.0.1",
     "com.unity.ide.rider": "3.0.18",
@@ -16,9 +15,11 @@
     "com.unity.xr.arkit-face-tracking": "4.2.7",
     "com.unity.xr.interactionsubsystems": "1.0.1",
     "com.unity.xr.openxr": "1.5.3",
-    "jh.baseeditor.engine": "ssh://git@gogs.ghz-tech.com:30979/GHzGlass/GHZBasePackage.git",
-    "jh.immersalsdk.engine": "file:G:/GUnityProject/ImmersalSDK/package",
-    "jh.xr.engine": "file:G:/GUnityProject/NavigatorXRSDK/XRSDK/package",
+    "com.ghz.avideoplayer": "https://gogs.ghz-tech.com:8843/GHzGlass/VideoPlayerXR.git",
+    "jh.baseeditor.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZBasePackage.git",
+    "jh.xr.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZSDKXR.git#XRSDK_Nreal",
+    "jh.trilib.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/TriLibXR.git",
+    "jh.immersalsdk.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/ImmersalSDK.git#ImmersalSDK_Nreal",
     "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

@@ -259,31 +259,42 @@
       "url": "https://packages.unity.cn"
     },
     "jh.baseeditor.engine": {
-      "version": "ssh://git@gogs.ghz-tech.com:30979/GHzGlass/GHZBasePackage.git",
+      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZBasePackage.git",
       "depth": 0,
       "source": "git",
-      "dependencies": {},
-      "hash": "60687e7749359b769bcb1f86bf35ca37738a2ca9"
+      "dependencies": {
+        "com.unity.xr.management": "4.0.1"
+      },
+      "hash": "78e593f6e911cf4aafbc031005e7f2cdc76136e8"
     },
     "jh.immersalsdk.engine": {
-      "version": "file:G:/GUnityProject/ImmersalSDK/package",
+      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/ImmersalSDK.git#ImmersalSDK_Nreal",
       "depth": 0,
-      "source": "local",
+      "source": "git",
       "dependencies": {
         "com.unity.xr.management": "4.0.1",
         "com.unity.xr.legacyinputhelpers": "2.1.2",
         "com.unity.inputsystem": "1.4.2"
-      }
+      },
+      "hash": "5e1c7fa684c24381b6cee3ca2bf90f5eb1e45d06"
+    },
+    "jh.trilib.engine": {
+      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/TriLibXR.git",
+      "depth": 0,
+      "source": "git",
+      "dependencies": {},
+      "hash": "474231f32c66e7b039e2f96aaf39165650f30cb0"
     },
     "jh.xr.engine": {
-      "version": "file:G:/GUnityProject/NavigatorXRSDK/XRSDK/package",
+      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZSDKXR.git#XRSDK_Nreal",
       "depth": 0,
-      "source": "local",
+      "source": "git",
       "dependencies": {
         "com.unity.xr.management": "4.0.1",
         "com.unity.xr.legacyinputhelpers": "2.1.2",
         "com.unity.inputsystem": "1.4.2"
-      }
+      },
+      "hash": "90df63456e8d6a8537eeeebeaa6a4050aa862e04"
     },
     "com.unity.modules.ai": {
       "version": "1.0.0",

ProjectSettings/RenderStreamingProjectSettings.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 61
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b4f5b5e9819c4eafb84bd87d1c2f266f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_WizardPopupAtStart: 1
+  m_WizardPopupAlreadyShownOnce: 0

ProjectSettings/TimelineSettings.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 61
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  assetDefaultFramerate: 60
+  m_DefaultFrameRate: 60