diff --git a/Assets/Objects/Weapons.meta b/Assets/Objects/Weapons.meta new file mode 100644 index 0000000..72edbef --- /dev/null +++ b/Assets/Objects/Weapons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d5146bf3ab1e1e6418daa58d244677b2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Objects/Weapons/M9.meta b/Assets/Objects/Weapons/M9.meta new file mode 100644 index 0000000..b311e2d --- /dev/null +++ b/Assets/Objects/Weapons/M9.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 39fa903cbb8c5cd4b8da1b809f13ccbb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player Animation Test.prefab.meta b/Assets/Prefabs/Player Animation Test.prefab.meta new file mode 100644 index 0000000..39efe14 --- /dev/null +++ b/Assets/Prefabs/Player Animation Test.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a14d876ac00bdf6498e30b3e58b68fdf +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Animation Test.unity.meta b/Assets/Scenes/Animation Test.unity.meta new file mode 100644 index 0000000..403fd06 --- /dev/null +++ b/Assets/Scenes/Animation Test.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 02c13534ac288954c9a8339782de67f0 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/Headbob.cs.meta b/Assets/Scripts/Player/Headbob.cs.meta new file mode 100644 index 0000000..819e65e --- /dev/null +++ b/Assets/Scripts/Player/Headbob.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4db7caf602ce379408a59c8722e06e46 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/PlayerMouseLook.cs.meta b/Assets/Scripts/Player/PlayerMouseLook.cs.meta new file mode 100644 index 0000000..3d02c8d --- /dev/null +++ b/Assets/Scripts/Player/PlayerMouseLook.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a8493f0e2b0d4bd4f98d3cd81c2db5ad +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Weapons.meta b/Assets/Scripts/Weapons.meta new file mode 100644 index 0000000..17db65f --- /dev/null +++ b/Assets/Scripts/Weapons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 07f5bfb9bc3f0134e92e220ccbea4949 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 5405249..b1fa48d 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -7,9 +7,9 @@ "com.unity.ide.vscode": "1.2.4", "com.unity.test-framework": "1.1.29", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.5.6", + "com.unity.timeline": "1.6.2", "com.unity.ugui": "1.0.0", - "com.unity.visualscripting": "1.6.1", + "com.unity.visualscripting": "1.7.2", "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 4339d0f..3665f2a 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -86,7 +86,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.5.6", + "version": "1.6.2", "depth": 0, "source": "registry", "dependencies": { @@ -107,17 +107,12 @@ } }, "com.unity.visualscripting": { - "version": "1.6.1", + "version": "1.7.2", "depth": 0, "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.modules.ai": "1.0.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.particlesystem": "1.0.0", - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.physics2d": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, diff --git a/ProjectSettings/MemorySettings.asset b/ProjectSettings/MemorySettings.asset new file mode 100644 index 0000000..5b5face --- /dev/null +++ b/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index be54ac2..03f4c05 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.1.26f1 -m_EditorVersionWithRevision: 2021.1.26f1 (6f076387c01d) +m_EditorVersion: 2021.2.0f1 +m_EditorVersionWithRevision: 2021.2.0f1 (4bf1ec4b23c9) diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config new file mode 100644 index 0000000..e69de29 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index eb1554c..09cf817 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1536 height: 780.8 m_ShowMode: 4 - m_Title: Game + m_Title: Project m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 92 + controlID: 62 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 93 + controlID: 63 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -166,11 +166,11 @@ MonoBehaviour: x: 0 y: 0 width: 1171 - height: 471 + height: 471.2 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 94 + controlID: 64 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -188,8 +188,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 298 - height: 471 + width: 297.6 + height: 471.2 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} @@ -212,10 +212,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 298 + x: 297.6 y: 0 - width: 581 - height: 471 + width: 580.80005 + height: 471.2 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 16} @@ -238,10 +238,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 879 + x: 878.4 y: 0 - width: 292 - height: 471 + width: 292.59998 + height: 471.2 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 15} @@ -260,23 +260,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 471 + y: 471.2 width: 1171 - height: 260 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 18} + height: 259.8 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} - {fileID: 18} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -417,8 +417,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 297 - height: 450 + width: 296.6 + height: 450.2 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: 345e0000 m_LastClickedID: 0 - m_ExpandedIDs: 2afbffff + m_ExpandedIDs: 88edffff2afbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -472,10 +472,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 879.2 + x: 878.4 y: 73.6 - width: 290 - height: 450 + width: 290.59998 + height: 450.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -788,10 +788,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 298.4 + x: 297.6 y: 73.6 - width: 579 - height: 450 + width: 578.80005 + height: 450.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -853,9 +853,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 544 + y: 544.8 width: 1170 - height: 239 + height: 238.79999 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -873,22 +873,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Objects/Weapons/M9 + - Assets/Prefabs m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Objects/Weapons/M9 + - Assets/Prefabs m_LastFoldersGridSize: -1 m_LastProjectPath: C:\Users\juliu\Desktop\Ausbildung\Fps-build\3d-shooter m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 149} - m_SelectedIDs: 8a620000 - m_LastClickedID: 25226 - m_ExpandedIDs: 00000000fe61000000620000 + scrollPos: {x: 0, y: 120} + m_SelectedIDs: 76630000 + m_LastClickedID: 25462 + m_ExpandedIDs: 00000000fe6100000062000074630000a463000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -941,8 +941,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: f2610000 - m_LastClickedInstanceID: 25074 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000 m_RenameOverlay: @@ -993,9 +993,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 544 + y: 544.8 width: 1170 - height: 239 + height: 238.79999 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default