diff --git a/Assets/Objects/Weapons/M9/M9 Animation Controller.controller b/Assets/Objects/Weapons/M9/M9 Animation Controller.controller index 1a67fd3..1ad4ddd 100644 --- a/Assets/Objects/Weapons/M9/M9 Animation Controller.controller +++ b/Assets/Objects/Weapons/M9/M9 Animation Controller.controller @@ -68,13 +68,13 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: ShootSpeed m_Type: 1 m_DefaultFloat: 1 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -127,9 +127,9 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.1 + m_TransitionDuration: 0.03 m_TransitionOffset: 0 - m_ExitTime: 0.9 + m_ExitTime: 0.96 m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 diff --git a/Assets/Prefabs/Player/Player Animation Test.prefab b/Assets/Prefabs/Player/Player Animation Test.prefab index 3cf621c..c21cefe 100644 --- a/Assets/Prefabs/Player/Player Animation Test.prefab +++ b/Assets/Prefabs/Player/Player Animation Test.prefab @@ -319,6 +319,37 @@ Transform: m_Father: {fileID: 4058555163434875561} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0} +--- !u!1 &2992488853448454767 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1468248131875751636} + m_Layer: 0 + m_Name: GunAimPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1468248131875751636 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2992488853448454767} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.5} + m_LocalScale: {x: 1, y: 1, z: 1} + 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 @@ -558,6 +589,7 @@ GameObject: - component: {fileID: 8957579265169979397} - component: {fileID: 3965891812990671158} - component: {fileID: 4276885029697240453} + - component: {fileID: 7198056240135858432} m_Layer: 0 m_Name: Player Animation Test m_TagString: Player @@ -912,6 +944,24 @@ MonoBehaviour: returnForce: 0.006 impulsForce: 0.025 maxRecoil: 0.1 +--- !u!114 &7198056240135858432 +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: 916f2d37f60a91149bbca3280a1b69ec, type: 3} + m_Name: + m_EditorClassIdentifier: + aimSpeed: 0.03 + aimVal: 1 + gun: {fileID: 6522444664664986769} + AimPoint: {fileID: 2992488853448454767} + HoldPoint: {fileID: 8043317747957554736} + isAiming: 0 --- !u!1 &6272346181657429393 GameObject: m_ObjectHideFlags: 0 @@ -945,6 +995,7 @@ Transform: - {fileID: 5021921342190399731} - {fileID: 4074665071222326704} - {fileID: 1979435770070801855} + - {fileID: 1468248131875751636} m_Father: {fileID: 981273033772084037} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1045,7 +1096,7 @@ GameObject: - component: {fileID: 4074665071222326704} - component: {fileID: 909517976577723968} m_Layer: 0 - m_Name: GunHoldPoint + m_Name: GunHolster m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1059,7 +1110,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6522444664664986769} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.005, z: 0.5} + m_LocalPosition: {x: 0, y: 0, z: 0.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1245,7 +1296,7 @@ GameObject: m_Component: - component: {fileID: 1979435770070801855} m_Layer: 0 - m_Name: GunHolsterPoint + m_Name: GunHoldPoint m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1259,7 +1310,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8043317747957554736} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.0500001, z: 0} + m_LocalPosition: {x: 0.134, y: -0.115, z: 0.397} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scripts/Player/AimDownSights.cs b/Assets/Scripts/Player/AimDownSights.cs new file mode 100644 index 0000000..f197c4f --- /dev/null +++ b/Assets/Scripts/Player/AimDownSights.cs @@ -0,0 +1,35 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class AimDownSights : MonoBehaviour +{ + [SerializeField] float aimSpeed = 0.01f; + [SerializeField][Range(0,1)] float aimVal = 0; + [SerializeField] private GameObject gun; + [SerializeField] GameObject AimPoint; + [SerializeField] GameObject HoldPoint; + public bool isAiming = false; + bool ADS() + { + + return true; + } + private void Update() + { + Debug.Log(Input.GetButton("Aim")); + if (Input.GetButton("Aim")) + { + isAiming = true; + aimVal += aimSpeed; + } + else + { + isAiming = false; + aimVal -= aimSpeed; + } + aimVal = Mathf.Clamp(aimVal,0,1); + + gun.transform.position = Vector3.Lerp(HoldPoint.transform.position, AimPoint.transform.position, aimVal); + } +} diff --git a/Assets/Scripts/Player/AimDownSights.cs.meta b/Assets/Scripts/Player/AimDownSights.cs.meta new file mode 100644 index 0000000..6277c4c --- /dev/null +++ b/Assets/Scripts/Player/AimDownSights.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 916f2d37f60a91149bbca3280a1b69ec +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index eb72a3c..caa14a6 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -14,15 +14,15 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 3} - - {fileID: 13} + - {fileID: 14} m_Position: serializedVersion: 2 x: 0 y: 30 width: 1536 - height: 730.8 - m_MinSize: {x: 300, y: 200} - m_MaxSize: {x: 24288, y: 16192} + height: 731 + m_MinSize: {x: 400, y: 200} + m_MaxSize: {x: 32384, y: 16192} vertical: 0 controlID: -1 --- !u!114 &2 @@ -45,10 +45,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 492 + x: 880 y: 73.6 - width: 678 - height: 449.4 + width: 289.19995 + height: 450.2 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: 678, y: 428.4} + m_TargetSize: {x: 289.19995, y: 429.2} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -74,10 +74,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -271.2 - m_HBaseRangeMax: 271.2 - m_VBaseRangeMin: -171.36 - m_VBaseRangeMax: 171.36 + m_HBaseRangeMin: -115.679985 + m_HBaseRangeMax: 115.679985 + m_VBaseRangeMin: -171.68001 + m_VBaseRangeMax: 171.68001 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -95,23 +95,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 678 - height: 428.4 + width: 289.19995 + height: 429.2 m_Scale: {x: 1.1592739, y: 1.1592739} - m_Translation: {x: 339, y: 214.2} + m_Translation: {x: 144.59998, y: 214.6} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -292.42444 - y: -184.77083 - width: 584.8489 - height: 369.54166 + x: -124.73323 + y: -185.11589 + width: 249.46646 + height: 370.23178 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 847.5, y: 561.75} + m_LastWindowPixelSize: {x: 361.49994, y: 562.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -131,15 +131,15 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 4} - - {fileID: 10} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1172 - height: 730.8 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 16192, y: 16192} + width: 1171.2 + height: 731 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} vertical: 1 controlID: -1 --- !u!114 &4 @@ -157,14 +157,15 @@ MonoBehaviour: m_Children: - {fileID: 5} - {fileID: 7} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1172 - height: 470.4 - m_MinSize: {x: 200, y: 100} - m_MaxSize: {x: 16192, y: 8096} + width: 1171.2 + height: 471.2 + m_MinSize: {x: 300, y: 100} + m_MaxSize: {x: 24288, y: 8096} vertical: 0 controlID: -1 --- !u!114 &5 @@ -184,10 +185,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 492 - height: 470.4 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + width: 297.6 + height: 471.2 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 6} m_Panes: - {fileID: 6} @@ -215,8 +216,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 491 - height: 449.4 + width: 296.6 + height: 450.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -224,9 +225,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 9211f9ff - m_LastClickedID: -454254 - m_ExpandedIDs: 9211f9ff4212f9ffbc22f9ff5c27f9ff0c28f9ff822cf9ff322df9ff2a84f9ffde85f9ff2889f9ff2897f9ff009cf9ffa69cf9ffdaa4f9ff80a5f9ff4841faffc244faffb850faffbe50faffec50faff9c51faff1e56faffb856faffc856faffd456faffda56faff0857faffb857faffc4b6faffcab6fafff8b6faffa8b7fafffe24fbff0425fbff3225fbffe225fbff141dfcff421dfcfff21dfcff0678fcff1a78fcff2078fcff4e78fcfffe78fcff0082fcff0682fcff3482fcffe482fcffd4c2fcffdac2fcff08c3fcffb8c3fcff0050fdff2e50fdffde50fdff96ddfdff9cddfdffcaddfdff7adefdff92e3fdff98e3fdffc6e3fdff76e4fdffda01feffe001feff0e02feffbe02feff7a0dfeff800dfeffae0dfeff5e0efeffae18feffb418feffe218feff9219feffa22dfefff23ffeff0640feff0c40feff3a40feffea40feffb8a4feffbea4feffeca4feff9ca5feff660bffff7a0bffff800bffffac0bffff540fffff680fffff6e0fffff9a0fffffd842ffffec42fffff242ffff1e43ffff4c58ffff6058ffff6658ffff9258ffff6876ffff7c76ffff8276ffffae76ffff8cceffff96ceffff9aceffffc6ceffff7ef2ffff84f2ffffe0f3ffffe4f3ffffeef3fffff2f3ffff1ef4ffffdcfaffffeafaffffeefaffff1afbffff2afbfffff4ffffff + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 740affffa018ffff5019ffffdc1efffffe55ffff0456ffff1456ffff2056ffff2656ffff5656ffff0657ffff9265ffff9865ffffa865ffffb465ffffba65ffffea65ffff9a66ffff7e88ffff8488ffffb488ffff6489ffffa48dffff548effff3af4ffff40f4ffff50f4ffff5cf4ffff62f4ffff90f4ffff40f5ffffa6f7ffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -260,23 +261,22 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: AnimatorControllerTool m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 492 + x: 297.6 y: 0 - width: 680 - height: 470.4 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 2} + width: 582.4 + height: 471.2 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 8} m_Panes: - {fileID: 8} - {fileID: 9} - - {fileID: 2} - m_Selected: 2 + m_Selected: 0 m_LastSelected: 1 --- !u!114 &8 MonoBehaviour: @@ -298,10 +298,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 492 + x: 297.6 y: 73.6 - width: 345.2 - height: 449.4 + width: 580.4 + height: 450.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -309,32 +309,15 @@ MonoBehaviour: m_ViewTransforms: m_KeySerializationHelper: - {fileID: 7614406280852874800, guid: daf332133edb41440a3abb1cf6e24558, type: 2} - - {fileID: -29801462378204144, guid: bcfd120671431f84097ebc1045370f76, type: 2} m_ValueSerializationHelper: - - e00: 0.9123797 + - e00: 0.43999997 e01: 0 e02: 0 - e03: -256.30267 + e03: -7 e10: 0 - e11: 0.9123797 + e11: 0.43999997 e12: 0 - e13: 77.84196 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.5589181 - e01: 0 - e02: 0 - e03: -28.54406 - e10: 0 - e11: 0.5589181 - e12: 0 - e13: 174.21025 + e13: 142.02002 e20: 0 e21: 0 e22: 1 @@ -379,10 +362,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 492 + x: 297.6 y: 73.6 - width: 678 - height: 449.4 + width: 580.4 + height: 450.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -426,7 +409,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 @@ -447,9 +430,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -140.5, y: 86} + snapOffset: {x: 67.5, y: 86} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 1 + snapCorner: 0 id: Orientation index: 0 layout: 4 @@ -459,7 +442,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 @@ -481,7 +464,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 @@ -492,7 +475,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 @@ -503,7 +486,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 @@ -514,7 +497,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 @@ -525,7 +508,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 @@ -536,7 +519,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 @@ -547,7 +530,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 @@ -558,7 +541,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 @@ -569,7 +552,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 @@ -578,7 +561,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 @@ -595,9 +578,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.49072248, y: 7.6249065, z: 1.8747175} + m_Target: {x: -0.56465197, y: 2.0329852, z: -0.022925854} speed: 2 - m_Value: {x: 0.49072248, y: 7.6249065, z: 1.8747175} + m_Value: {x: -0.56465197, y: 2.0329852, z: -0.022925854} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -644,13 +627,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.02317691, y: 0.96904457, z: -0.09976932, w: 0.22486019} + m_Target: {x: 0.035058174, y: 0.9545344, z: -0.124399066, w: 0.2688129} speed: 2 - m_Value: {x: 0.023175744, y: 0.9689958, z: -0.099764295, w: 0.22484888} + m_Value: {x: 0.035056416, y: 0.9544865, z: -0.12439282, w: 0.2687994} m_Size: - m_Target: 1.7877662 + m_Target: 1.0003884 speed: 2 - m_Value: 1.7877662 + m_Value: 1.0003884 m_Ortho: m_Target: 1 speed: 2 @@ -676,6 +659,32 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 --- !u!114 &10 +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: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 880 + y: 0 + width: 291.19995 + height: 471.2 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + 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} @@ -691,18 +700,18 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 470.4 - width: 1172 - height: 260.4 + y: 471.2 + width: 1171.2 + height: 259.8 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 11} + m_ActualView: {fileID: 12} m_Panes: - - {fileID: 11} - {fileID: 12} + - {fileID: 13} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &11 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -723,9 +732,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 544 - width: 1171 - height: 239.4 + y: 544.8 + width: 1170.2 + height: 238.79999 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -755,10 +764,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 120} - m_SelectedIDs: 6a670000 - m_LastClickedID: 26474 - m_ExpandedIDs: 000000004e62000050620000606200006262000000ca9a3bffffff7f + scrollPos: {x: 0, y: 101.20001} + m_SelectedIDs: 2a690000 + m_LastClickedID: 26922 + m_ExpandedIDs: 00000000c4640000c6640000c8640000dc640000de640000e264000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -774,7 +783,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 11} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -786,7 +795,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000004e620000506200006062000000ca9a3bffffff7f + m_ExpandedIDs: 00000000c4640000c6640000c864000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -811,10 +820,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 9211f9ff - m_LastClickedInstanceID: -454254 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000825f0000205f0000 + m_ExpandedInstanceIDs: c623000030660000986f0000d65e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -830,7 +839,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 11} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -842,7 +851,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &12 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -863,14 +872,14 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 544 - width: 1171 - height: 239.4 + y: 544.8 + width: 1170.2 + height: 238.79999 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &13 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -885,18 +894,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1172 + x: 1171.2 y: 0 - width: 364 - height: 730.8 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} + width: 364.80005 + height: 731 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 14} + - {fileID: 15} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &14 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -916,10 +925,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1172 + x: 1171.2001 y: 73.6 - width: 363 - height: 709.8 + width: 363.80005 + height: 710 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -931,7 +940,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 1399.2 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: