Browse Source

热更新修复

胡佳骏 1 year ago
parent
commit
af6a5d2c3e

+ 1 - 1
Assets/FrameWork/Canvas.prefab

@@ -160,7 +160,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
+  m_PresetInfoIsWorld: 0
 --- !u!114 &8894333160753431136
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 3 - 3
Assets/FrameWork/PlayerToImage.prefab

@@ -259,7 +259,7 @@ GameObject:
   m_Component:
   - component: {fileID: 6371964581270030861}
   - component: {fileID: 6371964581270030860}
-  - component: {fileID: 841037905012157494}
+  - component: {fileID: 6648970480355835358}
   m_Layer: 6
   m_Name: PlayerToImage
   m_TagString: Untagged
@@ -300,7 +300,7 @@ MonoBehaviour:
   ca: {fileID: 6371964580808598764}
   rimg: {fileID: 6371964580815403567}
   audioOldVolume: 0
---- !u!114 &841037905012157494
+--- !u!114 &6648970480355835358
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -309,6 +309,6 @@ MonoBehaviour:
   m_GameObject: {fileID: 6371964581270030862}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: eb94bf957aaed554492064dde1c1775e, type: 3}
+  m_Script: {fileID: 11500000, guid: 0ab938c0a73719d42b9f2a2ef9f79083, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 

+ 1 - 1
Assets/FrameWork/ProjectManager/XunJian/列表模块/列表模块.prefab

@@ -9459,7 +9459,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5757031169473047620, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
       propertyPath: m_Pivot.x

+ 5 - 4
Assets/FrameWork/ProjectManager/paizhaoItem.prefab

@@ -13,7 +13,7 @@ GameObject:
   - component: {fileID: 8856316178823262411}
   - component: {fileID: 8203841934488375}
   - component: {fileID: 2208364255844893289}
-  - component: {fileID: 6705655446350118404}
+  - component: {fileID: 4520444196536061190}
   m_Layer: 5
   m_Name: paizhaoItem
   m_TagString: Untagged
@@ -63,11 +63,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 85b67949d6c314b438fa08b83a770b94, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  isMp4: 0
   index: 0
   playImg: {fileID: 3810644886565967928}
   tex: {fileID: 0}
   item: {fileID: 4361928126334041447}
-  av: {fileID: 6705655446350118404}
+  av: {fileID: 4520444196536061190}
 --- !u!114 &8203841934488375
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -151,7 +152,7 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
---- !u!114 &6705655446350118404
+--- !u!114 &4520444196536061190
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -160,7 +161,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 895371214607694078}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: eb94bf957aaed554492064dde1c1775e, type: 3}
+  m_Script: {fileID: 11500000, guid: 0ab938c0a73719d42b9f2a2ef9f79083, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
 --- !u!1 &3810644886565967928

+ 1 - 1
Assets/FrameWork/SaoMiao.prefab

@@ -85,7 +85,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
+  m_PresetInfoIsWorld: 0
 --- !u!114 &1620164308813382644
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 1 - 0
Assets/FrameWork/Windows.asset

@@ -18,6 +18,7 @@ MonoBehaviour:
   - {fileID: 11500000, guid: 95bd5e73b2b930240adab20b3c9619d2, type: 3}
   - {fileID: 11500000, guid: 950e827448571e746810b732dc8b4029, type: 3}
   - {fileID: 11500000, guid: 8a480db2749607445822a51058194ffd, type: 3}
+  - {fileID: 11500000, guid: cd1ffb18c74b5664584b51b6933a3b04, type: 3}
   windowItemGameObjectList:
   - window: {fileID: 7370447325771184417, guid: f7ebcb890f4068e4dadd858ce394605e, type: 3}
     type: 800001

+ 4 - 4
Assets/HotUpdate/DownLoadXRManager.cs

@@ -36,14 +36,14 @@ public class DownLoadXRManager
             config.bytes = bytes;
             config.presson = presson;
 
-
-
-#if UNITY_EDITOR
+#if ISLOCAL
             GameObject go = GameObject.Instantiate(Resources.Load<GameObject>("DownLoadURLXRingItem"));
 #else
-            GameObject go = GameObject.Instantiate(GameInit.ablist.LoadAsset<GameObject>("DownLoadURLXRingItem"));//
+            GameObject go = GameInit.ablist.LoadAsset<GameObject>("DownLoadURLXRingItem");
 #endif
 
+
+
             DownLoadURLXRItem dlitem = go.GetComponent<DownLoadURLXRItem>();
             dlitem.startDownload(config);
         }

+ 2 - 1
Assets/HotUpdate/HotUpdate.asmdef

@@ -14,7 +14,8 @@
         "GUID:9ba9e88902f1b884c9fb49c8334fd327",
         "GUID:fde3589a8929c6443a611ee759211109",
         "GUID:fe18191c7a759a941bc257d5713eac02",
-        "GUID:34bafec5a04de4be0a18e0e772415a38"
+        "GUID:34bafec5a04de4be0a18e0e772415a38",
+        "GUID:1c608a86fd899fc488a1c538152b8d71"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

+ 1 - 1
Assets/HotUpdate/HotUpdate.asmdef.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 42b4874361b201246b95c095f57459bb
+guid: 02fa3753ce349a74db55f641a5c41278
 AssemblyDefinitionImporter:
   externalObjects: {}
   userData: 

+ 2 - 0
Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/PaiZhaoItem.cs

@@ -34,12 +34,14 @@ public class PaiZhaoItem : MonoBehaviour
                 playImg.SetActive(false) ;
                 Loom.RunAsync(() =>
                 {
+                    Debug.Log("data.url===>"+ data.url);
                      _mat = GameUtility.zoomByteByOpenCV(data.url, 0.1f, true, true);
                     Loom.QueueOnMainThread(()=> {
                         if(tex!=null)
                         {
                             Destroy(tex);
                         }
+                        Debug.Log("data.url===>" + data.url);
                         tex = GameUtility.TextureByMat(_mat);
                         if(item)
                         item.GetComponent<RawImage>().texture = tex;

+ 1 - 2
Assets/HotUpdate/Scripts/Scripts/Scripts/Window/WindowsManager.cs

@@ -81,8 +81,7 @@ public class WindowsManager : MonoSingleton<WindowsManager>
         try
         {
             showlog();
-
-#if UNITY_EDITOR
+#if ISLOCAL
             Texture2D texture2D = Resources.Load<Texture2D>("touxiang");
 #else
             Texture2D texture2D = GameInit.ablist.LoadAsset<Texture2D>("touxiang");

+ 1 - 379
Assets/HybridCLRGenerate/link.xml

@@ -1,380 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<linker>
-  <assembly fullname="AVProVideoGHZ">
-    <type fullname="AVProVideoPlayer" preserve="all" />
-    <type fullname="MediaPlayerCtrl" preserve="all" />
-  </assembly>
-  <assembly fullname="DOTween">
-    <type fullname="DG.Tweening.ShortcutExtensions" preserve="all" />
-    <type fullname="DG.Tweening.TweenCallback" preserve="all" />
-    <type fullname="DG.Tweening.TweenSettingsExtensions" preserve="all" />
-    <type fullname="DG.Tweening.Tweener" preserve="all" />
-  </assembly>
-  <assembly fullname="DOTween46">
-    <type fullname="DG.Tweening.ShortcutExtensions46" preserve="all" />
-  </assembly>
-  <assembly fullname="EasyAR.Sense">
-    <type fullname="easyar.CameraDeviceFrameSource" preserve="all" />
-    <type fullname="easyar.ImageTargetController" preserve="all" />
-    <type fullname="easyar.ImageTargetController/ImageFileSourceData" preserve="all" />
-    <type fullname="easyar.ImageTrackerFrameFilter" preserve="all" />
-    <type fullname="easyar.PathType" preserve="all" />
-    <type fullname="easyar.Target" preserve="all" />
-    <type fullname="easyar.TargetController" preserve="all" />
-  </assembly>
-  <assembly fullname="LitJson">
-    <type fullname="LitJson.JsonData" preserve="all" />
-    <type fullname="LitJson.JsonMapper" preserve="all" />
-  </assembly>
-  <assembly fullname="LoginXR">
-    <type fullname="HttpTool" preserve="all" />
-    <type fullname="login.UserInfo" preserve="all" />
-  </assembly>
-  <assembly fullname="MQTT">
-    <type fullname="QTTManager" preserve="all" />
-    <type fullname="uPLibrary.Networking.M2Mqtt.Messages.MqttMsgPublishEventArgs" preserve="all" />
-  </assembly>
-  <assembly fullname="Minio">
-    <type fullname="Minio.ApiEndpoints.IBucketOperations" preserve="all" />
-    <type fullname="Minio.ApiEndpoints.IObjectOperations" preserve="all" />
-    <type fullname="Minio.DataModel.Args.BucketArgs`1" preserve="all" />
-    <type fullname="Minio.DataModel.Args.GetObjectArgs" preserve="all" />
-    <type fullname="Minio.DataModel.Args.ObjectArgs`1" preserve="all" />
-    <type fullname="Minio.DataModel.Args.ObjectWriteArgs`1" preserve="all" />
-    <type fullname="Minio.DataModel.Args.PresignedGetObjectArgs" preserve="all" />
-    <type fullname="Minio.DataModel.Args.PutObjectArgs" preserve="all" />
-    <type fullname="Minio.DataModel.Args.StatObjectArgs" preserve="all" />
-    <type fullname="Minio.DataModel.ObjectStat" preserve="all" />
-    <type fullname="Minio.DataModel.Response.PutObjectResponse" preserve="all" />
-    <type fullname="Minio.DataModel.Result.ListAllMyBucketsResult" preserve="all" />
-    <type fullname="Minio.IMinioClient" preserve="all" />
-    <type fullname="Minio.MinioClient" preserve="all" />
-    <type fullname="Minio.MinioClientExtensions" preserve="all" />
-  </assembly>
-  <assembly fullname="Newtonsoft.Json">
-    <type fullname="Newtonsoft.Json.JsonConvert" preserve="all" />
-    <type fullname="Newtonsoft.Json.Linq.JObject" preserve="all" />
-    <type fullname="Newtonsoft.Json.Linq.JToken" preserve="all" />
-  </assembly>
-  <assembly fullname="OpenCV">
-    <type fullname="OpenCVForUnity.CoreModule.CvType" preserve="all" />
-    <type fullname="OpenCVForUnity.CoreModule.Mat" preserve="all" />
-    <type fullname="OpenCVForUnity.CoreModule.MatOfByte" preserve="all" />
-    <type fullname="OpenCVForUnity.CoreModule.Size" preserve="all" />
-    <type fullname="OpenCVForUnity.ImgcodecsModule.Imgcodecs" preserve="all" />
-    <type fullname="OpenCVForUnity.ImgprocModule.Imgproc" preserve="all" />
-    <type fullname="OpenCVForUnity.UnityUtils.Utils" preserve="all" />
-  </assembly>
-  <assembly fullname="RenderHeads.AVProMovieCapture.Runtime">
-    <type fullname="RenderHeads.Media.AVProMovieCapture.CaptureBase" preserve="all" />
-    <type fullname="RenderHeads.Media.AVProMovieCapture.CaptureFromTexture" preserve="all" />
-    <type fullname="RenderHeads.Media.AVProMovieCapture.FileWritingHandler" preserve="all" />
-  </assembly>
-  <assembly fullname="SDK">
-    <type fullname="API_GSXR_Module_InputSystem_Head" preserve="all" />
-    <type fullname="API_GSXR_Module_InputSystem_KS" preserve="all" />
-    <type fullname="API_GSXR_Module_InputSystem_KS/GCType" preserve="all" />
-    <type fullname="FollowerBase" preserve="all" />
-    <type fullname="HttpSDKAction" preserve="all" />
-    <type fullname="MonoSingleton`1" preserve="all" />
-    <type fullname="OpenXRCamera" preserve="all" />
-    <type fullname="SC.XR.Unity.Module_InputSystem.DefaultCursor" preserve="all" />
-    <type fullname="SC.XR.Unity.Module_InputSystem.InputDeviceGC.KS.InputDeviceKSPart" preserve="all" />
-    <type fullname="SC.XR.Unity.Module_InputSystem.InputDeviceHead.InputDeviceHeadPart" preserve="all" />
-    <type fullname="SC.XR.Unity.Module_InputSystem.InputDeviceType" preserve="all" />
-    <type fullname="SC.XR.Unity.Module_InputSystem.Module_InputSystem" preserve="all" />
-    <type fullname="SC.XR.Unity.Singleton`1" preserve="all" />
-    <type fullname="XRRGBCamera" preserve="all" />
-    <type fullname="XRTool.Util.Singleton`1" preserve="all" />
-  </assembly>
-  <assembly fullname="TriLib">
-    <type fullname="TriLibModelLoad" preserve="all" />
-  </assembly>
-  <assembly fullname="TriLibCore">
-    <type fullname="TriLibCore.AssetLoaderContext" preserve="all" />
-    <type fullname="TriLibCore.IContextualizedError" preserve="all" />
-  </assembly>
-  <assembly fullname="UniLiveKit.Runtime">
-    <type fullname="GHZRTCFusionManager" preserve="all" />
-    <type fullname="GHZRTCFusionManager/OnRemoteAudioStateChangedEvent" preserve="all" />
-    <type fullname="GHZRTCFusionManager/OnRemoteVideoStateChangedEvent" preserve="all" />
-    <type fullname="GHZRTCFusionManager/OnUserJoinedEvent" preserve="all" />
-    <type fullname="GHZRTCFusionManager/OnUserOfflineEvent" preserve="all" />
-    <type fullname="GHZRtc.SingletonMono`1" preserve="all" />
-    <type fullname="REMOTE_AUIDO_STATE_REASON_RTC" preserve="all" />
-    <type fullname="REMOTE_VIDEO_STATE_REASON_RTC" preserve="all" />
-  </assembly>
-  <assembly fullname="Unity.TextMeshPro">
-    <type fullname="TMPro.TMP_Dropdown" preserve="all" />
-    <type fullname="TMPro.TMP_Dropdown/DropdownEvent" preserve="all" />
-    <type fullname="TMPro.TMP_Dropdown/OptionData" preserve="all" />
-    <type fullname="TMPro.TMP_InputField" preserve="all" />
-    <type fullname="TMPro.TMP_Text" preserve="all" />
-    <type fullname="TMPro.TextMeshProUGUI" preserve="all" />
-  </assembly>
-  <assembly fullname="UnityEngine.AndroidJNIModule">
-    <type fullname="UnityEngine.Android.Permission" preserve="all" />
-    <type fullname="UnityEngine.AndroidJavaClass" preserve="all" />
-    <type fullname="UnityEngine.AndroidJavaObject" preserve="all" />
-    <type fullname="UnityEngine.AndroidJavaProxy" preserve="all" />
-  </assembly>
-  <assembly fullname="UnityEngine.AssetBundleModule">
-    <type fullname="UnityEngine.AssetBundle" preserve="all" />
-    <type fullname="UnityEngine.AssetBundleCreateRequest" preserve="all" />
-    <type fullname="UnityEngine.AssetBundleRequest" preserve="all" />
-  </assembly>
-  <assembly fullname="UnityEngine.AudioModule">
-    <type fullname="UnityEngine.WebCamTexture" preserve="all" />
-  </assembly>
-  <assembly fullname="UnityEngine.CoreModule">
-    <type fullname="Unity.Collections.NativeArray`1" preserve="all" />
-    <type fullname="UnityEngine.AddComponentMenu" preserve="all" />
-    <type fullname="UnityEngine.Application" preserve="all" />
-    <type fullname="UnityEngine.Application/LogCallback" preserve="all" />
-    <type fullname="UnityEngine.AsyncOperation" preserve="all" />
-    <type fullname="UnityEngine.Behaviour" preserve="all" />
-    <type fullname="UnityEngine.Bounds" preserve="all" />
-    <type fullname="UnityEngine.Camera" preserve="all" />
-    <type fullname="UnityEngine.Color" preserve="all" />
-    <type fullname="UnityEngine.Color32" preserve="all" />
-    <type fullname="UnityEngine.Component" preserve="all" />
-    <type fullname="UnityEngine.Coroutine" preserve="all" />
-    <type fullname="UnityEngine.CreateAssetMenuAttribute" preserve="all" />
-    <type fullname="UnityEngine.Debug" preserve="all" />
-    <type fullname="UnityEngine.DisallowMultipleComponent" preserve="all" />
-    <type fullname="UnityEngine.Events.UnityAction" preserve="all" />
-    <type fullname="UnityEngine.Events.UnityAction`1" preserve="all" />
-    <type fullname="UnityEngine.Events.UnityEvent" preserve="all" />
-    <type fullname="UnityEngine.Events.UnityEvent`1" preserve="all" />
-    <type fullname="UnityEngine.ExecuteInEditMode" preserve="all" />
-    <type fullname="UnityEngine.FilterMode" preserve="all" />
-    <type fullname="UnityEngine.GameObject" preserve="all" />
-    <type fullname="UnityEngine.Graphics" preserve="all" />
-    <type fullname="UnityEngine.HeaderAttribute" preserve="all" />
-    <type fullname="UnityEngine.HideInInspector" preserve="all" />
-    <type fullname="UnityEngine.KeyCode" preserve="all" />
-    <type fullname="UnityEngine.LineRenderer" preserve="all" />
-    <type fullname="UnityEngine.LogType" preserve="all" />
-    <type fullname="UnityEngine.Material" preserve="all" />
-    <type fullname="UnityEngine.MaterialPropertyBlock" preserve="all" />
-    <type fullname="UnityEngine.Mathf" preserve="all" />
-    <type fullname="UnityEngine.Mesh" preserve="all" />
-    <type fullname="UnityEngine.MeshFilter" preserve="all" />
-    <type fullname="UnityEngine.MonoBehaviour" preserve="all" />
-    <type fullname="UnityEngine.Object" preserve="all" />
-    <type fullname="UnityEngine.PlayerPrefs" preserve="all" />
-    <type fullname="UnityEngine.Quaternion" preserve="all" />
-    <type fullname="UnityEngine.Random" preserve="all" />
-    <type fullname="UnityEngine.RangeAttribute" preserve="all" />
-    <type fullname="UnityEngine.Rect" preserve="all" />
-    <type fullname="UnityEngine.RectTransform" preserve="all" />
-    <type fullname="UnityEngine.RenderTexture" preserve="all" />
-    <type fullname="UnityEngine.Renderer" preserve="all" />
-    <type fullname="UnityEngine.Rendering.AsyncGPUReadback" preserve="all" />
-    <type fullname="UnityEngine.Rendering.AsyncGPUReadbackRequest" preserve="all" />
-    <type fullname="UnityEngine.ScriptableObject" preserve="all" />
-    <type fullname="UnityEngine.SerializeField" preserve="all" />
-    <type fullname="UnityEngine.Shader" preserve="all" />
-    <type fullname="UnityEngine.SkinnedMeshRenderer" preserve="all" />
-    <type fullname="UnityEngine.Sprite" preserve="all" />
-    <type fullname="UnityEngine.Sprites.DataUtility" preserve="all" />
-    <type fullname="UnityEngine.Texture" preserve="all" />
-    <type fullname="UnityEngine.Texture2D" preserve="all" />
-    <type fullname="UnityEngine.TextureFormat" preserve="all" />
-    <type fullname="UnityEngine.Time" preserve="all" />
-    <type fullname="UnityEngine.Transform" preserve="all" />
-    <type fullname="UnityEngine.Vector2" preserve="all" />
-    <type fullname="UnityEngine.Vector3" preserve="all" />
-    <type fullname="UnityEngine.Vector4" preserve="all" />
-    <type fullname="UnityEngine.WaitForEndOfFrame" preserve="all" />
-    <type fullname="UnityEngine.WaitForSeconds" preserve="all" />
-    <type fullname="UnityEngine.WaitUntil" preserve="all" />
-  </assembly>
-  <assembly fullname="UnityEngine.ImageConversionModule">
-    <type fullname="UnityEngine.ImageConversion" preserve="all" />
-  </assembly>
-  <assembly fullname="UnityEngine.InputLegacyModule">
-    <type fullname="UnityEngine.Input" preserve="all" />
-  </assembly>
-  <assembly fullname="UnityEngine.PhysicsModule">
-    <type fullname="UnityEngine.BoxCollider" preserve="all" />
-  </assembly>
-  <assembly fullname="UnityEngine.UI">
-    <type fullname="UnityEngine.EventSystems.IEventSystemHandler" preserve="all" />
-    <type fullname="UnityEngine.EventSystems.IPointerEnterHandler" preserve="all" />
-    <type fullname="UnityEngine.EventSystems.IPointerExitHandler" preserve="all" />
-    <type fullname="UnityEngine.EventSystems.PointerEventData" preserve="all" />
-    <type fullname="UnityEngine.EventSystems.UIBehaviour" preserve="all" />
-    <type fullname="UnityEngine.UI.Button" preserve="all" />
-    <type fullname="UnityEngine.UI.Button/ButtonClickedEvent" preserve="all" />
-    <type fullname="UnityEngine.UI.ContentSizeFitter" preserve="all" />
-    <type fullname="UnityEngine.UI.Graphic" preserve="all" />
-    <type fullname="UnityEngine.UI.HorizontalLayoutGroup" preserve="all" />
-    <type fullname="UnityEngine.UI.Image" preserve="all" />
-    <type fullname="UnityEngine.UI.Image/Type" preserve="all" />
-    <type fullname="UnityEngine.UI.LayoutGroup" preserve="all" />
-    <type fullname="UnityEngine.UI.MaskableGraphic" preserve="all" />
-    <type fullname="UnityEngine.UI.RawImage" preserve="all" />
-    <type fullname="UnityEngine.UI.ScrollRect" preserve="all" />
-    <type fullname="UnityEngine.UI.ScrollRect/ScrollRectEvent" preserve="all" />
-    <type fullname="UnityEngine.UI.Selectable" preserve="all" />
-    <type fullname="UnityEngine.UI.Slider" preserve="all" />
-    <type fullname="UnityEngine.UI.Text" preserve="all" />
-    <type fullname="UnityEngine.UI.Toggle" preserve="all" />
-    <type fullname="UnityEngine.UI.VertexHelper" preserve="all" />
-    <type fullname="UnityEngine.UI.VerticalLayoutGroup" preserve="all" />
-  </assembly>
-  <assembly fullname="UnityEngine.UIModule">
-    <type fullname="UnityEngine.Canvas" preserve="all" />
-    <type fullname="UnityEngine.CanvasRenderer" preserve="all" />
-  </assembly>
-  <assembly fullname="UnityEngine.UnityWebRequestModule">
-    <type fullname="UnityEngine.Networking.DownloadHandler" preserve="all" />
-    <type fullname="UnityEngine.Networking.UnityWebRequest" preserve="all" />
-    <type fullname="UnityEngine.Networking.UnityWebRequest/Result" preserve="all" />
-    <type fullname="UnityEngine.Networking.UnityWebRequestAsyncOperation" preserve="all" />
-    <type fullname="UnityEngine.WWWForm" preserve="all" />
-  </assembly>
-  <assembly fullname="UnityEngine.UnityWebRequestWWWModule">
-    <type fullname="UnityEngine.WWW" preserve="all" />
-  </assembly>
-  <assembly fullname="UnityEngine.VideoModule">
-    <type fullname="UnityEngine.Video.VideoClip" preserve="all" />
-    <type fullname="UnityEngine.Video.VideoPlayer" preserve="all" />
-  </assembly>
-  <assembly fullname="XRLoaclizer">
-    <type fullname="Immersal.AR.ARMap" preserve="all" />
-    <type fullname="Immersal.AR.ARSpace" preserve="all" />
-    <type fullname="Immersal.AR.XRLocalizer" preserve="all" />
-  </assembly>
-  <assembly fullname="netstandard">
-    <type fullname="System.Action" preserve="all" />
-    <type fullname="System.Action`1" preserve="all" />
-    <type fullname="System.Action`2" preserve="all" />
-    <type fullname="System.Action`3" preserve="all" />
-    <type fullname="System.AppDomain" preserve="all" />
-    <type fullname="System.ArgumentNullException" preserve="all" />
-    <type fullname="System.ArgumentOutOfRangeException" preserve="all" />
-    <type fullname="System.Array" preserve="all" />
-    <type fullname="System.AsyncCallback" preserve="all" />
-    <type fullname="System.Attribute" preserve="all" />
-    <type fullname="System.AttributeTargets" preserve="all" />
-    <type fullname="System.AttributeUsageAttribute" preserve="all" />
-    <type fullname="System.Boolean" preserve="all" />
-    <type fullname="System.Byte" preserve="all" />
-    <type fullname="System.Char" preserve="all" />
-    <type fullname="System.Collections.Generic.Dictionary`2" preserve="all" />
-    <type fullname="System.Collections.Generic.Dictionary`2/Enumerator" preserve="all" />
-    <type fullname="System.Collections.Generic.Dictionary`2/KeyCollection" preserve="all" />
-    <type fullname="System.Collections.Generic.Dictionary`2/KeyCollection/Enumerator" preserve="all" />
-    <type fullname="System.Collections.Generic.ICollection`1" preserve="all" />
-    <type fullname="System.Collections.Generic.IComparer`1" preserve="all" />
-    <type fullname="System.Collections.Generic.IDictionary`2" preserve="all" />
-    <type fullname="System.Collections.Generic.IEnumerable`1" preserve="all" />
-    <type fullname="System.Collections.Generic.IEnumerator`1" preserve="all" />
-    <type fullname="System.Collections.Generic.KeyValuePair`2" preserve="all" />
-    <type fullname="System.Collections.Generic.List`1" preserve="all" />
-    <type fullname="System.Collections.Generic.List`1/Enumerator" preserve="all" />
-    <type fullname="System.Collections.Generic.Queue`1" preserve="all" />
-    <type fullname="System.Collections.Generic.SortedDictionary`2" preserve="all" />
-    <type fullname="System.Collections.Generic.Stack`1" preserve="all" />
-    <type fullname="System.Collections.IEnumerator" preserve="all" />
-    <type fullname="System.Collections.IList" preserve="all" />
-    <type fullname="System.Collections.Specialized.NameObjectCollectionBase" preserve="all" />
-    <type fullname="System.Collections.Specialized.NameValueCollection" preserve="all" />
-    <type fullname="System.Comparison`1" preserve="all" />
-    <type fullname="System.Converter`2" preserve="all" />
-    <type fullname="System.DateTime" preserve="all" />
-    <type fullname="System.DateTimeKind" preserve="all" />
-    <type fullname="System.Delegate" preserve="all" />
-    <type fullname="System.Diagnostics.DebuggableAttribute" preserve="all" />
-    <type fullname="System.Diagnostics.DebuggableAttribute/DebuggingModes" preserve="all" />
-    <type fullname="System.Diagnostics.DebuggerHiddenAttribute" preserve="all" />
-    <type fullname="System.Double" preserve="all" />
-    <type fullname="System.Enum" preserve="all" />
-    <type fullname="System.EventArgs" preserve="all" />
-    <type fullname="System.Exception" preserve="all" />
-    <type fullname="System.Func`1" preserve="all" />
-    <type fullname="System.Func`2" preserve="all" />
-    <type fullname="System.Globalization.CultureInfo" preserve="all" />
-    <type fullname="System.IAsyncResult" preserve="all" />
-    <type fullname="System.IDisposable" preserve="all" />
-    <type fullname="System.IFormatProvider" preserve="all" />
-    <type fullname="System.IO.Directory" preserve="all" />
-    <type fullname="System.IO.DirectoryInfo" preserve="all" />
-    <type fullname="System.IO.File" preserve="all" />
-    <type fullname="System.IO.FileAccess" preserve="all" />
-    <type fullname="System.IO.FileInfo" preserve="all" />
-    <type fullname="System.IO.FileMode" preserve="all" />
-    <type fullname="System.IO.FileStream" preserve="all" />
-    <type fullname="System.IO.FileSystemInfo" preserve="all" />
-    <type fullname="System.IO.MemoryStream" preserve="all" />
-    <type fullname="System.IO.Path" preserve="all" />
-    <type fullname="System.IO.SeekOrigin" preserve="all" />
-    <type fullname="System.IO.Stream" preserve="all" />
-    <type fullname="System.IO.TextWriter" preserve="all" />
-    <type fullname="System.Int32" preserve="all" />
-    <type fullname="System.Int64" preserve="all" />
-    <type fullname="System.Linq.Enumerable" preserve="all" />
-    <type fullname="System.Math" preserve="all" />
-    <type fullname="System.MulticastDelegate" preserve="all" />
-    <type fullname="System.NotSupportedException" preserve="all" />
-    <type fullname="System.NullReferenceException" preserve="all" />
-    <type fullname="System.Object" preserve="all" />
-    <type fullname="System.ParamArrayAttribute" preserve="all" />
-    <type fullname="System.Predicate`1" preserve="all" />
-    <type fullname="System.Reflection.Assembly" preserve="all" />
-    <type fullname="System.Reflection.BindingFlags" preserve="all" />
-    <type fullname="System.Reflection.FieldInfo" preserve="all" />
-    <type fullname="System.Reflection.MemberInfo" preserve="all" />
-    <type fullname="System.Reflection.MethodBase" preserve="all" />
-    <type fullname="System.Reflection.MethodInfo" preserve="all" />
-    <type fullname="System.Reflection.PropertyInfo" preserve="all" />
-    <type fullname="System.Runtime.CompilerServices.AsyncStateMachineAttribute" preserve="all" />
-    <type fullname="System.Runtime.CompilerServices.AsyncTaskMethodBuilder" preserve="all" />
-    <type fullname="System.Runtime.CompilerServices.AsyncVoidMethodBuilder" preserve="all" />
-    <type fullname="System.Runtime.CompilerServices.CompilationRelaxationsAttribute" preserve="all" />
-    <type fullname="System.Runtime.CompilerServices.CompilerGeneratedAttribute" preserve="all" />
-    <type fullname="System.Runtime.CompilerServices.ConfiguredTaskAwaitable`1" preserve="all" />
-    <type fullname="System.Runtime.CompilerServices.ConfiguredTaskAwaitable`1/ConfiguredTaskAwaiter" preserve="all" />
-    <type fullname="System.Runtime.CompilerServices.ExtensionAttribute" preserve="all" />
-    <type fullname="System.Runtime.CompilerServices.IAsyncStateMachine" preserve="all" />
-    <type fullname="System.Runtime.CompilerServices.IteratorStateMachineAttribute" preserve="all" />
-    <type fullname="System.Runtime.CompilerServices.RuntimeCompatibilityAttribute" preserve="all" />
-    <type fullname="System.Runtime.CompilerServices.RuntimeHelpers" preserve="all" />
-    <type fullname="System.Runtime.CompilerServices.TaskAwaiter`1" preserve="all" />
-    <type fullname="System.RuntimeFieldHandle" preserve="all" />
-    <type fullname="System.RuntimeTypeHandle" preserve="all" />
-    <type fullname="System.Security.Cryptography.HashAlgorithm" preserve="all" />
-    <type fullname="System.Security.Cryptography.MD5CryptoServiceProvider" preserve="all" />
-    <type fullname="System.Single" preserve="all" />
-    <type fullname="System.String" preserve="all" />
-    <type fullname="System.StringComparer" preserve="all" />
-    <type fullname="System.StringSplitOptions" preserve="all" />
-    <type fullname="System.Text.Encoding" preserve="all" />
-    <type fullname="System.Text.StringBuilder" preserve="all" />
-    <type fullname="System.Text.UTF8Encoding" preserve="all" />
-    <type fullname="System.Threading.CancellationToken" preserve="all" />
-    <type fullname="System.Threading.Interlocked" preserve="all" />
-    <type fullname="System.Threading.Monitor" preserve="all" />
-    <type fullname="System.Threading.Tasks.Task" preserve="all" />
-    <type fullname="System.Threading.Tasks.Task`1" preserve="all" />
-    <type fullname="System.Threading.Thread" preserve="all" />
-    <type fullname="System.Threading.ThreadPool" preserve="all" />
-    <type fullname="System.Threading.ThreadStart" preserve="all" />
-    <type fullname="System.Threading.WaitCallback" preserve="all" />
-    <type fullname="System.TimeSpan" preserve="all" />
-    <type fullname="System.TimeZone" preserve="all" />
-    <type fullname="System.Type" preserve="all" />
-    <type fullname="System.Uri" preserve="all" />
-    <type fullname="System.ValueType" preserve="all" />
-    <type fullname="System.Xml.XmlAttribute" preserve="all" />
-    <type fullname="System.Xml.XmlAttributeCollection" preserve="all" />
-    <type fullname="System.Xml.XmlDeclaration" preserve="all" />
-    <type fullname="System.Xml.XmlDocument" preserve="all" />
-    <type fullname="System.Xml.XmlElement" preserve="all" />
-    <type fullname="System.Xml.XmlNamedNodeMap" preserve="all" />
-    <type fullname="System.Xml.XmlNode" preserve="all" />
-    <type fullname="System.Xml.XmlNodeList" preserve="all" />
-  </assembly>
-</linker>
+<linker />

+ 1 - 2
Assets/Main/LoadDll.cs

@@ -27,8 +27,7 @@ public class LoadDll : MonoBehaviour
         this.transform.localPosition = Vector3.zero;
         this.transform.localEulerAngles = Vector3.zero;
 
-
-#if UNITY_EDITOR
+#if ISLOCAL
         EditorGame.SetActive(true);
         this.gameObject.SetActive(false);
 #else

BIN
Assets/Plugins/OpenCV.dll


+ 0 - 33
Assets/Plugins/OpenCV.dll.meta

@@ -1,33 +0,0 @@
-fileFormatVersion: 2
-guid: 5f1e8f53a31dd514e995d5fd72f93d60
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      Windows Store Apps: WindowsStoreApps
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 62 - 58
Assets/Scenes/Edustry.unity

@@ -249,7 +249,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 8240336528491331395, guid: c2bba08c58147f6428b068597dde0286, type: 3}
       propertyPath: m_RootOrder
-      value: 4
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 8240336528491331395, guid: c2bba08c58147f6428b068597dde0286, type: 3}
       propertyPath: m_LocalPosition.x
@@ -301,63 +301,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: c2bba08c58147f6428b068597dde0286, type: 3}
---- !u!1001 &177185391
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 6602940421782936313, guid: d86e5941cb330e74b9e2267c07023b71, type: 3}
-      propertyPath: m_Name
-      value: SDKSystem
-      objectReference: {fileID: 0}
-    - target: {fileID: 6602940421782936314, guid: d86e5941cb330e74b9e2267c07023b71, type: 3}
-      propertyPath: m_RootOrder
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 6602940421782936314, guid: d86e5941cb330e74b9e2267c07023b71, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6602940421782936314, guid: d86e5941cb330e74b9e2267c07023b71, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6602940421782936314, guid: d86e5941cb330e74b9e2267c07023b71, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6602940421782936314, guid: d86e5941cb330e74b9e2267c07023b71, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6602940421782936314, guid: d86e5941cb330e74b9e2267c07023b71, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6602940421782936314, guid: d86e5941cb330e74b9e2267c07023b71, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6602940421782936314, guid: d86e5941cb330e74b9e2267c07023b71, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6602940421782936314, guid: d86e5941cb330e74b9e2267c07023b71, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6602940421782936314, guid: d86e5941cb330e74b9e2267c07023b71, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6602940421782936314, guid: d86e5941cb330e74b9e2267c07023b71, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: d86e5941cb330e74b9e2267c07023b71, type: 3}
 --- !u!1 &299976110 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 8240336528491331399, guid: c2bba08c58147f6428b068597dde0286, type: 3}
@@ -918,6 +861,67 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1026591763}
   m_CullTransparentMesh: 1
+--- !u!1001 &1457118045
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 6007065485426161915, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
+      propertyPath: m_Name
+      value: SDKSystem
+      objectReference: {fileID: 0}
+    - target: {fileID: 6007065485426161915, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
 --- !u!1 &1812144309
 GameObject:
   m_ObjectHideFlags: 0

+ 8 - 0
Assets/StreamingAssets/TrackingProfiles.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e21314d15ba4f8549958899eada01c01
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/XR/Loaders/Ximmerse XR Loader.asset

@@ -12,4 +12,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 44820cf310472441e952b611b9f17c14, type: 3}
   m_Name: Ximmerse XR Loader
   m_EditorClassIdentifier: 
-  settings: {fileID: 0}
+  settings: {fileID: 11400000, guid: c5dd7f0aa3b1dd2428ac9687562ac352, type: 2}

+ 1 - 1
Assets/XR/XRGeneralSettings.asset

@@ -16,7 +16,7 @@ MonoBehaviour:
   m_AutomaticLoading: 0
   m_AutomaticRunning: 0
   m_Loaders:
-  - {fileID: 11400000, guid: 043fac93e0db9f84fadb516d4721eb0b, type: 2}
+  - {fileID: 11400000, guid: 794a80444e9eb884da8e3b0d26b1637b, type: 2}
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 4 - 1
Packages/manifest.json

@@ -7,6 +7,7 @@
     "com.ghz.login": "https://gogs.ghz-tech.com:8843/GHzGlass/LoginXR.git",
     "com.ghz.mqtt": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZMQTTXR.git",
     "com.maxst.unilivekit": "https://gogs.ghz-tech.com:8843/GHzGlass/LiveKitXR.git",
+    "com.unity.assetbundlebrowser": "1.7.0",
     "com.unity.ide.rider": "3.0.16",
     "com.unity.ide.visualstudio": "2.0.16",
     "com.unity.ide.vscode": "1.2.5",
@@ -16,9 +17,11 @@
     "com.unity.ugui": "1.0.0",
     "com.unity.visualscripting": "1.7.8",
     "com.unity.webrtc": "https://gogs.ghz-tech.com:8843/GHzGlass/WebRtcXR.git",
+    "com.unity.xr.arfoundation": "4.2.9",
+    "com.ximmerse.xr": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZSDKXR.git#XRSDK_Rhinox",
     "jh.immersalsdk.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/ImmersalSDK.git#ImmersalSDK_Phone",
+    "jh.opencvforunity.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/OpenCVForUnity.git",
     "jh.trilib.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/TriLibXR.git",
-    "jh.xr.engine": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZSDKXR.git#XRSDK_Phone",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

+ 61 - 31
Packages/packages-lock.json

@@ -34,7 +34,7 @@
       "depth": 0,
       "source": "git",
       "dependencies": {},
-      "hash": "5da4e00a384b5b9b986cd5c64a064cd2d34c64b8"
+      "hash": "ae471629e9b77b4ba10a2427aabed9c7763f1efd"
     },
     "com.ghz.mqtt": {
       "version": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZMQTTXR.git",
@@ -50,6 +50,13 @@
       "dependencies": {},
       "hash": "a13a0f39f2bf4fbd24b344e9c622c087e714b0ae"
     },
+    "com.unity.assetbundlebrowser": {
+      "version": "1.7.0",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.cn"
+    },
     "com.unity.editorcoroutines": {
       "version": "1.0.0",
       "depth": 1,
@@ -169,36 +176,48 @@
       },
       "hash": "34e62101b53a32adbd5c5a86b84c73a7153c566b"
     },
-    "com.unity.xr.arcore": {
-      "version": "4.2.8",
-      "depth": 1,
+    "com.unity.xr.arfoundation": {
+      "version": "4.2.9",
+      "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.xr.arsubsystems": "4.2.8",
+        "com.unity.xr.arsubsystems": "4.2.9",
         "com.unity.xr.management": "4.0.1",
-        "com.unity.modules.androidjni": "1.0.0",
-        "com.unity.modules.unitywebrequest": "1.0.0"
+        "com.unity.modules.particlesystem": "1.0.0"
       },
       "url": "https://packages.unity.cn"
     },
-    "com.unity.xr.arfoundation": {
-      "version": "4.2.8",
+    "com.unity.xr.arsubsystems": {
+      "version": "4.2.9",
       "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"
+        "com.unity.subsystemregistration": "1.1.0",
+        "com.unity.xr.management": "4.0.1"
       },
       "url": "https://packages.unity.cn"
     },
-    "com.unity.xr.arsubsystems": {
-      "version": "4.2.8",
+    "com.unity.xr.core-utils": {
+      "version": "2.0.0",
       "depth": 2,
       "source": "registry",
       "dependencies": {
-        "com.unity.subsystemregistration": "1.1.0",
-        "com.unity.xr.management": "4.0.1"
+        "com.unity.modules.xr": "1.0.0"
+      },
+      "url": "https://packages.unity.cn"
+    },
+    "com.unity.xr.interaction.toolkit": {
+      "version": "2.0.4",
+      "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"
       },
       "url": "https://packages.unity.cn"
     },
@@ -236,6 +255,20 @@
       },
       "url": "https://packages.unity.cn"
     },
+    "com.ximmerse.xr": {
+      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZSDKXR.git#XRSDK_Rhinox",
+      "depth": 0,
+      "source": "git",
+      "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.openxr": "1.5.3"
+      },
+      "hash": "ac3a89017d18e480548dc0923368f703640f5cfb"
+    },
     "jh.immersalsdk.engine": {
       "version": "https://gogs.ghz-tech.com:8843/GHzGlass/ImmersalSDK.git#ImmersalSDK_Phone",
       "depth": 0,
@@ -245,28 +278,25 @@
         "com.unity.xr.legacyinputhelpers": "2.1.2",
         "com.unity.inputsystem": "1.4.2"
       },
-      "hash": "f79732b3b65655394702312c083dd14cafae96ea"
-    },
-    "jh.trilib.engine": {
-      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/TriLibXR.git",
-      "depth": 0,
-      "source": "git",
-      "dependencies": {},
-      "hash": "b391f88344aaa70b4f191a0bc71e03461f48202d"
+      "hash": "48a46a8fb3a8b2555ecc65824c9c85aa68b955ed"
     },
-    "jh.xr.engine": {
-      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZSDKXR.git#XRSDK_Phone",
+    "jh.opencvforunity.engine": {
+      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/OpenCVForUnity.git",
       "depth": 0,
       "source": "git",
       "dependencies": {
         "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"
+        "com.unity.inputsystem": "1.4.2"
       },
-      "hash": "d7246fad9d037258757b6a804f3ab12dffb8c6f1"
+      "hash": "056c1b881caeda82917d40fe97818f50a6d30b59"
+    },
+    "jh.trilib.engine": {
+      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/TriLibXR.git",
+      "depth": 0,
+      "source": "git",
+      "dependencies": {},
+      "hash": "b391f88344aaa70b4f191a0bc71e03461f48202d"
     },
     "com.unity.modules.ai": {
       "version": "1.0.0",

+ 29 - 0
ProjectSettings/HybridCLRSettings.asset

@@ -0,0 +1,29 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: e189374413a3f00468e49d51d8b27a09, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  enable: 1
+  useGlobalIl2cpp: 0
+  hybridclrRepoURL: https://gitee.com/focus-creative-games/hybridclr
+  il2cppPlusRepoURL: https://gitee.com/focus-creative-games/il2cpp_plus
+  hotUpdateAssemblyDefinitions: []
+  hotUpdateAssemblies: []
+  preserveHotUpdateAssemblies: []
+  hotUpdateDllCompileOutputRootDir: HybridCLRData/HotUpdateDlls
+  externalHotUpdateAssembliyDirs: []
+  strippedAOTDllOutputRootDir: HybridCLRData/AssembliesPostIl2CppStrip
+  patchAOTAssemblies: []
+  outputLinkFile: HybridCLRGenerate/link.xml
+  outputAOTGenericReferenceFile: HybridCLRGenerate/AOTGenericReferences.cs
+  maxGenericReferenceIteration: 10
+  maxMethodBridgeGenericIteration: 10

+ 1 - 2
ProjectSettings/ProjectSettings.asset

@@ -147,7 +147,6 @@ PlayerSettings:
     Others: 1
   bundleVersion: 0.5.0
   preloadedAssets:
-  - {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3}
   - {fileID: 4800000, guid: ea9a295053a0dc440b9698a7f41d9741, type: 3}
   - {fileID: 4800000, guid: 1499e61b3897c4a4b9318a56ca931b8a, type: 3}
   - {fileID: 4800000, guid: 798d6e253a35a144d94205b80c8fd48b, type: 3}
@@ -828,7 +827,7 @@ PlayerSettings:
   webGLDecompressionFallback: 0
   webGLPowerPreference: 2
   scriptingDefineSymbols:
-    Android: UNITY_CCU;CURVEDUI_TMP;AVPRO_MOVIECAPTURE_WEBCAMTEXTURE_SUPPORT;AVPMC_ANDROID_VULKAN_PRETRANSFORM
+    Android: UNITY_CCU;AVPRO_MOVIECAPTURE_WEBCAMTEXTURE_SUPPORT;AVPMC_ANDROID_VULKAN_PRETRANSFORM;CURVEDUI_TMP;ISLOCAL
   additionalCompilerArguments: {}
   platformArchitecture: {}
   scriptingBackend: