From 2232b983c4d32987aa241de4814ef04504298307 Mon Sep 17 00:00:00 2001 From: bairong <1023385974@qq.com> Date: Fri, 17 May 2024 21:49:43 +0800 Subject: [PATCH] XR Plugin --- EmergencyEvacuation/Assets/XR.meta | 8 ++++ .../XR/XRGeneralSettingsPerBuildTarget.asset | 47 ++++++++++++++++++ ...XRGeneralSettingsPerBuildTarget.asset.meta | 8 ++++ EmergencyEvacuation/Packages/manifest.json | 2 + .../Packages/packages-lock.json | 48 +++++++++++++++++++ .../ProjectSettings/DynamicsManager.asset | 2 +- .../ProjectSettings/EditorBuildSettings.asset | 3 +- .../ProjectSettings/XRPackageSettings.asset | 5 ++ 8 files changed, 121 insertions(+), 2 deletions(-) create mode 100644 EmergencyEvacuation/Assets/XR.meta create mode 100644 EmergencyEvacuation/Assets/XR/XRGeneralSettingsPerBuildTarget.asset create mode 100644 EmergencyEvacuation/Assets/XR/XRGeneralSettingsPerBuildTarget.asset.meta create mode 100644 EmergencyEvacuation/ProjectSettings/XRPackageSettings.asset diff --git a/EmergencyEvacuation/Assets/XR.meta b/EmergencyEvacuation/Assets/XR.meta new file mode 100644 index 0000000..5195192 --- /dev/null +++ b/EmergencyEvacuation/Assets/XR.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: daf4df49d379ff541b49f0c4ad002427 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/EmergencyEvacuation/Assets/XR/XRGeneralSettingsPerBuildTarget.asset b/EmergencyEvacuation/Assets/XR/XRGeneralSettingsPerBuildTarget.asset new file mode 100644 index 0000000..57925a3 --- /dev/null +++ b/EmergencyEvacuation/Assets/XR/XRGeneralSettingsPerBuildTarget.asset @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: d2dc886499c26824283350fa532d087d, type: 3} + m_Name: XRGeneralSettingsPerBuildTarget + m_EditorClassIdentifier: + Keys: 01000000 + Values: + - {fileID: 7435701807298598873} +--- !u!114 &2242682123301106356 +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: f4c3631f5e58749a59194e0cf6baf6d5, type: 3} + m_Name: Standalone Providers + m_EditorClassIdentifier: + m_RequiresSettingsUpdate: 0 + m_AutomaticLoading: 0 + m_AutomaticRunning: 0 + m_Loaders: [] +--- !u!114 &7435701807298598873 +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: d236b7d11115f2143951f1e14045df39, type: 3} + m_Name: Standalone Settings + m_EditorClassIdentifier: + m_LoaderManagerInstance: {fileID: 2242682123301106356} + m_InitManagerOnStart: 1 diff --git a/EmergencyEvacuation/Assets/XR/XRGeneralSettingsPerBuildTarget.asset.meta b/EmergencyEvacuation/Assets/XR/XRGeneralSettingsPerBuildTarget.asset.meta new file mode 100644 index 0000000..7d4b452 --- /dev/null +++ b/EmergencyEvacuation/Assets/XR/XRGeneralSettingsPerBuildTarget.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5d103f1f1bf89da4baedb6ec3c0cbe83 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/EmergencyEvacuation/Packages/manifest.json b/EmergencyEvacuation/Packages/manifest.json index e0b2db6..97f3c05 100644 --- a/EmergencyEvacuation/Packages/manifest.json +++ b/EmergencyEvacuation/Packages/manifest.json @@ -8,8 +8,10 @@ "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.4", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.9", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.7.8", + "com.unity.xr.management": "4.4.1", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/EmergencyEvacuation/Packages/packages-lock.json b/EmergencyEvacuation/Packages/packages-lock.json index 2e2e9a8..e5b6725 100644 --- a/EmergencyEvacuation/Packages/packages-lock.json +++ b/EmergencyEvacuation/Packages/packages-lock.json @@ -94,6 +94,22 @@ "dependencies": {}, "url": "https://packages.unity.cn" }, + "com.unity.sysroot": { + "version": "2.0.10", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.cn" + }, + "com.unity.sysroot.linux-x86_64": { + "version": "2.0.9", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.10" + }, + "url": "https://packages.unity.cn" + }, "com.unity.test-framework": { "version": "1.1.31", "depth": 0, @@ -136,6 +152,16 @@ }, "url": "https://packages.unity.cn" }, + "com.unity.toolchain.win-x86_64-linux-x86_64": { + "version": "2.0.9", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.10", + "com.unity.sysroot.linux-x86_64": "2.0.9" + }, + "url": "https://packages.unity.cn" + }, "com.unity.ugui": { "version": "1.0.0", "depth": 0, @@ -155,6 +181,28 @@ }, "url": "https://packages.unity.cn" }, + "com.unity.xr.legacyinputhelpers": { + "version": "2.1.10", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.xr": "1.0.0" + }, + "url": "https://packages.unity.cn" + }, + "com.unity.xr.management": { + "version": "4.4.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.subsystems": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.xr": "1.0.0", + "com.unity.xr.legacyinputhelpers": "2.1.7" + }, + "url": "https://packages.unity.cn" + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, diff --git a/EmergencyEvacuation/ProjectSettings/DynamicsManager.asset b/EmergencyEvacuation/ProjectSettings/DynamicsManager.asset index f52a735..0d0c86e 100644 --- a/EmergencyEvacuation/ProjectSettings/DynamicsManager.asset +++ b/EmergencyEvacuation/ProjectSettings/DynamicsManager.asset @@ -14,7 +14,7 @@ PhysicsManager: m_DefaultSolverVelocityIterations: 1 m_QueriesHitBackfaces: 0 m_QueriesHitTriggers: 1 - m_EnableAdaptiveForce: 0 + m_EnableAdaptiveForce: 1 m_ClothInterCollisionDistance: 0 m_ClothInterCollisionStiffness: 0 m_ContactsGeneration: 1 diff --git a/EmergencyEvacuation/ProjectSettings/EditorBuildSettings.asset b/EmergencyEvacuation/ProjectSettings/EditorBuildSettings.asset index 0147887..96567c7 100644 --- a/EmergencyEvacuation/ProjectSettings/EditorBuildSettings.asset +++ b/EmergencyEvacuation/ProjectSettings/EditorBuildSettings.asset @@ -5,4 +5,5 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: [] - m_configObjects: {} + m_configObjects: + com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 5d103f1f1bf89da4baedb6ec3c0cbe83, type: 2} diff --git a/EmergencyEvacuation/ProjectSettings/XRPackageSettings.asset b/EmergencyEvacuation/ProjectSettings/XRPackageSettings.asset new file mode 100644 index 0000000..7e791e1 --- /dev/null +++ b/EmergencyEvacuation/ProjectSettings/XRPackageSettings.asset @@ -0,0 +1,5 @@ +{ + "m_Settings": [ + "RemoveLegacyInputHelpersForReload" + ] +} \ No newline at end of file