From a1258368942cea1126cc617a57e2e7de1aa757f1 Mon Sep 17 00:00:00 2001 From: Joshua Reason Date: Sat, 4 Feb 2023 12:25:40 +1100 Subject: [PATCH] Imported new input system into project --- Assets/Art Assets.meta | 8 ++++++++ Assets/Art Assets/Materials.meta | 8 ++++++++ Assets/Art Assets/Models.meta | 8 ++++++++ Assets/Art Assets/SFX.meta | 8 ++++++++ Assets/Art Assets/Shaders.meta | 8 ++++++++ Assets/Art Assets/Textures.meta | 8 ++++++++ Assets/Data.meta | 8 ++++++++ Assets/Prefab.meta | 8 ++++++++ Assets/ScriptTemplates.meta | 8 ++++++++ Packages/manifest.json | 1 + Packages/packages-lock.json | 9 +++++++++ ProjectSettings/ProjectSettings.asset | 2 +- 12 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 Assets/Art Assets.meta create mode 100644 Assets/Art Assets/Materials.meta create mode 100644 Assets/Art Assets/Models.meta create mode 100644 Assets/Art Assets/SFX.meta create mode 100644 Assets/Art Assets/Shaders.meta create mode 100644 Assets/Art Assets/Textures.meta create mode 100644 Assets/Data.meta create mode 100644 Assets/Prefab.meta create mode 100644 Assets/ScriptTemplates.meta diff --git a/Assets/Art Assets.meta b/Assets/Art Assets.meta new file mode 100644 index 0000000..35b4eb7 --- /dev/null +++ b/Assets/Art Assets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 87603f0c219489d42974471d8baae381 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Materials.meta b/Assets/Art Assets/Materials.meta new file mode 100644 index 0000000..4b85046 --- /dev/null +++ b/Assets/Art Assets/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8474e0ba450feb14eb9f1e0683345180 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Models.meta b/Assets/Art Assets/Models.meta new file mode 100644 index 0000000..f96f945 --- /dev/null +++ b/Assets/Art Assets/Models.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a5d1123469e2ae84f963e3fa3a2e5e79 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/SFX.meta b/Assets/Art Assets/SFX.meta new file mode 100644 index 0000000..7431150 --- /dev/null +++ b/Assets/Art Assets/SFX.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 881be7c129f4ebc498373c2f19724be3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Shaders.meta b/Assets/Art Assets/Shaders.meta new file mode 100644 index 0000000..892bc49 --- /dev/null +++ b/Assets/Art Assets/Shaders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cafb83e5976f8944995d7c413d8ee173 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Assets/Textures.meta b/Assets/Art Assets/Textures.meta new file mode 100644 index 0000000..dd7407a --- /dev/null +++ b/Assets/Art Assets/Textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fd2385127e66ba64a8f96869ff8c0bb1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data.meta b/Assets/Data.meta new file mode 100644 index 0000000..2174bdd --- /dev/null +++ b/Assets/Data.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 52ee2f92b9973b34780bad158791cd1a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefab.meta b/Assets/Prefab.meta new file mode 100644 index 0000000..0667152 --- /dev/null +++ b/Assets/Prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: db575eb71f85b0540914687a094e0aaf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ScriptTemplates.meta b/Assets/ScriptTemplates.meta new file mode 100644 index 0000000..da49670 --- /dev/null +++ b/Assets/ScriptTemplates.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6c5bd503ce0fd7340991a44763f4e8d8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 647d5e1..80e3d71 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -5,6 +5,7 @@ "com.unity.ide.rider": "3.0.18", "com.unity.ide.visualstudio": "2.0.17", "com.unity.ide.vscode": "1.2.5", + "com.unity.inputsystem": "1.4.4", "com.unity.render-pipelines.universal": "12.1.9", "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 55c0ef8..2ea456a 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -55,6 +55,15 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.inputsystem": { + "version": "1.4.4", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.mathematics": { "version": "1.2.6", "depth": 1, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index bac5b7b..a12b4d4 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:165f648eec1e0be5bd6cb2a6948c468dd94d912a6081acf7793c997da43bad32 +oid sha256:10b9e51cf71fe6ca5003c5e99410e0bf95b736e33dff131ecce0e845f74b92cc size 23007