From 3a1a27953043eea271c4450dbe34c215aa7d59de Mon Sep 17 00:00:00 2001 From: Noah4ever <66632359+Noah4ever@users.noreply.github.com> Date: Wed, 8 Dec 2021 20:53:40 +0100 Subject: [PATCH] Grenades damage at player Grenades now remove the correct damage --- Assets/Scenes/TestScene.unity | 40 ++- Assets/Scripts/Player/Player.cs | 3 - Assets/Scripts/Weapons/Grenade.cs | 4 +- ProjectSettings/ProjectVersion.txt | 4 +- UserSettings/Layouts/default-2021.dwlt | 430 ++++++++++++++----------- 5 files changed, 279 insertions(+), 202 deletions(-) diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScene.unity index d63a49c..cb965fe 100644 --- a/Assets/Scenes/TestScene.unity +++ b/Assets/Scenes/TestScene.unity @@ -1415,10 +1415,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 0} - propertyPath: explodeParticle - value: - objectReference: {fileID: 1541885955888442623} - target: {fileID: 732033708985862910, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: m_RootOrder value: 12 @@ -1471,13 +1467,17 @@ PrefabInstance: propertyPath: m_Name value: Grenade objectReference: {fileID: 0} + - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + propertyPath: damage + value: 25 + objectReference: {fileID: 0} - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: dropForce value: 15 objectReference: {fileID: 0} - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: grenadeRadius - value: 10 + value: 3 objectReference: {fileID: 0} - target: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: hasBeenThrown @@ -1556,6 +1556,36 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1323619077 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5071598280516985511, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + m_PrefabInstance: {fileID: 1243110492} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1323619081 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5204381087217674634, guid: bd217f9f85ce78e46a925776562625e8, type: 3} + m_PrefabInstance: {fileID: 1243110492} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1323619077} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c98f5c47a8b7dd64f86fd6f42c4d6e5e, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1323619084 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1323619077} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: efa52c67441299049b2e2634d9e3e534, type: 3} + m_Name: + m_EditorClassIdentifier: + explodeParticle: {fileID: 1541885955888442623} + weapon: {fileID: 1323619081} --- !u!1 &1351784389 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index d158c15..93588eb 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -109,8 +109,6 @@ public class Player : NetworkBehaviour } public void RemoveHealth(int value) { - - if (isAlive) { ShowHit(); @@ -121,7 +119,6 @@ public class Player : NetworkBehaviour Die(); } } - } [ClientRpc] diff --git a/Assets/Scripts/Weapons/Grenade.cs b/Assets/Scripts/Weapons/Grenade.cs index aef86c5..85dcc0c 100644 --- a/Assets/Scripts/Weapons/Grenade.cs +++ b/Assets/Scripts/Weapons/Grenade.cs @@ -37,8 +37,8 @@ public class Grenade : MonoBehaviour Collider[] colliders = Physics.OverlapSphere(transform.position, weapon.GrenadeRadius); // Iterate over all colliders found in radius foreach(Collider nearbyObject in colliders) { - // Check if nearby object is a Player - if (nearbyObject.transform.gameObject.GetComponent()) { + // Check if nearby object is a Player and if Collider is not a CharacterController (can be changed to CapsuleCollider) + if (nearbyObject.transform.gameObject.GetComponent() && nearbyObject.GetType() != typeof(UnityEngine.CharacterController)) { // Remove health from player nearbyObject.transform.gameObject.GetComponent().RemoveHealth(weapon.Damage); } else { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 03f4c05..d1f16a3 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.2.0f1 -m_EditorVersionWithRevision: 2021.2.0f1 (4bf1ec4b23c9) +m_EditorVersion: 2021.2.3f1 +m_EditorVersionWithRevision: 2021.2.3f1 (32358a8527b4) diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index d5f27bf..8801a0f 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -15,16 +15,67 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 0 - y: 43.2 - width: 1536 - height: 780.8 + y: 43 + width: 2560 + height: 1357 m_ShowMode: 4 - m_Title: Hierarchy - m_RootView: {fileID: 2} + m_Title: Project + m_RootView: {fileID: 4} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ConsoleWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1399 + y: 0 + width: 700 + height: 378 + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 20} + m_Panes: + - {fileID: 20} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + 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: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 13} + - {fileID: 2} + m_Position: + serializedVersion: 2 + x: 0 + y: 929 + width: 2099 + height: 378 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 32784 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -37,22 +88,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 3} - {fileID: 5} - - {fileID: 4} + - {fileID: 7} + - {fileID: 6} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1536 - height: 781 + width: 2560 + height: 1357 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &3 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -69,12 +120,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1536 + width: 2560 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &4 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -90,61 +141,11 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 761 - width: 1536 + y: 1337 + width: 2560 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &5 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 6} - - {fileID: 12} - m_Position: - serializedVersion: 2 - x: 0 - y: 30 - width: 1536 - height: 731 - m_MinSize: {x: 400, y: 200} - m_MaxSize: {x: 32384, y: 16192} - vertical: 0 - controlID: 267 ---- !u!114 &6 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 7} - - {fileID: 11} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1252 - height: 731 - m_MinSize: {x: 300, y: 200} - m_MaxSize: {x: 24288, y: 16192} - vertical: 1 - controlID: 268 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -159,19 +160,69 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 8} + - {fileID: 14} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 2560 + height: 1307 + m_MinSize: {x: 400, y: 200} + m_MaxSize: {x: 32384, y: 16192} + vertical: 0 + controlID: 43 +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: - {fileID: 9} - - {fileID: 10} + - {fileID: 3} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1252 - height: 439.2 + width: 2099 + height: 1307 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} + vertical: 1 + controlID: 44 +--- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 10} + - {fileID: 11} + - {fileID: 12} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 2099 + height: 929 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 269 ---- !u!114 &8 + controlID: 91 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -188,16 +239,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 194.4 - height: 439.2 + width: 387 + height: 929 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 14} + - {fileID: 16} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &9 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -212,19 +263,19 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 194.4 + x: 387 y: 0 - width: 409.6 - height: 439.2 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 16} + width: 814 + height: 929 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 15} - - {fileID: 16} + - {fileID: 17} + - {fileID: 18} m_Selected: 1 m_LastSelected: 0 ---- !u!114 &10 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -239,18 +290,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 604 + x: 1201 y: 0 - width: 648 - height: 439.2 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 13} + width: 898 + height: 929 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 13} + - {fileID: 15} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &11 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -266,18 +317,17 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 439.2 - width: 1252 - height: 291.8 + y: 0 + width: 1399 + height: 378 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 17} - - {fileID: 18} + - {fileID: 19} m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &12 + m_LastSelected: 0 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -292,18 +342,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1252 + x: 2099 y: 0 - width: 284 - height: 731 + width: 461 + height: 1307 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 19} + m_ActualView: {fileID: 21} m_Panes: - - {fileID: 19} + - {fileID: 21} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &13 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -319,14 +369,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 604 - y: 73.6 - width: 646 - height: 418.2 + x: 1201 + y: 73 + width: 896 + height: 908 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -337,7 +387,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 646, y: 397.2} + m_TargetSize: {x: 896, y: 887} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -352,10 +402,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -258.4 - m_HBaseRangeMax: 258.4 - m_VBaseRangeMin: -158.88 - m_VBaseRangeMax: 158.88 + m_HBaseRangeMin: -448 + m_HBaseRangeMax: 448 + m_VBaseRangeMin: -443.5 + m_VBaseRangeMax: 443.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -373,29 +423,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 646 - height: 397.2 - m_Scale: {x: 1.1919038, y: 1.1919038} - m_Translation: {x: 323, y: 198.6} + width: 896 + height: 887 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 448, y: 443.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -270.99503 - y: -166.62419 - width: 541.99005 - height: 333.24838 + x: -448 + y: -443.5 + width: 896 + height: 887 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 807.5, y: 522.75} + m_LastWindowPixelSize: {x: 896, y: 908} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &14 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -411,14 +461,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 73.6 - width: 193.4 - height: 418.2 + y: 73 + width: 386 + height: 908 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -426,25 +476,25 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 3e6b0000 - m_LastClickedID: 27454 - m_ExpandedIDs: 34e3ffff40e3ffff446b0000826b0000886b0000966b0000986b00009a6b0000 + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: b0eefeffb2eefeffb4eefeffb6eefeff22b8ffff6ec4ffff m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: M92 + m_OriginalName: M92 m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: -69966 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 8} + m_ClientGUIView: {fileID: 10} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -452,7 +502,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &15 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -468,7 +518,7 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Animator - m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 @@ -533,7 +583,7 @@ MonoBehaviour: m_CurrentEditor: 0 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &16 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -549,14 +599,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 194.40001 - y: 73.6 - width: 407.6 - height: 418.2 + x: 387 + y: 73 + width: 812 + height: 908 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -567,7 +617,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: -100, y: -26} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: -1, y: 0} snapCorner: 3 id: Tool Settings index: 0 @@ -600,7 +650,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: unity-search-toolbar index: 1 @@ -633,7 +683,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Light Settings index: 0 @@ -655,7 +705,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Cloth Constraints index: 2 @@ -666,7 +716,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Cloth Collisions index: 3 @@ -677,7 +727,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Navmesh Display index: 4 @@ -688,7 +738,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Agent Display index: 5 @@ -699,7 +749,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Obstacle Display index: 6 @@ -710,7 +760,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Occlusion Culling index: 7 @@ -721,7 +771,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Physics Debugger index: 8 @@ -732,7 +782,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Scene Visibility index: 9 @@ -743,7 +793,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 24.8} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Particles index: 10 @@ -752,7 +802,7 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 1 + displayed: 0 snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -761,17 +811,17 @@ MonoBehaviour: layout: 4 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 0 - m_OverrideSceneCullingMask: 0 - m_SceneIsLit: 0 + m_OverrideSceneCullingMask: 6917529027641081856 + m_SceneIsLit: 1 m_SceneLighting: 1 m_2DMode: 0 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.1277141, y: 3.8030603, z: -0.017456843} + m_Target: {x: 13.712709, y: 3.5867922, z: 8.880598} speed: 2 - m_Value: {x: 10.9051895, y: 3.3461263, z: 8.300079} + m_Value: {x: 13.712709, y: 3.5867922, z: 8.880598} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -783,7 +833,7 @@ MonoBehaviour: m_SceneViewState: m_AlwaysRefresh: 0 showFog: 1 - showSkybox: 0 + showSkybox: 1 showFlares: 1 showImageEffects: 1 showParticleSystems: 1 @@ -818,13 +868,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.057347883, y: 0.942116, z: -0.24952282, w: -0.21652032} + m_Target: {x: -0.014974507, y: 0.9828559, z: -0.1585104, w: -0.09286305} speed: 2 - m_Value: {x: 0.14027107, y: -0.802565, z: 0.20790805, w: 0.5412835} + m_Value: {x: -0.014974664, y: 0.9828662, z: -0.15851207, w: -0.09286403} m_Size: - m_Target: 0.45841318 + m_Target: 0.20931786 speed: 2 - m_Value: 0.48001382 + m_Value: 0.20931786 m_Ortho: m_Target: 0 speed: 2 @@ -849,7 +899,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &17 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -865,14 +915,14 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 x: 0 - y: 512.8 - width: 1251 - height: 270.8 + y: 1002 + width: 1398 + height: 357 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -896,16 +946,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets + - Assets/Prefabs/Player m_LastFoldersGridSize: -1 - m_LastProjectPath: D:\.Downloads\Programming\Unity\Projects\Rheinmetall\3dshooter\3d-shooter + m_LastProjectPath: C:\.Downloads\Unity\Projects\defrain m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} m_SelectedIDs: 04ca9a3b m_LastClickedID: 1000000004 - m_ExpandedIDs: 0000000086640000886400008a6400008c6400008e64000000ca9a3b + m_ExpandedIDs: 00000000d8960000da960000dc960000f4960000f896000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -921,7 +971,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 13} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -933,7 +983,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000086640000886400008a6400008c6400008e640000 + m_ExpandedIDs: 00000000d8960000da960000dc960000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -977,7 +1027,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 13} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -989,7 +1039,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &18 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1005,19 +1055,19 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console - m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 512.8 - width: 1251 - height: 270.8 + x: 1399 + y: 1002 + width: 698 + height: 357 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &19 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1033,14 +1083,14 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Inspector - m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1252 - y: 73.6 - width: 283 - height: 710 + x: 2099 + y: 73 + width: 460 + height: 1286 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default