From 0fc8c6e08ce04c0372126ddda6602a6402f3d758 Mon Sep 17 00:00:00 2001 From: Noah4ever <66632359+Noah4ever@users.noreply.github.com> Date: Mon, 13 Dec 2021 21:52:38 +0100 Subject: [PATCH] Distance to grenade explosion camera shake if you are close to the grenade you get more camera shake --- Assets/Prefabs/Player/Player.prefab | 100 +++++- Assets/Scenes/TestScene.unity | 14 +- .../Player/ProcedualAnimationController.cs | 50 ++- Assets/Scripts/Weapons/Grenade.cs | 2 +- .../Layouts/CurrentMaximizeLayout.dwlt | 268 ++++++++++------- UserSettings/Layouts/default-2021.dwlt | 284 +++++++++--------- 6 files changed, 435 insertions(+), 283 deletions(-) diff --git a/Assets/Prefabs/Player/Player.prefab b/Assets/Prefabs/Player/Player.prefab index 761556f..49225c2 100644 --- a/Assets/Prefabs/Player/Player.prefab +++ b/Assets/Prefabs/Player/Player.prefab @@ -529,26 +529,104 @@ MonoBehaviour: cameraShakeActive: 1 objectToMove: {fileID: 6272346181657429395} cameraShakeDuration: 1 - cameraShakeCurve: + nearDistance: 8 + nearCameraShakeCurve: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: -0.4614612 - value: 0.028004631 - inSlope: -0.015037956 - outSlope: -0.015037956 + time: 0.025429735 + value: 0.19971195 + inSlope: -0.030253958 + outSlope: -0.030253958 tangentMode: 0 weightedMode: 0 inWeight: 0 - outWeight: 0.28070113 + outWeight: 0.24073574 - serializedVersion: 3 - time: 1.4633081 - value: -0.037871435 - inSlope: -0.011502813 - outSlope: -0.011502813 + time: 0.49595714 + value: 0.049771994 + inSlope: -0.14560473 + outSlope: -0.14560473 tangentMode: 0 weightedMode: 0 - inWeight: 0.23245634 + inWeight: 0.33333334 + outWeight: 0.294024 + - serializedVersion: 3 + time: 1.0253906 + value: -0.004508972 + inSlope: -0.10252651 + outSlope: -0.10252651 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + mediumDistance: 20 + mediumCameraShakeCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: -0.0071792603 + value: 0.09154791 + inSlope: -0.12938052 + outSlope: -0.12938052 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.46580023 + value: 0.030353572 + inSlope: -0.067838416 + outSlope: -0.067838416 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.27531913 + - serializedVersion: 3 + time: 0.9916687 + value: 0.009421289 + inSlope: -0.03980517 + outSlope: -0.03980517 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + farDistance: 32 + farCameraShakeCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: -0.0015304685 + value: 0.033563316 + inSlope: -0.05884709 + outSlope: -0.05884709 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.48366547 + value: 0.0050109476 + inSlope: -0.02547526 + outSlope: -0.02547526 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.5573828 + - serializedVersion: 3 + time: 1.0192597 + value: -0.000051796436 + inSlope: -0.009452574 + outSlope: -0.009452574 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScene.unity index 9497ade..d278d4e 100644 --- a/Assets/Scenes/TestScene.unity +++ b/Assets/Scenes/TestScene.unity @@ -760,7 +760,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9082234699677627348, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: explosionForce - value: 600 + value: 1000 objectReference: {fileID: 0} - target: {fileID: 9082234699677627348, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: explodeParticle @@ -768,7 +768,7 @@ PrefabInstance: objectReference: {fileID: 842071826} - target: {fileID: 9082234699677627348, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: cameraShakeRadius - value: 200 + value: 50 objectReference: {fileID: 0} - target: {fileID: 9082234699677627348, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: lengthOfExplosion @@ -2557,7 +2557,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9082234699677627348, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: explosionForce - value: 600 + value: 850 objectReference: {fileID: 0} - target: {fileID: 9082234699677627348, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: explodeParticle @@ -2569,7 +2569,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9082234699677627348, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: cameraShakeRadius - value: 200 + value: 50 objectReference: {fileID: 0} - target: {fileID: 9082234699677627348, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: lengthOfExplosion @@ -4257,7 +4257,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -8.740173, y: 68.40698} + m_AnchoredPosition: {x: -8.740234, y: 68.40698} m_SizeDelta: {x: 182.68939, y: 68.40671} m_Pivot: {x: 1, y: 1} --- !u!114 &1430445133 @@ -5690,7 +5690,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9082234699677627348, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: explosionForce - value: 600 + value: 900 objectReference: {fileID: 0} - target: {fileID: 9082234699677627348, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: explodeParticle @@ -5698,7 +5698,7 @@ PrefabInstance: objectReference: {fileID: 842071826} - target: {fileID: 9082234699677627348, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: cameraShakeRadius - value: 200 + value: 50 objectReference: {fileID: 0} - target: {fileID: 9082234699677627348, guid: bd217f9f85ce78e46a925776562625e8, type: 3} propertyPath: lengthOfExplosion diff --git a/Assets/Scripts/Player/ProcedualAnimationController.cs b/Assets/Scripts/Player/ProcedualAnimationController.cs index 064461c..2cd2b0b 100644 --- a/Assets/Scripts/Player/ProcedualAnimationController.cs +++ b/Assets/Scripts/Player/ProcedualAnimationController.cs @@ -105,7 +105,13 @@ public class ProcedualAnimationController : NetworkBehaviour [SerializeField] bool cameraShakeActive = true; [SerializeField] Camera objectToMove; [SerializeField] float cameraShakeDuration = 1f; - [SerializeField] AnimationCurve cameraShakeCurve; + [SerializeField] int nearDistance = 5; + [SerializeField] AnimationCurve nearCameraShakeCurve; + [SerializeField] int mediumDistance = 15; + [SerializeField] AnimationCurve mediumCameraShakeCurve; + [SerializeField] int farDistance = 25; + [SerializeField] AnimationCurve farCameraShakeCurve; + private AnimationCurve cameraShakeCurve; Vector3[] positionMod = new Vector3[4]; public Quaternion[] rotationMod = new Quaternion[4]; @@ -113,26 +119,44 @@ public class ProcedualAnimationController : NetworkBehaviour public Transform GunRightHandREF { get => gunRightHandREF; set => gunRightHandREF = value; } public Transform GunLeftHandREF { get => gunLeftHandREF; set => gunLeftHandREF = value; } - public void cameraShake() { + public void cameraShake(float distance) { // If camera shake is not disabled if (cameraShakeActive) { // Start coroutine that shakes the camera - StartCoroutine(shaking()); + StartCoroutine(shaking(distance)); } } - private IEnumerator shaking() { + private IEnumerator shaking(float distance) { float elapsedTime = 0f; - while (elapsedTime < cameraShakeDuration) { - // Time increment - elapsedTime += Time.deltaTime; - // Getting strength value from curve at current time - float strength = cameraShakeCurve.Evaluate(elapsedTime / cameraShakeDuration); - // Move object - objectToMove.transform.localPosition = objectToMove.transform.localPosition + Random.insideUnitSphere * strength; - // Wait - yield return new WaitForSeconds(Time.deltaTime); + bool cameraShake = true; + // Getting right camera shake curve + if(distance < nearDistance) { + cameraShakeCurve = nearCameraShakeCurve; // high camera shake + Debug.Log("NEAR EXPLOSION: " + distance); + } else if(distance < mediumDistance){ + cameraShakeCurve = mediumCameraShakeCurve; // medium camera shake + Debug.Log("MEDIUM EXPLOSION: " + distance); + } else if(distance < farDistance) { + cameraShakeCurve = farCameraShakeCurve; // little camera shake + Debug.Log("FAR EXPLOSION: " + distance); + } else { // If distance is even further than far then no camera shake + cameraShake = false; } + + if (cameraShake) { + while (elapsedTime < cameraShakeDuration) { + // Time increment + elapsedTime += Time.deltaTime; + // Getting strength value from curve at current time + float strength = cameraShakeCurve.Evaluate(elapsedTime / cameraShakeDuration); + // Move object + objectToMove.transform.localPosition = objectToMove.transform.localPosition + Random.insideUnitSphere * strength; + // Wait + yield return new WaitForSeconds(Time.deltaTime); + } + } + yield return null; } diff --git a/Assets/Scripts/Weapons/Grenade.cs b/Assets/Scripts/Weapons/Grenade.cs index ebed2c2..705c323 100644 --- a/Assets/Scripts/Weapons/Grenade.cs +++ b/Assets/Scripts/Weapons/Grenade.cs @@ -66,7 +66,7 @@ public class Grenade : MonoBehaviour if (nearbyObject.GetComponent() && nearbyObject.GetType() != typeof(UnityEngine.CharacterController)) { // Starts camera shake on player float distance = Vector3.Distance(transform.position, nearbyObject.transform.position); - nearbyObject.GetComponent().cameraShake(); + nearbyObject.GetComponent().cameraShake(distance); } } yield return null; diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 0db15c8..bf66562 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -14,17 +14,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 3} - - {fileID: 14} + - {fileID: 16} m_Position: serializedVersion: 2 x: 0 y: 30 - width: 1536 - height: 731 + width: 2560 + height: 1307 m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 96 + controlID: 11769 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -41,14 +41,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: 496 - y: 73.6 - width: 754 - height: 418.2 + x: 1201 + y: 73 + width: 896 + height: 908 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -59,7 +59,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 754, y: 397.2} + m_TargetSize: {x: 896, y: 887} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -74,10 +74,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -301.6 - m_HBaseRangeMax: 301.6 - 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 @@ -95,23 +95,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 754 - height: 397.2 - m_Scale: {x: 1.1919038, y: 1.1919038} - m_Translation: {x: 377, 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: -316.3007 - y: -166.62419 - width: 632.6014 - height: 333.24838 + x: -448 + y: -443.5 + width: 896 + height: 887 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 942.5, y: 522.75} + m_LastWindowPixelSize: {x: 896, y: 908} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -136,12 +136,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1252 - height: 731 + width: 2099 + height: 1307 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 97 + controlID: 11770 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -162,12 +162,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1252 - height: 439.2 + width: 2099 + height: 929 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 98 + controlID: 11771 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -185,8 +185,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 194.4 - height: 439.2 + width: 230 + height: 929 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 6} @@ -210,14 +210,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: 229 + height: 908 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -227,7 +227,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 2afbffff + m_ExpandedIDs: ccf9ffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -266,12 +266,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 194.4 + x: 230 y: 0 - width: 301.6 - height: 439.2 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + width: 971 + height: 929 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 9} m_Panes: - {fileID: 8} @@ -294,7 +294,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 @@ -375,14 +375,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: 299.6 - height: 418.2 + x: 230 + y: 73 + width: 969 + height: 908 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -393,7 +393,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 @@ -447,7 +447,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -112.000015, y: 86} + snapOffset: {x: -112, y: 86} snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: Orientation @@ -595,9 +595,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 12.512918, y: 0.016688704, z: -0.825264} + m_Target: {x: -47.67771, y: -22.28258, z: -42.074715} speed: 2 - m_Value: {x: 12.512918, y: 0.016688704, z: -0.825264} + m_Value: {x: -47.67771, y: -22.28258, z: -42.074715} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -607,7 +607,7 @@ MonoBehaviour: m_DoValidateTrueMetals: 0 m_ExposureSliderValue: 0 m_SceneViewState: - m_AlwaysRefresh: 0 + m_AlwaysRefresh: 1 showFog: 1 showSkybox: 1 showFlares: 1 @@ -644,13 +644,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.07891053, y: -0.9205256, z: 0.25329545, w: -0.28690428} + m_Target: {x: 0.072064266, y: -0.88201773, z: 0.14362824, w: 0.44292492} speed: 2 - m_Value: {x: -0.07890789, y: -0.9204949, z: 0.253287, w: -0.2868947} + m_Value: {x: 0.0720657, y: -0.8820353, z: 0.1436311, w: 0.44293377} m_Size: - m_Target: 3.2342763 + m_Target: 45.54132 speed: 2 - m_Value: 3.2342763 + m_Value: 45.54132 m_Ortho: m_Target: 0 speed: 2 @@ -690,18 +690,43 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 496 + x: 1201 y: 0 - width: 756 - height: 439.2 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 898 + height: 929 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} m_Panes: - {fileID: 2} m_Selected: 0 m_LastSelected: 0 --- !u!114 &11 +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: 12} + - {fileID: 14} + 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: 11699 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -711,24 +736,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: 439.2 - width: 1252 - height: 291.8 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} + y: 0 + width: 1201 + height: 378 + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} m_ActualView: {fileID: 13} m_Panes: - - {fileID: 12} - {fileID: 13} - m_Selected: 1 + m_Selected: 0 m_LastSelected: 0 ---- !u!114 &12 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -744,21 +768,22 @@ 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: 7.2000003 - y: 510.4 - width: 1119 - height: 265 + x: 0 + y: 1002 + width: 1200 + height: 357 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] m_SearchFilter: m_NameFilter: - m_ClassNames: [] + m_ClassNames: + - Prefab m_AssetLabels: [] m_AssetBundleNames: [] m_VersionControlStates: [] @@ -768,23 +793,22 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 - m_Folders: - - Assets + m_Folders: [] m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets + - Assets/Scripts/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: 79} - m_SelectedIDs: d8960000 - m_LastClickedID: 38616 - m_ExpandedIDs: 0000000086640000886400008a6400008c6400008e640000 + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 04ca9a3b + m_LastClickedID: 1000000004 + m_ExpandedIDs: 00000000d2760000d4760000d676000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -800,7 +824,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 12} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -812,7 +836,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000086640000886400008a6400008c6400008e640000 + m_ExpandedIDs: 00000000d2760000d4760000d676000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -837,10 +861,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: 4e700000 + m_LastClickedInstanceID: 28750 m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000866c00009e60000036650000 + m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000866c00009e6000003665000060600000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -856,7 +880,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 12} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -868,7 +892,33 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &13 +--- !u!114 &14 +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: 1201 + y: 0 + width: 898 + height: 378 + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -884,19 +934,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: 1201 + y: 1002 + width: 896 + height: 357 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &14 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -911,18 +961,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: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 15} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &15 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -938,14 +988,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 @@ -956,7 +1006,7 @@ MonoBehaviour: m_CachedPref: 151 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 + m_LastInspectedObjectInstanceID: 28750 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index d486f8b..bc977e9 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,63 +19,12 @@ MonoBehaviour: width: 2560 height: 1357 m_ShowMode: 4 - m_Title: Hierarchy - m_RootView: {fileID: 4} + m_Title: Game + m_RootView: {fileID: 2} 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: 1201 - y: 0 - width: 898 - 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: 19 ---- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -88,9 +37,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: + - {fileID: 3} - {fileID: 5} - - {fileID: 7} - - {fileID: 6} + - {fileID: 4} m_Position: serializedVersion: 2 x: 0 @@ -103,7 +52,7 @@ MonoBehaviour: m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &5 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -125,7 +74,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &6 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -146,6 +95,56 @@ MonoBehaviour: 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: 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: 12157 +--- !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: 2099 + height: 1307 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} + vertical: 1 + controlID: 12158 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -160,58 +159,8 @@ 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: 68 ---- !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: 3} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 2099 - height: 1307 - m_MinSize: {x: 300, y: 200} - m_MaxSize: {x: 24288, y: 16192} - vertical: 1 - controlID: 69 ---- !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 @@ -221,8 +170,8 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 70 ---- !u!114 &10 + controlID: 12159 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -239,16 +188,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 387 + width: 230 height: 929 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &11 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -263,9 +212,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 387 + x: 230 y: 0 - width: 814 + width: 971 height: 929 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -275,7 +224,7 @@ MonoBehaviour: - {fileID: 18} m_Selected: 1 m_LastSelected: 0 ---- !u!114 &12 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -301,7 +250,32 @@ MonoBehaviour: - {fileID: 15} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &13 +--- !u!114 &11 +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: 12} + - {fileID: 13} + 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: 12102 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -327,6 +301,32 @@ MonoBehaviour: - {fileID: 19} m_Selected: 0 m_LastSelected: 0 +--- !u!114 &13 +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: 1201 + y: 0 + width: 898 + height: 378 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 20} + m_Panes: + - {fileID: 20} + m_Selected: 0 + m_LastSelected: 0 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -467,7 +467,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 386 + width: 229 height: 908 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -476,9 +476,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: baf8ffff626e0000 + m_SelectedIDs: 4e700000 + m_LastClickedID: 28750 + m_ExpandedIDs: ccf9ffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -494,7 +494,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 8} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -603,9 +603,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 387 + x: 230 y: 73 - width: 812 + width: 969 height: 908 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -819,9 +819,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -12.053026, y: -11.197028, z: 16.747131} + m_Target: {x: -47.67771, y: -22.28258, z: -42.074715} speed: 2 - m_Value: {x: -12.053026, y: -11.197028, z: 16.747131} + m_Value: {x: -47.67771, y: -22.28258, z: -42.074715} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -868,13 +868,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.21545985, y: 0.40536174, z: -0.09897586, w: -0.8828191} + m_Target: {x: 0.072064266, y: -0.88201773, z: 0.14362824, w: 0.44292492} speed: 2 - m_Value: {x: -0.21546988, y: 0.4053806, z: -0.098980464, w: -0.88286024} + m_Value: {x: 0.0720657, y: -0.8820353, z: 0.1436311, w: 0.44293377} m_Size: - m_Target: 14.948143 + m_Target: 45.54132 speed: 2 - m_Value: 14.948143 + m_Value: 45.54132 m_Ortho: m_Target: 0 speed: 2 @@ -929,7 +929,8 @@ MonoBehaviour: m_SaveData: [] m_SearchFilter: m_NameFilter: - m_ClassNames: [] + m_ClassNames: + - Prefab m_AssetLabels: [] m_AssetBundleNames: [] m_VersionControlStates: [] @@ -939,23 +940,22 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 - m_Folders: - - Assets/Scripts + m_Folders: [] m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts + - Assets/Scripts/Player m_LastFoldersGridSize: -1 m_LastProjectPath: C:\.Downloads\Unity\Projects\defrain m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 31} - m_SelectedIDs: 20760000 - m_LastClickedID: 30240 - m_ExpandedIDs: 00000000fa750000fc750000fe7500002076000000ca9a3b + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 04ca9a3b + m_LastClickedID: 1000000004 + m_ExpandedIDs: 00000000d2760000d4760000d676000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -971,7 +971,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 13} + m_ClientGUIView: {fileID: 12} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -983,7 +983,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000fa750000fc750000fe750000 + m_ExpandedIDs: 00000000d2760000d4760000d676000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1010,7 +1010,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000866c00009e6000003665000060600000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1027,7 +1027,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 13} + m_ClientGUIView: {fileID: 12} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0