From 843f5fa1ba356ea302e572e6e0bbab65f8a24a02 Mon Sep 17 00:00:00 2001 From: Maximilian Wagner Date: Wed, 3 May 2023 11:22:24 +0200 Subject: [PATCH] Stein schiebbar gemacht --- .gitignore | 5 +++- Assets/Scenes/AnimationBeta2-2704Even.unity | 28 ++++++++++++++++++--- Packages/manifest.json | 1 + Packages/packages-lock.json | 9 +++++++ ProjectSettings/ProjectSettings.asset | 2 +- 5 files changed, 40 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 58cbc82..0d91f74 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -# This .gitignore file should be placed at the root of your Unity project directory +ea# This .gitignore file should be placed at the root of your Unity project directory # # Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore # @@ -29,6 +29,9 @@ # Gradle cache directory .gradle/ +# IDE folders +.idea/ + # Autogenerated VS/MD/Consulo solution and project files ExportedObj/ .consulo/ diff --git a/Assets/Scenes/AnimationBeta2-2704Even.unity b/Assets/Scenes/AnimationBeta2-2704Even.unity index f9f9347..1a89694 100644 --- a/Assets/Scenes/AnimationBeta2-2704Even.unity +++ b/Assets/Scenes/AnimationBeta2-2704Even.unity @@ -377,7 +377,7 @@ Rigidbody2D: m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 - m_Constraints: 0 + m_Constraints: 4 --- !u!95 &103196401 Animator: serializedVersion: 5 @@ -667,6 +667,7 @@ GameObject: - component: {fileID: 893552677} - component: {fileID: 893552676} - component: {fileID: 893552675} + - component: {fileID: 893552678} m_Layer: 0 m_Name: Stone m_TagString: Untagged @@ -687,7 +688,7 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0.14554453, y: -0.7277216} + m_Offset: {x: 0.14554453, y: 0.39} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} @@ -698,7 +699,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 1 serializedVersion: 2 - m_Size: {x: 9.948911, y: 8.784556} + m_Size: {x: 9.948911, y: 7.25} m_EdgeRadius: 0 --- !u!212 &893552676 SpriteRenderer: @@ -767,6 +768,27 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &893552678 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 893552674} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 10 + m_LinearDrag: 5 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 --- !u!1 &1365348072 GameObject: m_ObjectHideFlags: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index e612475..c621723 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.5.1", "com.unity.render-pipelines.universal": "12.1.10", "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 74f0a43..37a565e 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -147,6 +147,15 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.inputsystem": { + "version": "1.5.1", + "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 1c89819..a7b59bb 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -732,7 +732,7 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 - activeInputHandler: 0 + activeInputHandler: 2 windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0