From bacb125298eaf250957f196bdb34738300c655d8 Mon Sep 17 00:00:00 2001 From: beni-T-52 <81741592+beni-T-52@users.noreply.github.com> Date: Tue, 22 Mar 2022 10:41:56 +0100 Subject: [PATCH] Revert "Installed XR-Interaction Toolkit" This reverts commit b692bc64e657d6bfef1dfef0d1376619ad7caea3. --- Assets/XRI.meta | 8 ---- Assets/XRI/Settings.meta | 8 ---- Assets/XRI/Settings/Resources.meta | 8 ---- .../Resources/InteractionLayerSettings.asset | 47 ------------------- .../InteractionLayerSettings.asset.meta | 8 ---- .../XRInteractionEditorSettings.asset | 16 ------- .../XRInteractionEditorSettings.asset.meta | 8 ---- Packages/manifest.json | 7 ++- Packages/packages-lock.json | 41 ++-------------- ProjectSettings/ProjectSettings.asset | 3 +- ProjectSettings/ProjectVersion.txt | 4 +- 11 files changed, 10 insertions(+), 148 deletions(-) delete mode 100644 Assets/XRI.meta delete mode 100644 Assets/XRI/Settings.meta delete mode 100644 Assets/XRI/Settings/Resources.meta delete mode 100644 Assets/XRI/Settings/Resources/InteractionLayerSettings.asset delete mode 100644 Assets/XRI/Settings/Resources/InteractionLayerSettings.asset.meta delete mode 100644 Assets/XRI/Settings/XRInteractionEditorSettings.asset delete mode 100644 Assets/XRI/Settings/XRInteractionEditorSettings.asset.meta diff --git a/Assets/XRI.meta b/Assets/XRI.meta deleted file mode 100644 index f2c0cd8..0000000 --- a/Assets/XRI.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4cf8bef3df38c454bae2ec2a2b4298da -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/XRI/Settings.meta b/Assets/XRI/Settings.meta deleted file mode 100644 index 173cd33..0000000 --- a/Assets/XRI/Settings.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f532a52f3bedfcc4785e32fdea6a836d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/XRI/Settings/Resources.meta b/Assets/XRI/Settings/Resources.meta deleted file mode 100644 index 92314ed..0000000 --- a/Assets/XRI/Settings/Resources.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: df70a8a9330b60b4a801e8e723390fc3 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset b/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset deleted file mode 100644 index 3f314b5..0000000 --- a/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset +++ /dev/null @@ -1,47 +0,0 @@ -%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: 191492db6e452eb468b95433ec162164, type: 3} - m_Name: InteractionLayerSettings - m_EditorClassIdentifier: - m_LayerNames: - - Default - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset.meta b/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset.meta deleted file mode 100644 index 0cb267a..0000000 --- a/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3a6323992fbb9b04c89bfec133902384 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/XRI/Settings/XRInteractionEditorSettings.asset b/Assets/XRI/Settings/XRInteractionEditorSettings.asset deleted file mode 100644 index 529491b..0000000 --- a/Assets/XRI/Settings/XRInteractionEditorSettings.asset +++ /dev/null @@ -1,16 +0,0 @@ -%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: 2d38fb1463c5c804b8847c20e8873623, type: 3} - m_Name: XRInteractionEditorSettings - m_EditorClassIdentifier: - m_InteractionLayerUpdaterShown: 1 - m_ShowOldInteractionLayerMaskInInspector: 0 diff --git a/Assets/XRI/Settings/XRInteractionEditorSettings.asset.meta b/Assets/XRI/Settings/XRInteractionEditorSettings.asset.meta deleted file mode 100644 index 87cfd60..0000000 --- a/Assets/XRI/Settings/XRInteractionEditorSettings.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a26cfb95d859cbc448fcee092c00c169 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index c92f5d0..b2c0917 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,14 +1,13 @@ { "dependencies": { - "com.unity.collab-proxy": "1.15.13", + "com.unity.collab-proxy": "1.15.12", "com.unity.ide.rider": "2.0.7", "com.unity.ide.visualstudio": "2.0.14", - "com.unity.ide.vscode": "1.2.5", - "com.unity.test-framework": "1.1.31", + "com.unity.ide.vscode": "1.2.4", + "com.unity.test-framework": "1.1.29", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.4.8", "com.unity.ugui": "1.0.0", - "com.unity.xr.interaction.toolkit": "2.0.1", "com.unity.xr.management": "4.2.1", "com.unity.xr.oculus": "1.11.2", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index a6ff4d1..ade8df4 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.collab-proxy": { - "version": "1.15.13", + "version": "1.15.12", "depth": 0, "source": "registry", "dependencies": { @@ -35,21 +35,12 @@ "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { - "version": "1.2.5", + "version": "1.2.4", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.inputsystem": { - "version": "1.2.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.modules.uielements": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.services.core": { "version": "1.0.1", "depth": 1, @@ -67,7 +58,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.31", + "version": "1.1.29", "depth": 0, "source": "registry", "dependencies": { @@ -107,32 +98,8 @@ "com.unity.modules.imgui": "1.0.0" } }, - "com.unity.xr.core-utils": { - "version": "2.0.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.modules.xr": "1.0.0" - }, - "url": "https://packages.unity.com" - }, - "com.unity.xr.interaction.toolkit": { - "version": "2.0.1", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.inputsystem": "1.2.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.com" - }, "com.unity.xr.legacyinputhelpers": { - "version": "2.1.9", + "version": "2.1.8", "depth": 1, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index b6e33f6..f1bfc4e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -638,7 +638,6 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: - vcxProjDefaultLanguage: XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -681,7 +680,7 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 - activeInputHandler: 1 + activeInputHandler: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index f6808b3..14a36b8 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.31f1 -m_EditorVersionWithRevision: 2020.3.31f1 (6b54b7616050) +m_EditorVersion: 2020.3.30f1 +m_EditorVersionWithRevision: 2020.3.30f1 (1fb1bf06830e)