From 6e13025624d3dfe1346f4d6642cfbc618d7cdfca Mon Sep 17 00:00:00 2001 From: Noah4ever <66632359+Noah4ever@users.noreply.github.com> Date: Tue, 9 Nov 2021 13:58:34 +0100 Subject: [PATCH] Weapon usw. etc.... --- .../Player/Player Animation Test.prefab | 177 ++++--- Assets/Scenes/TestScene.unity | 4 + Assets/Scripts/Player/Player.cs | 2 +- Assets/Scripts/Weapons/Ammunition.cs | 3 +- Assets/Scripts/Weapons/Shoot.cs | 25 +- Assets/Scripts/Weapons/ShootAnimation.cs | 2 +- .../BurstAotSettings_StandaloneWindows.json | 17 + ProjectSettings/CommonBurstAotSettings.json | 6 + ProjectSettings/EditorBuildSettings.asset | 2 +- UserSettings/Layouts/default-2021.dwlt | 496 +++++++++--------- 10 files changed, 402 insertions(+), 332 deletions(-) create mode 100644 ProjectSettings/BurstAotSettings_StandaloneWindows.json create mode 100644 ProjectSettings/CommonBurstAotSettings.json diff --git a/Assets/Prefabs/Player/Player Animation Test.prefab b/Assets/Prefabs/Player/Player Animation Test.prefab index e02839c..377b036 100644 --- a/Assets/Prefabs/Player/Player Animation Test.prefab +++ b/Assets/Prefabs/Player/Player Animation Test.prefab @@ -348,38 +348,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6272346181657429396} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3649358604728444914 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5021921342190399731} - m_Layer: 0 - m_Name: Muzzle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5021921342190399731 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3649358604728444914} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.274, z: 0.7} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6272346181657429396} - m_RootOrder: 0 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2425026116520232903 MonoBehaviour: @@ -393,6 +362,29 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 48948dfe9d76b07488dacd46a7955fa1, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &6835387909414348198 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3682030003239559187} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c98f5c47a8b7dd64f86fd6f42c4d6e5e, type: 3} + m_Name: + m_EditorClassIdentifier: + weaponKind: 0 + active: 0 + damage: 10 + firerate: 320 + roundsPerShot: 1 + recoilStrength: 15 + currentAmmunition: 16 + magazinSize: 16 + totalAmmunition: 64 + bulletExit: {fileID: 5922641287523208729} + allowAction: 1 --- !u!1 &4824770690127859843 GameObject: m_ObjectHideFlags: 0 @@ -565,6 +557,37 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_renderer: {fileID: 763023871062575730} m_maskType: 0 +--- !u!1 &5922641287523208729 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2695726321628216464} + m_Layer: 0 + m_Name: BulletExitPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2695726321628216464 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5922641287523208729} + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: -0.00191, y: 0, z: 0.000401} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4963590461420153399} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!1 &6272346181302961293 GameObject: m_ObjectHideFlags: 0 @@ -579,17 +602,17 @@ GameObject: - component: {fileID: 320375778840406984} - component: {fileID: -4574526707603160507} - component: {fileID: 7273209952621479910} - - component: {fileID: 4959463831902427506} - component: {fileID: 5630859218361338035} - component: {fileID: 8436279266335313624} - component: {fileID: 268368477457052331} - - component: {fileID: 3781802212159559521} - component: {fileID: 6207632454083444980} - component: {fileID: 1509131218531316230} - component: {fileID: 8957579265169979397} - component: {fileID: 3965891812990671158} - component: {fileID: 4276885029697240453} - component: {fileID: 7198056240135858432} + - component: {fileID: 3208778597385635596} + - component: {fileID: 8473162599388710253} m_Layer: 0 m_Name: Player Animation Test m_TagString: Player @@ -725,22 +748,6 @@ MonoBehaviour: showGizmos: 1 showOverlay: 1 overlayColor: {r: 0, g: 0, b: 0, a: 0.5} ---- !u!114 &4959463831902427506 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6272346181302961293} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 00dc60b61b501f2419e2abd7158be5f8, type: 3} - m_Name: - m_EditorClassIdentifier: - syncMode: 0 - syncInterval: 0.1 - color: {r: 1, g: 0, b: 0, a: 0} - renderer: {fileID: 0} --- !u!114 &5630859218361338035 MonoBehaviour: m_ObjectHideFlags: 0 @@ -807,24 +814,6 @@ MonoBehaviour: Neck: {fileID: 6272346181657429396} gunRotation: {fileID: 0} rotationMultiplier: 0.1 ---- !u!114 &3781802212159559521 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6272346181302961293} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bc5bc2b49bd326e4db460a6a3af59311, type: 3} - m_Name: - m_EditorClassIdentifier: - syncMode: 0 - syncInterval: 0.1 - muzzle: {fileID: 3649358604728444914} - shootAnim: {fileID: 4276885029697240453} - fireRate: 320 - gunHoldPos: {fileID: 3682030003239559187} --- !u!114 &6207632454083444980 MonoBehaviour: m_ObjectHideFlags: 0 @@ -977,6 +966,36 @@ MonoBehaviour: AimPoint: {fileID: 2992488853448454767} HoldPoint: {fileID: 8043317747957554736} isAiming: 0 +--- !u!114 &3208778597385635596 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181302961293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f43c52a1834dcb4bab807bc0cbddec2, type: 3} + m_Name: + m_EditorClassIdentifier: + syncMode: 0 + syncInterval: 0.1 + muzzle: {fileID: 5922641287523208729} + shootAnim: {fileID: 4276885029697240453} + weaponHolder: {fileID: 3682030003239559187} + GunRotation: {fileID: 7768205653369755348} +--- !u!114 &8473162599388710253 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6272346181302961293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 323a821a5fef23a45aa5333ce1f55202, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6272346181657429393 GameObject: m_ObjectHideFlags: 0 @@ -1007,7 +1026,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5021921342190399731} - {fileID: 4074665071222326704} - {fileID: 1979435770070801855} - {fileID: 1468248131875751636} @@ -1132,7 +1150,7 @@ Transform: - {fileID: 6035287771982183217} - {fileID: 3087782655464804516} m_Father: {fileID: 6272346181657429396} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &909517976577723968 MonoBehaviour: @@ -1330,7 +1348,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6272346181657429396} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &4600527171543473474 PrefabInstance: @@ -1403,6 +1421,11 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} m_PrefabInstance: {fileID: 4600527171543473474} m_PrefabAsset: {fileID: 0} +--- !u!4 &4963590461420153399 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8879528566716807029, guid: d1ac7df45c0d7e84993ff57afe3c4d6f, type: 3} + m_PrefabInstance: {fileID: 4600527171543473474} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6305701708507383038 PrefabInstance: m_ObjectHideFlags: 0 @@ -1556,9 +1579,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 01316cb596562384da845bc519fb90de, type: 3} ---- !u!1 &6576156620079053231 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 01316cb596562384da845bc519fb90de, type: 3} +--- !u!4 &5767109144009335573 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} m_PrefabInstance: {fileID: 6305701708507383038} m_PrefabAsset: {fileID: 0} --- !u!4 &8334588817950881727 stripped @@ -1591,8 +1614,8 @@ Transform: m_CorrespondingSourceObject: {fileID: -5815427104119794202, guid: 01316cb596562384da845bc519fb90de, type: 3} m_PrefabInstance: {fileID: 6305701708507383038} m_PrefabAsset: {fileID: 0} ---- !u!4 &5767109144009335573 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 01316cb596562384da845bc519fb90de, type: 3} +--- !u!1 &6576156620079053231 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 01316cb596562384da845bc519fb90de, type: 3} m_PrefabInstance: {fileID: 6305701708507383038} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScene.unity index f3ed9b3..97001a7 100644 --- a/Assets/Scenes/TestScene.unity +++ b/Assets/Scenes/TestScene.unity @@ -303,6 +303,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3094132477016057847, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} + propertyPath: offlineScene + value: Assets/Scenes/TestScene.unity + objectReference: {fileID: 0} - target: {fileID: 3094132477016057847, guid: b62548b3f87093b4dbc561f3dd1abcb8, type: 3} propertyPath: playerPrefab value: diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index a13b3dd..a6f4584 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -70,7 +70,7 @@ public class Player : NetworkBehaviour if (isAlive) { - Debug.Log("yeet" + value); + /*Debug.Log("yeet" + value);*/ health -= value; if (health <= 0) { diff --git a/Assets/Scripts/Weapons/Ammunition.cs b/Assets/Scripts/Weapons/Ammunition.cs index 8a62aa4..1ea43b5 100644 --- a/Assets/Scripts/Weapons/Ammunition.cs +++ b/Assets/Scripts/Weapons/Ammunition.cs @@ -20,8 +20,7 @@ public class Ammunition : MonoBehaviour public bool subtractAmmunition(Weapon weapon) { if (weapon.CurrentAmmunition > 0) { - weapon.CurrentAmmunition -= weapon.RoundsPerShot; - Debug.Log(weapon.CurrentAmmunition + " - " + weapon.RoundsPerShot); + weapon.CurrentAmmunition -= 1; return true; } return false; diff --git a/Assets/Scripts/Weapons/Shoot.cs b/Assets/Scripts/Weapons/Shoot.cs index 1ad249a..d70940f 100644 --- a/Assets/Scripts/Weapons/Shoot.cs +++ b/Assets/Scripts/Weapons/Shoot.cs @@ -7,7 +7,6 @@ public class Shoot : NetworkBehaviour { [SerializeField] GameObject muzzle; [SerializeField] ShootAnimation shootAnim; - [SerializeField] GameObject gunHoldPos; [SerializeField] GameObject weaponHolder; [SerializeField] GameObject GunRotation; @@ -18,9 +17,11 @@ public class Shoot : NetworkBehaviour private Camera mCamera; private Vector3 _pointDirection; private Quaternion _lookRotation; + private Vector3 hitpos; + private RaycastHit hit; + private Ray ray; private void Start() { - if (isLocalPlayer) { mCamera = Camera.main; @@ -31,14 +32,14 @@ public class Shoot : NetworkBehaviour private void Update() { + Debug.Log("Test"); if (isLocalPlayer) { - - if (Input.GetButton("Fire")) + if (Input.GetButtonDown("Fire")) { CmdFireBullet(); } - if (Input.GetButton("Reload")) + if (Input.GetButtonDown("Reload")) { CmdReloadWeapon(); } @@ -59,10 +60,7 @@ public class Shoot : NetworkBehaviour // This code will be executed on the Server. private void CmdFireBullet() { - Debug.Log(mCamera.transform.forward); - Vector3 hitpos; - RaycastHit hit; - Ray ray = new Ray(mCamera.transform.position, mCamera.transform.forward); + ray = new Ray(mCamera.transform.position, mCamera.transform.forward); if(Physics.Raycast(ray, out crosshairHitPoint, 5000f)){ hitpos = crosshairHitPoint.point; @@ -75,14 +73,13 @@ public class Shoot : NetworkBehaviour _lookRotation = Quaternion.LookRotation(_pointDirection); GunRotation.transform.rotation = Quaternion.RotateTowards(GunRotation.transform.rotation, _lookRotation, 1f); - if (weapon.AllowAction) // shooting + if (weapon.AllowAction) { - shootAnimation(); if (Physics.Raycast(muzzle.transform.position, muzzle.transform.forward, out hit) && weapon.CurrentAmmunition > 0) { + shootAnimation(); Debug.DrawLine(muzzle.transform.position, hit.point); - - Debug.Log("Distance: " + hit.distance); + Debug.Log(hit.transform.name); if (hit.transform.gameObject.GetComponent() != null) { Debug.Log("GETROFFEN------------------"); @@ -100,7 +97,7 @@ public class Shoot : NetworkBehaviour [Client] void shootAnimation() { - shootAnim.recoil(gunHoldPos, 0.1f); + shootAnim.recoil(0.1f); } IEnumerator fireRate() { diff --git a/Assets/Scripts/Weapons/ShootAnimation.cs b/Assets/Scripts/Weapons/ShootAnimation.cs index 22cb377..1c414e3 100644 --- a/Assets/Scripts/Weapons/ShootAnimation.cs +++ b/Assets/Scripts/Weapons/ShootAnimation.cs @@ -68,7 +68,7 @@ public class ShootAnimation : MonoBehaviour } - public void recoil(GameObject gun, float force) + public void recoil(float force) { //Play the animation anim.Play("Shoot"); diff --git a/ProjectSettings/BurstAotSettings_StandaloneWindows.json b/ProjectSettings/BurstAotSettings_StandaloneWindows.json new file mode 100644 index 0000000..e02ae33 --- /dev/null +++ b/ProjectSettings/BurstAotSettings_StandaloneWindows.json @@ -0,0 +1,17 @@ +{ + "MonoBehaviour": { + "Version": 4, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "UsePlatformSDKLinker": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "CpuTargetsX32": 6, + "CpuTargetsX64": 72, + "OptimizeFor": 0 + } +} diff --git a/ProjectSettings/CommonBurstAotSettings.json b/ProjectSettings/CommonBurstAotSettings.json new file mode 100644 index 0000000..0293daf --- /dev/null +++ b/ProjectSettings/CommonBurstAotSettings.json @@ -0,0 +1,6 @@ +{ + "MonoBehaviour": { + "Version": 4, + "DisabledWarnings": "" + } +} diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index e1d5e82..6655d79 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,7 +5,7 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 + - enabled: 0 path: Assets/Scenes/TestOfflineScene.unity guid: 20dba395f2cd9824288c340124ce9d6f - enabled: 1 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 3f8bd50..cb757e4 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,12 +19,36 @@ MonoBehaviour: width: 1536 height: 780.8 m_ShowMode: 4 - m_Title: Inspector - m_RootView: {fileID: 2} - m_MinSize: {x: 875, y: 300} + m_Title: Hierarchy + m_RootView: {fileID: 3} + m_MinSize: {x: 875, y: 350} 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: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 6} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1536 + height: 730.8 + m_MinSize: {x: 400, y: 200} + m_MaxSize: {x: 32384, y: 16192} + vertical: 1 + controlID: 76 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -37,22 +61,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 3} - - {fileID: 5} - {fileID: 4} + - {fileID: 2} + - {fileID: 5} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1536 - height: 781 + height: 780.8 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 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -74,7 +98,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &4 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -90,36 +114,11 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 761 + y: 760.8 width: 1536 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: 24963 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -134,17 +133,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 7} - - {fileID: 11} + - {fileID: 13} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1171.2 - height: 731 - m_MinSize: {x: 300, y: 200} - m_MaxSize: {x: 24288, y: 16192} - vertical: 1 - controlID: 24964 + width: 1536 + height: 730.8 + m_MinSize: {x: 400, y: 200} + m_MaxSize: {x: 32384, y: 16192} + vertical: 0 + controlID: 77 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -159,19 +158,44 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 8} - - {fileID: 9} - - {fileID: 10} + - {fileID: 12} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1171.2 - height: 471.2 + width: 1169.6 + height: 730.8 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} + vertical: 1 + controlID: 78 +--- !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: 11} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1169.6 + height: 470.4 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 8096} vertical: 0 - controlID: 24965 ---- !u!114 &8 + controlID: 79 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -188,16 +212,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 297.6 - height: 471.2 + width: 289.6 + height: 470.4 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 14} + - {fileID: 15} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &9 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -212,19 +236,19 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 297.6 + x: 289.6 y: 0 - width: 415.99997 - height: 471.2 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 226.4 + height: 470.4 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 16} m_Panes: - - {fileID: 15} - {fileID: 16} - m_Selected: 1 - m_LastSelected: 1 ---- !u!114 &10 + - {fileID: 17} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -239,18 +263,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 713.6 + x: 516 y: 0 - width: 457.59998 - height: 471.2 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 13} + width: 653.6 + height: 470.4 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 13} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &11 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -260,24 +284,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 471.2 - width: 1171.2 - height: 259.8 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 17} + y: 470.4 + width: 1169.6 + height: 260.4 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 17} - {fileID: 18} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &12 + - {fileID: 19} + m_Selected: 1 + m_LastSelected: 0 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -292,18 +316,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1171.2 + x: 1169.6 y: 0 - width: 364.80005 - height: 731 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 19} + width: 366.40002 + height: 730.8 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 20} m_Panes: - - {fileID: 19} + - {fileID: 20} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &13 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -323,10 +347,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 713.60004 + x: 516 y: 73.6 - width: 455.59998 - height: 450.2 + width: 651.6 + height: 449.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -337,7 +361,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 455.59998, y: 429.2} + m_TargetSize: {x: 651.6, y: 428.4} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -352,10 +376,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -182.23999 - m_HBaseRangeMax: 182.23999 - m_VBaseRangeMin: -171.68001 - m_VBaseRangeMax: 171.68001 + m_HBaseRangeMin: -260.63998 + m_HBaseRangeMax: 260.63998 + m_VBaseRangeMin: -171.36 + m_VBaseRangeMax: 171.36 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -373,29 +397,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 455.59998 - height: 429.2 - m_Scale: {x: 1.1592739, y: 1.1592739} - m_Translation: {x: 227.79999, y: 214.6} + width: 651.6 + height: 428.4 + m_Scale: {x: 1.1592735, y: 1.1592739} + m_Translation: {x: 325.79996, y: 214.2} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -196.5023 - y: -185.11589 - width: 393.0046 - height: 370.23178 + x: -281.03806 + y: -184.77083 + width: 562.0761 + height: 369.54166 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 569.5, y: 562.75} + m_LastWindowPixelSize: {x: 814.5, y: 561.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &14 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -417,8 +441,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 296.6 - height: 450.2 + width: 288.6 + height: 449.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -426,9 +450,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 0ee80000 - m_LastClickedID: 59406 - m_ExpandedIDs: f8c1fcff2ec2fcff32c2fcff36c2fcff56c2fcffd8c2fcfff8e700002ee800004ee8000054e8000060e8000062e8000064e800006ae8000070e80000 + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: fea6ffff56a7ffffeca9fffffab9ffff52baffffdabcffff04bdffff66d5ffffbed5ffff46d8ffff70d8ffffc0f9ffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -444,7 +468,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 8} + m_ClientGUIView: {fileID: 9} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -452,70 +476,6 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &15 -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: 12914, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animator - m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 298.6 - y: 19 - width: 871.6 - height: 450.2 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ViewTransforms: - m_KeySerializationHelper: - - {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2} - m_ValueSerializationHelper: - - e00: 1.0177464 - e01: 0 - e02: 0 - e03: -77.03352 - e10: 0 - e11: 1.0177464 - e12: 0 - e13: 111.43313 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: daf332133edb41440a3abb1cf6e24558, type: 2} - m_BreadCrumbs: - - m_Target: {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2} - m_ScrollPosition: {x: 0, y: 0} - stateMachineGraph: {fileID: 0} - stateMachineGraphGUI: {fileID: 0} - blendTreeGraph: {fileID: 0} - blendTreeGraphGUI: {fileID: 0} - m_AutoLiveLink: 1 - m_MiniTool: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentEditor: 1 - m_LayerEditor: - m_SelectedLayerIndex: 0 --- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 @@ -536,10 +496,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 297.6 + x: 289.6 y: 73.6 - width: 413.99997 - height: 450.2 + width: 224.4 + height: 449.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -560,9 +520,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -141, y: 149} + snapOffset: {x: -141, y: -30.199982} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 1 + snapCorner: 3 id: unity-grid-and-snap-toolbar index: 1 layout: 1 @@ -583,7 +543,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 @@ -604,9 +564,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 67.5, y: 86} + snapOffset: {x: -129.59999, y: -123.20001} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 + snapCorner: 3 id: Orientation index: 0 layout: 4 @@ -616,7 +576,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 @@ -638,7 +598,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 @@ -649,7 +609,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 @@ -660,7 +620,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 @@ -671,7 +631,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 @@ -682,7 +642,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 @@ -693,7 +653,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 @@ -704,7 +664,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 @@ -715,7 +675,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 @@ -726,7 +686,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 @@ -735,7 +695,7 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 1 + displayed: 0 snapOffset: {x: 0, y: 24.8} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -744,17 +704,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.076223016, y: 3.9235106, z: 0.32627058} + m_Target: {x: 10.033674, y: 2.385919, z: 7.089849} speed: 2 - m_Value: {x: -0.56465197, y: 2.0329852, z: -0.022925854} + m_Value: {x: 10.033674, y: 2.385919, z: 7.089849} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -766,7 +726,7 @@ MonoBehaviour: m_SceneViewState: m_AlwaysRefresh: 0 showFog: 1 - showSkybox: 0 + showSkybox: 1 showFlares: 1 showImageEffects: 1 showParticleSystems: 1 @@ -801,20 +761,20 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.06845912, y: -0.65953904, z: 0.06051697, w: 0.74609524} + m_Target: {x: -0.2721618, y: 0.02164445, z: -0.00612234, w: -0.9619917} speed: 2 - m_Value: {x: 0.035056416, y: 0.9544865, z: -0.12439282, w: 0.2687994} + m_Value: {x: -0.272161, y: 0.021644386, z: -0.006122322, w: -0.96198887} m_Size: - m_Target: 0.3056236 + m_Target: 0.9635002 speed: 2 - m_Value: 1.0003884 + m_Value: 0.9635002 m_Ortho: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_CameraSettings: - m_Speed: 1 - m_SpeedNormalized: 0.5 + m_Speed: 0.34082997 + m_SpeedNormalized: 0.16999999 m_SpeedMin: 0.001 m_SpeedMax: 2 m_EasingEnabled: 1 @@ -833,6 +793,70 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 --- !u!114 &17 +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: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 298.6 + y: 19 + width: 578 + height: 450.2 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2} + m_ValueSerializationHelper: + - e00: 0.93576187 + e01: 0 + e02: 0 + e03: -83.14328 + e10: 0 + e11: 0.93576187 + e12: 0 + e13: 81.3544 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: daf332133edb41440a3abb1cf6e24558, type: 2} + m_BreadCrumbs: + - m_Target: {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 0 + m_LayerEditor: + m_SelectedLayerIndex: 0 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -852,10 +876,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 544.8 - width: 1170.2 - height: 238.79999 + x: 0.8 + y: 546.4 + width: 676.6 + height: 236.19998 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -873,38 +897,38 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Prefabs/Player + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Prefabs/Player + - Assets/Scenes 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: 165.20001} - m_SelectedIDs: 2a690000 - m_LastClickedID: 26922 - m_ExpandedIDs: 00000000c4640000c6640000c8640000de64000000ca9a3bffffff7f + scrollPos: {x: 0, y: 205} + m_SelectedIDs: fe640000 + m_LastClickedID: 25854 + m_ExpandedIDs: 000000008a6400008c6400008e64000090640000fc64000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Scripts + m_OriginalName: Scripts m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 25742 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 12} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -916,7 +940,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000c4640000c6640000c864000000ca9a3bffffff7f + m_ExpandedIDs: 000000008a6400008c6400008e64000090640000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -960,7 +984,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 @@ -972,7 +996,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &18 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -993,14 +1017,14 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 544.8 - width: 1170.2 - height: 238.79999 + y: 544 + width: 1168.6 + height: 239.4 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &19 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1020,10 +1044,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1171.2001 + x: 1169.6 y: 73.6 - width: 363.80005 - height: 710 + width: 365.40002 + height: 709.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1031,11 +1055,11 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 160 + m_CachedPref: 151 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 987.6001 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: