Browse Source

修復劃綫問題

胡佳骏 1 year ago
parent
commit
7c6d243a6c

+ 1 - 5
Packages/manifest.json

@@ -1,13 +1,9 @@
 {
   "dependencies": {
     "com.ptc.vuforia.engine": "file:com.ptc.vuforia.engine-10.13.3.tgz",
-    "com.unity.ads": "3.7.5",
-    "com.unity.analytics": "3.6.12",
-    "com.unity.collab-proxy": "1.17.7",
     "com.unity.ide.rider": "3.0.16",
     "com.unity.ide.visualstudio": "2.0.16",
     "com.unity.ide.vscode": "1.2.5",
-    "com.unity.purchasing": "4.5.2",
     "com.unity.test-framework": "1.1.31",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.6.4",
@@ -15,7 +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:C:/UnityProjects/XRSDK/package",
+    "jh.xr.engine": "file:D:/JiHe/XRSDK/package",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

+ 15 - 98
Packages/packages-lock.json

@@ -8,33 +8,6 @@
         "com.unity.ugui": "1.0.0"
       }
     },
-    "com.unity.ads": {
-      "version": "3.7.5",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.ugui": "1.0.0"
-      },
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.analytics": {
-      "version": "3.6.12",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.ugui": "1.0.0"
-      },
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.collab-proxy": {
-      "version": "1.17.7",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.services.core": "1.0.1"
-      },
-      "url": "https://packages.unity.cn"
-    },
     "com.unity.ext.nunit": {
       "version": "1.0.6",
       "depth": 1,
@@ -76,49 +49,6 @@
       },
       "url": "https://packages.unity.cn"
     },
-    "com.unity.nuget.newtonsoft-json": {
-      "version": "3.0.2",
-      "depth": 2,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.purchasing": {
-      "version": "4.5.2",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.ugui": "1.0.0",
-        "com.unity.modules.unityanalytics": "1.0.0",
-        "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.modules.jsonserialize": "1.0.0",
-        "com.unity.modules.androidjni": "1.0.0",
-        "com.unity.services.core": "1.3.1",
-        "com.unity.services.analytics": "4.0.1"
-      },
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.services.analytics": {
-      "version": "4.2.0",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.ugui": "1.0.0",
-        "com.unity.services.core": "1.4.0"
-      },
-      "url": "https://packages.unity.cn"
-    },
-    "com.unity.services.core": {
-      "version": "1.6.0",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.nuget.newtonsoft-json": "3.0.2",
-        "com.unity.modules.androidjni": "1.0.0"
-      },
-      "url": "https://packages.unity.cn"
-    },
     "com.unity.subsystemregistration": {
       "version": "1.1.0",
       "depth": 2,
@@ -191,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"
     },
@@ -259,16 +176,16 @@
       },
       "url": "https://packages.unity.cn"
     },
-    "com.ximmerse.xr": {
-      "version": "file:C:/UnityProjects/XRSDK/package",
+    "jh.xr.engine": {
+      "version": "file:D:/JiHe/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"
       }
     },

+ 3 - 3
ProjectSettings/EditorBuildSettings.asset

@@ -21,13 +21,13 @@ EditorBuildSettings:
     path: Assets/TestVideo.unity
     guid: 0d6fbfc550a5d5443bc6b6631ef09172
   m_configObjects:
-    UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: cd3fd485a9dd8ec439ed81513ae35590,
+    UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: d024b25d37137f94890858d4b6a88af6,
       type: 2}
     com.unity.input.settings: {fileID: 11400000, guid: 7ab1a90ab8c5b934aa1e26d54261b692,
       type: 2}
     com.unity.renderstreaming.settings: {fileID: 11400000, guid: eaaad242393318e4f85c45e69c8837f0,
       type: 2}
-    com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 8f422df2931cba0478c1fe8ab232b9a3,
+    com.unity.xr.management.loader_settings: {fileID: 11400000, guid: bf1be7b556e14e44aadbe8ccbd6b4a1d,
       type: 2}
-    com.unity.xr.openxr.settings4: {fileID: 11400000, guid: 2d049ae1db0e2b74c8251022ae6dcb95,
+    com.unity.xr.openxr.settings4: {fileID: 11400000, guid: 93ed3b462c7c82d4594fa4d925b91911,
       type: 2}

+ 11 - 8
ProjectSettings/ProjectSettings.asset

@@ -149,9 +149,12 @@ PlayerSettings:
   bundleVersion: 10.13.3
   preloadedAssets:
   - {fileID: 0}
-  - {fileID: 11400000, guid: 7ab1a90ab8c5b934aa1e26d54261b692, type: 2}
-  - {fileID: -6682207197718421661, guid: 8f422df2931cba0478c1fe8ab232b9a3, type: 2}
-  - {fileID: 3493090336618791480, guid: 2d049ae1db0e2b74c8251022ae6dcb95, type: 2}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: -7757256057747849950, guid: bf1be7b556e14e44aadbe8ccbd6b4a1d, type: 2}
+  - {fileID: 3407827143893180361, guid: 93ed3b462c7c82d4594fa4d925b91911, type: 2}
+  - {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -257,12 +260,12 @@ PlayerSettings:
   clonedFromGUID: 2384ff924a3af4e60b5229a9cc8b5126
   templatePackageId: 
   templateDefaultScene: 
-  useCustomMainManifest: 1
+  useCustomMainManifest: 0
   useCustomLauncherManifest: 0
   useCustomMainGradleTemplate: 0
   useCustomLauncherGradleManifest: 0
-  useCustomBaseGradleTemplate: 1
-  useCustomGradlePropertiesTemplate: 1
+  useCustomBaseGradleTemplate: 0
+  useCustomGradlePropertiesTemplate: 0
   useCustomProguardFile: 0
   AndroidTargetArchitectures: 2
   AndroidTargetDevices: 0
@@ -925,6 +928,7 @@ PlayerSettings:
   metroSplashScreenUseBackgroundColor: 1
   platformCapabilities:
     WindowsStoreApps:
+      EnterpriseAuthentication: False
       OfflineMapsManagement: False
       HumanInterfaceDevice: False
       Location: False
@@ -937,7 +941,6 @@ PlayerSettings:
       InternetClientServer: False
       VideosLibrary: False
       Objects3D: False
-      InternetClient: True
       RemoteSystem: False
       BlockedChatMessages: False
       PhoneCall: False
@@ -959,9 +962,9 @@ PlayerSettings:
       RecordedCallsFolder: False
       Contacts: False
       Proximity: False
+      InternetClient: True
       CodeGeneration: False
       BackgroundMediaPlayback: False
-      EnterpriseAuthentication: False
   metroTargetDeviceFamilies:
     Desktop: False
     Holographic: False