From dac1384e94d213976147b72f3c3dca10b39471da Mon Sep 17 00:00:00 2001 From: Noah4ever <66632359+Noah4ever@users.noreply.github.com> Date: Sun, 14 Nov 2021 12:26:05 +0100 Subject: [PATCH] Eignetlich nichts gemacht --- .../Player/Player Animation Test.prefab | 4 + Packages/manifest.json | 4 +- Packages/packages-lock.json | 4 +- UserSettings/Layouts/default-2021.dwlt | 216 +++++++++--------- 4 files changed, 116 insertions(+), 112 deletions(-) diff --git a/Assets/Prefabs/Player/Player Animation Test.prefab b/Assets/Prefabs/Player/Player Animation Test.prefab index 0762863..6a5c52c 100644 --- a/Assets/Prefabs/Player/Player Animation Test.prefab +++ b/Assets/Prefabs/Player/Player Animation Test.prefab @@ -1179,6 +1179,10 @@ PrefabInstance: propertyPath: m_Name value: M92 objectReference: {fileID: 0} + - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: damage + value: 15 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bd217f9f85ce78e46a925776562625e8, type: 3} --- !u!1 &7768205653369755348 stripped diff --git a/Packages/manifest.json b/Packages/manifest.json index 8ac0f86..cd9ba98 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -4,13 +4,13 @@ "com.unity.animation.rigging": "1.1.1", "com.unity.collab-proxy": "1.13.5", "com.unity.ide.rider": "3.0.7", - "com.unity.ide.visualstudio": "2.0.11", + "com.unity.ide.visualstudio": "2.0.12", "com.unity.ide.vscode": "1.2.4", "com.unity.test-framework": "1.1.29", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.2", "com.unity.ugui": "1.0.0", - "com.unity.visualscripting": "1.7.2", + "com.unity.visualscripting": "1.7.6", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index b479120..b63cbb8 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -53,7 +53,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.11", + "version": "2.0.12", "depth": 0, "source": "registry", "dependencies": { @@ -133,7 +133,7 @@ } }, "com.unity.visualscripting": { - "version": "1.7.2", + "version": "1.7.6", "depth": 0, "source": "registry", "dependencies": { diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index a573417..5e68752 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,10 +14,10 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 1536 - y: 43 - width: 1920 - height: 997 + x: 0 + y: 43.2 + width: 1536 + height: 780.8 m_ShowMode: 4 m_Title: Game m_RootView: {fileID: 2} @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 - height: 997 + width: 1536 + height: 781 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 + width: 1536 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -90,8 +90,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 977 - width: 1920 + y: 761 + width: 1536 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -114,12 +114,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1920 - height: 947 + width: 1536 + height: 731 m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 754 + controlID: 87 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1464 - height: 947 + width: 1269 + height: 731 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 755 + controlID: 88 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -165,12 +165,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1464 - height: 611 + width: 1269 + height: 439 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 756 + controlID: 89 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -188,10 +188,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 370 - height: 611 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 243 + height: 439 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -212,12 +212,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 370 + x: 243 y: 0 - width: 519 - height: 611 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 493 + height: 439 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 16} m_Panes: - {fileID: 15} @@ -239,12 +239,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 889 + x: 736 y: 0 - width: 575 - height: 611 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 533 + height: 439 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -266,11 +266,11 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 611 - width: 1464 - height: 336 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} + y: 439 + width: 1269 + height: 292 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 18} m_Panes: - {fileID: 17} @@ -292,12 +292,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1464 + x: 1269 y: 0 - width: 456 - height: 947 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + width: 267 + height: 731 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} @@ -319,14 +319,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2425 - y: 73 - width: 573 - height: 590 + x: -24864 + y: -25569.6 + width: 531 + height: 418 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -337,7 +337,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 573, y: 569} + m_TargetSize: {x: 531, y: 397} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -352,10 +352,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -286.5 - m_HBaseRangeMax: 286.5 - m_VBaseRangeMin: -284.5 - m_VBaseRangeMax: 284.5 + m_HBaseRangeMin: -212.40001 + m_HBaseRangeMax: 212.40001 + m_VBaseRangeMin: -158.8 + m_VBaseRangeMax: 158.8 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -373,23 +373,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 573 - height: 569 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 286.5, y: 284.5} + width: 531 + height: 397 + m_Scale: {x: 1.2011244, y: 1.2011243} + m_Translation: {x: 265.5, y: 198.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -286.5 - y: -284.5 - width: 573 - height: 569 + x: -221.04288 + y: -165.26183 + width: 442.08575 + height: 330.52365 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 573, y: 590} + m_LastWindowPixelSize: {x: 663.75, y: 522.5} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -411,14 +411,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1536 - y: 73 - width: 369 - height: 590 + x: -25600 + y: -25569.6 + width: 242 + height: 418 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -426,9 +426,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 3ef7ffff m_LastClickedID: 0 - m_ExpandedIDs: e6d2fdff38d3fdffced5fdff80dcfdffd2dcfdff68dffdff44e7fdff96e7fdff2ceafdffc0f5fdff14f6fdffd0f6fdffc2f7fdffd8f9fdffd0fafdff22fbfdffaafdfdffd4fdfdff8636feffd836feff9437feffb037feff8438feffd638feff5e3bfeff883bfeffc647feff1848feffa04afeffca4afeff9a61feffee61feff7664feffa064feffb66cfeff0a6dfeff926ffeffbc6ffeff2afbffff + m_ExpandedIDs: 2afbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -468,7 +468,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Animator - m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 @@ -532,14 +532,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1906 - y: 73 - width: 517 - height: 590 + x: -25356.8 + y: -25569.6 + width: 491 + height: 418 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -604,9 +604,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 67.5, y: 86} + snapOffset: {x: -111.20001, y: 86} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 + snapCorner: 1 id: Orientation index: 0 layout: 4 @@ -745,16 +745,16 @@ MonoBehaviour: m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 0 m_OverrideSceneCullingMask: 6917529027641081856 - m_SceneIsLit: 0 + m_SceneIsLit: 1 m_SceneLighting: 1 m_2DMode: 0 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.36444837, y: 8.662055, z: 6.1208687} + m_Target: {x: 12.566701, y: 3.9675372, z: 0.014717923} speed: 2 - m_Value: {x: -0.36444837, y: 8.662055, z: 6.1208687} + m_Value: {x: 12.566701, y: 3.9675372, z: 0.014717923} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -801,13 +801,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.14265797, y: -0.8023181, z: 0.212259, w: -0.53944343} + m_Target: {x: 0.12276869, y: -0.59779793, z: 0.09329085, w: 0.78668725} speed: 2 - m_Value: {x: -0.1426495, y: -0.8022705, z: 0.21224639, w: -0.5394114} + m_Value: {x: 0.1227678, y: -0.5977936, z: 0.09329017, w: 0.78668153} m_Size: - m_Target: 3.234408 + m_Target: 2.8332496 speed: 2 - m_Value: 3.234408 + m_Value: 2.8332496 m_Ortho: m_Target: 0 speed: 2 @@ -848,14 +848,14 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1536 - y: 684 - width: 1463 - height: 315 + x: 0 + y: 512 + width: 1268 + height: 271 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -873,22 +873,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scenes + - Assets/Scripts/Weapons m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scenes + - Assets/Scripts/Weapons m_LastFoldersGridSize: -1 - m_LastProjectPath: C:\Users\juliu\Desktop\Ausbildung\Fps-build\3d-shooter + m_LastProjectPath: D:\.Downloads\Programming\Unity\Projects\Rheinmetall\3dshooter\3d-shooter m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 120} - m_SelectedIDs: d8640000 - m_LastClickedID: 25816 - m_ExpandedIDs: 00000000406300004263000044630000d4640000d664000000ca9a3bffffff7f + scrollPos: {x: 0, y: 149} + m_SelectedIDs: ea630000 + m_LastClickedID: 25578 + m_ExpandedIDs: 00000000b8630000ba630000bc630000be630000c0630000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -916,7 +916,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000040630000426300004463000000ca9a3bffffff7f + m_ExpandedIDs: 00000000b8630000ba630000bc630000be630000c0630000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -941,8 +941,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: f0650000 + m_LastClickedInstanceID: 26096 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000 m_RenameOverlay: @@ -988,14 +988,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1536 - y: 684 - width: 1463 - height: 315 + x: -25600 + y: -25131.201 + width: 1268 + height: 271 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1016,14 +1016,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Inspector - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 3000 - y: 73 - width: 455 - height: 926 + x: -24331.201 + y: -25569.6 + width: 266 + height: 710 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default