配置提交

Assets/HybridCLRGenerate/link.xml

@@ -172,6 +172,7 @@
     <type fullname="UnityEngine.Renderer" preserve="all" />
     <type fullname="UnityEngine.Rendering.AsyncGPUReadback" preserve="all" />
     <type fullname="UnityEngine.Rendering.AsyncGPUReadbackRequest" preserve="all" />
+    <type fullname="UnityEngine.Resources" preserve="all" />
     <type fullname="UnityEngine.ScriptableObject" preserve="all" />
     <type fullname="UnityEngine.SerializeField" preserve="all" />
     <type fullname="UnityEngine.Shader" preserve="all" />

Packages/manifest.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "com.code-philosophy.hybridclr": "https://gogs.ghz-tech.com:8843/GHzGlass/HYBRIDCLR.git",
-    "com.cysharp.unitask": "https://gogs.ghz-tech.com:8843/GHzGlass/UniTaskXR.git",
+    "com.cysharp.unitask": "file:D:/JiHe/New/UniTaskXR",
     "com.easyar.sense": "file:com.easyar.sense-4.6.0+3015.3acb5241.tgz",
     "com.ghz.avideoplayer": "https://gogs.ghz-tech.com:8843/GHzGlass/VideoPlayerXR.git#EasyMovieTexture",
     "com.ghz.login": "https://gogs.ghz-tech.com:8843/GHzGlass/LoginXR.git",
@@ -18,7 +18,7 @@
     "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",
+    "com.ximmerse.xr": "file:D:/JiHe/GHZSDKXR",
     "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",

Packages/packages-lock.json

@@ -8,11 +8,10 @@
       "hash": "a774bfd53315a737da668dd15702e2e8b53d8fcf"
     },
     "com.cysharp.unitask": {
-      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/UniTaskXR.git",
+      "version": "file:D:/JiHe/New/UniTaskXR",
       "depth": 0,
-      "source": "git",
-      "dependencies": {},
-      "hash": "808e4b7c6a70f8780c33d2a9db6e9c5283ee98bf"
+      "source": "local",
+      "dependencies": {}
     },
     "com.easyar.sense": {
       "version": "file:com.easyar.sense-4.6.0+3015.3acb5241.tgz",
@@ -256,9 +255,9 @@
       "url": "https://packages.unity.cn"
     },
     "com.ximmerse.xr": {
-      "version": "https://gogs.ghz-tech.com:8843/GHzGlass/GHZSDKXR.git#XRSDK_Rhinox",
+      "version": "file:D:/JiHe/GHZSDKXR",
       "depth": 0,
-      "source": "git",
+      "source": "local",
       "dependencies": {
         "com.unity.xr.management": "3.2.9",
         "com.unity.xr.legacyinputhelpers": "2.1.4",
@@ -266,8 +265,7 @@
         "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",
@@ -289,7 +287,7 @@
         "com.unity.xr.legacyinputhelpers": "2.1.2",
         "com.unity.inputsystem": "1.4.2"
       },
-      "hash": "056c1b881caeda82917d40fe97818f50a6d30b59"
+      "hash": "4b6e86cb0045aef590181084754ef60d112498ac"
     },
     "jh.trilib.engine": {
       "version": "https://gogs.ghz-tech.com:8843/GHzGlass/TriLibXR.git",

ProjectSettings/EditorSettings.asset

@@ -4,27 +4,41 @@
 EditorSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 11
-  m_ExternalVersionControlSupport: Visible Meta Files
   m_SerializationMode: 2
   m_LineEndingsForNewScripts: 0
   m_DefaultBehaviorMode: 0
   m_PrefabRegularEnvironment: {fileID: 0}
   m_PrefabUIEnvironment: {fileID: 0}
-  m_SpritePackerMode: 0
+  m_SpritePackerMode: 3
   m_SpritePackerPaddingPower: 1
+  m_Bc7TextureCompressor: 0
   m_EtcTextureCompressorBehavior: 1
   m_EtcTextureFastCompressor: 1
   m_EtcTextureNormalCompressor: 2
   m_EtcTextureBestCompressor: 4
   m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp;asmref
   m_ProjectGenerationRootNamespace: 
-  m_CollabEditorSettings:
-    inProgressEnabled: 1
   m_EnableTextureStreamingInEditMode: 1
   m_EnableTextureStreamingInPlayMode: 1
   m_AsyncShaderCompilation: 1
+  m_CachingShaderPreprocessor: 1
+  m_PrefabModeAllowAutoSave: 1
   m_EnterPlayModeOptionsEnabled: 0
   m_EnterPlayModeOptions: 3
-  m_ShowLightmapResolutionOverlay: 1
+  m_GameObjectNamingDigits: 1
+  m_GameObjectNamingScheme: 0
+  m_AssetNamingUsesSpace: 1
   m_UseLegacyProbeSampleCount: 0
   m_SerializeInlineMappingsOnOneLine: 1
+  m_DisableCookiesInLightmapper: 0
+  m_AssetPipelineMode: 1
+  m_RefreshImportMode: 0
+  m_CacheServerMode: 0
+  m_CacheServerEndpoint: 
+  m_CacheServerNamespacePrefix: default
+  m_CacheServerEnableDownload: 1
+  m_CacheServerEnableUpload: 1
+  m_CacheServerEnableAuth: 0
+  m_CacheServerEnableTls: 0
+  m_CacheServerValidationMode: 2
+  m_CacheServerDownloadBatchSize: 128

ProjectSettings/HybridCLRSettings.asset

@@ -23,7 +23,15 @@ MonoBehaviour:
   hotUpdateDllCompileOutputRootDir: HybridCLRData/HotUpdateDlls
   externalHotUpdateAssembliyDirs: []
   strippedAOTDllOutputRootDir: HybridCLRData/AssembliesPostIl2CppStrip
-  patchAOTAssemblies: []
+  patchAOTAssemblies:
+  - mscorlib.dll
+  - System.dll
+  - System.Core.dll
+  - UniTask.dll
+  - Minio.dll
+  - System.Runtime.CompilerServices.Unsafe.dll
+  - netstandard.dll
+  - COSXML.dll
   outputLinkFile: HybridCLRGenerate/link.xml
   outputAOTGenericReferenceFile: HybridCLRGenerate/AOTGenericReferences.cs
   maxGenericReferenceIteration: 10

ProjectSettings/ProjectSettings.asset

@@ -147,8 +147,6 @@ PlayerSettings:
     Others: 1
   bundleVersion: 0.5.0
   preloadedAssets:
-  - {fileID: 2720162604194769745, guid: 6f45d16099e3af24c9d1814902f6c1cd, type: 2}
-  - {fileID: -1976151159784538485, guid: 2fc93d2ce72dd364f968f3400a68213b, type: 2}
   - {fileID: 4800000, guid: ea9a295053a0dc440b9698a7f41d9741, type: 3}
   - {fileID: 4800000, guid: 1499e61b3897c4a4b9318a56ca931b8a, type: 3}
   - {fileID: 4800000, guid: 798d6e253a35a144d94205b80c8fd48b, type: 3}
@@ -156,6 +154,8 @@ PlayerSettings:
   - {fileID: 4800000, guid: 58841e6e22debfc43ba09a0cf58cd92d, type: 3}
   - {fileID: 4800000, guid: a336f422ffebbec4c89b4dac26022d5f, type: 3}
   - {fileID: 11400000, guid: 852e6bd112d2b174996470390b08d3a7, type: 2}
+  - {fileID: 2720162604194769745, guid: 6f45d16099e3af24c9d1814902f6c1cd, type: 2}
+  - {fileID: -1976151159784538485, guid: 2fc93d2ce72dd364f968f3400a68213b, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -827,7 +827,7 @@ PlayerSettings:
   webGLDecompressionFallback: 0
   webGLPowerPreference: 2
   scriptingDefineSymbols:
-    Android: UNITY_CCU;AVPRO_MOVIECAPTURE_WEBCAMTEXTURE_SUPPORT;AVPMC_ANDROID_VULKAN_PRETRANSFORM;CURVEDUI_TMP
+    Android: UNITY_CCU;AVPRO_MOVIECAPTURE_WEBCAMTEXTURE_SUPPORT;AVPMC_ANDROID_VULKAN_PRETRANSFORM;CURVEDUI_TMP;ISLOCAL
   additionalCompilerArguments: {}
   platformArchitecture: {}
   scriptingBackend: