diff --git a/Assets/Input/Player.cs b/Assets/Input/Player.cs index ccb1e9a..c60e850 100644 --- a/Assets/Input/Player.cs +++ b/Assets/Input/Player.cs @@ -46,6 +46,15 @@ namespace Input ""processors"": """", ""interactions"": """", ""initialStateCheck"": false + }, + { + ""name"": ""Interact"", + ""type"": ""Button"", + ""id"": ""a0a57f7b-062d-458c-a85a-d6030c412835"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false } ], ""bindings"": [ @@ -136,6 +145,28 @@ namespace Input ""action"": ""Jump"", ""isComposite"": false, ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""4eb9a209-b978-4daf-927a-2f013348d294"", + ""path"": ""/z"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""KeyBoard"", + ""action"": ""Interact"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""c2dc0361-1191-4641-97e6-d105f64ee7ff"", + ""path"": ""/buttonEast"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Controller"", + ""action"": ""Interact"", + ""isComposite"": false, + ""isPartOfComposite"": false } ] } @@ -169,6 +200,7 @@ namespace Input m_PlayerControl = asset.FindActionMap("PlayerControl", throwIfNotFound: true); m_PlayerControl_Move = m_PlayerControl.FindAction("Move", throwIfNotFound: true); m_PlayerControl_Jump = m_PlayerControl.FindAction("Jump", throwIfNotFound: true); + m_PlayerControl_Interact = m_PlayerControl.FindAction("Interact", throwIfNotFound: true); } public void Dispose() @@ -230,12 +262,14 @@ namespace Input private IPlayerControlActions m_PlayerControlActionsCallbackInterface; private readonly InputAction m_PlayerControl_Move; private readonly InputAction m_PlayerControl_Jump; + private readonly InputAction m_PlayerControl_Interact; public struct PlayerControlActions { private @PlayerInput m_Wrapper; public PlayerControlActions(@PlayerInput wrapper) { m_Wrapper = wrapper; } public InputAction @Move => m_Wrapper.m_PlayerControl_Move; public InputAction @Jump => m_Wrapper.m_PlayerControl_Jump; + public InputAction @Interact => m_Wrapper.m_PlayerControl_Interact; public InputActionMap Get() { return m_Wrapper.m_PlayerControl; } public void Enable() { Get().Enable(); } public void Disable() { Get().Disable(); } @@ -251,6 +285,9 @@ namespace Input @Jump.started -= m_Wrapper.m_PlayerControlActionsCallbackInterface.OnJump; @Jump.performed -= m_Wrapper.m_PlayerControlActionsCallbackInterface.OnJump; @Jump.canceled -= m_Wrapper.m_PlayerControlActionsCallbackInterface.OnJump; + @Interact.started -= m_Wrapper.m_PlayerControlActionsCallbackInterface.OnInteract; + @Interact.performed -= m_Wrapper.m_PlayerControlActionsCallbackInterface.OnInteract; + @Interact.canceled -= m_Wrapper.m_PlayerControlActionsCallbackInterface.OnInteract; } m_Wrapper.m_PlayerControlActionsCallbackInterface = instance; if (instance != null) @@ -261,6 +298,9 @@ namespace Input @Jump.started += instance.OnJump; @Jump.performed += instance.OnJump; @Jump.canceled += instance.OnJump; + @Interact.started += instance.OnInteract; + @Interact.performed += instance.OnInteract; + @Interact.canceled += instance.OnInteract; } } } @@ -287,6 +327,7 @@ namespace Input { void OnMove(InputAction.CallbackContext context); void OnJump(InputAction.CallbackContext context); + void OnInteract(InputAction.CallbackContext context); } } } diff --git a/Assets/Input/Player.inputactions b/Assets/Input/Player.inputactions index f2f2c11..296afb3 100644 --- a/Assets/Input/Player.inputactions +++ b/Assets/Input/Player.inputactions @@ -22,6 +22,15 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "Interact", + "type": "Button", + "id": "a0a57f7b-062d-458c-a85a-d6030c412835", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -112,6 +121,28 @@ "action": "Jump", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "4eb9a209-b978-4daf-927a-2f013348d294", + "path": "/z", + "interactions": "", + "processors": "", + "groups": "KeyBoard", + "action": "Interact", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c2dc0361-1191-4641-97e6-d105f64ee7ff", + "path": "/buttonEast", + "interactions": "", + "processors": "", + "groups": "Controller", + "action": "Interact", + "isComposite": false, + "isPartOfComposite": false } ] } diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index a2a3651..2d2905b 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -2,10 +2,11 @@ using System; using Movement; using UnityEngine; using UnityEngine.InputSystem; +using PlayerInput = Input.PlayerInput; namespace Player { - public class PlayerController : MonoBehaviour, IMovement, Input.PlayerInput.IPlayerControlActions + public class PlayerController : MonoBehaviour, IMovement, PlayerInput.IPlayerControlActions { private const float DefaultJumpForce = 9.81f; private const float DefaultMass = 80.0f; @@ -23,18 +24,19 @@ namespace Player private bool _isOnAir; private float _xAxisValue; + private PlayerInput.IPlayerControlActions _playerControlActionsImplementation; private void Awake() { - this._playerRigidbody2D = gameObject.GetComponent(); - this._playerGroundTrigger = GameObject.Find("PlayerGroundTrigger").GetComponent(); - this._playerSpriteRenderer = gameObject.GetComponent(); + _playerRigidbody2D = gameObject.GetComponent(); + _playerGroundTrigger = GameObject.Find("PlayerGroundTrigger").GetComponent(); + _playerSpriteRenderer = gameObject.GetComponent(); } private void Start() { - this._playerRigidbody2D.gravityScale = GravityScale; - this._playerRigidbody2D.mass = DefaultMass; + _playerRigidbody2D.gravityScale = GravityScale; + _playerRigidbody2D.mass = DefaultMass; BaseSpeed = DefaultSpeed; } @@ -42,7 +44,7 @@ namespace Player { if (_controls == null) { - _controls = new Input.PlayerInput(); + _controls = new PlayerInput(); _controls.PlayerControl.SetCallbacks(this); } @@ -72,11 +74,13 @@ namespace Player public void Pause() { IsPaused = true; + _playerRigidbody2D.simulated = IsPaused; } public void Resume() { IsPaused = false; + _playerRigidbody2D.simulated = IsPaused; } // MOVE METHODS @@ -134,5 +138,10 @@ namespace Player break; } } + + public void OnInteract(InputAction.CallbackContext context) + { + throw new NotImplementedException(); + } } } \ No newline at end of file diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 16ee60a..daa06bb 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,10 +9,10 @@ EditorUserSettings: value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 flags: 0 RecentlyUsedSceneGuid-1: - value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d + value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e flags: 0 RecentlyUsedSceneGuid-2: - value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e + value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d flags: 0 vcSharedLogLevel: value: 0d5e400f0650 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 072b8e2..eb2cb49 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -25,7 +25,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 22277 + controlID: 280 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -142,7 +142,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 22229 + controlID: 246 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -202,7 +202,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: c0b0ffff40e6ffff8af0ffff0efbffff + m_ExpandedIDs: 62f9ffff0cfbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -294,7 +294,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Prefabs + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 0 @@ -308,7 +308,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: dc3c0000 m_LastClickedID: 15580 - m_ExpandedIDs: ffffffff00000000f2620000f4620000f6620000ae6300001464000016640000b27d00002483000050830000dc920000 + m_ExpandedIDs: ffffffff00000000826300008463000086630000886300008a6300008c6300008e630000906300009263000094630000e0630000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -334,9 +334,9 @@ MonoBehaviour: m_ResourceFile: m_AssetTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 40e6ffff + m_SelectedIDs: 10f9ffff m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000f2620000f4620000f6620000ae6300001464000016640000b27d00002483000050830000dc920000 + m_ExpandedIDs: ffffffff00000000826300008463000086630000886300008a6300008c6300008e630000906300009263000094630000e0630000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -361,8 +361,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 40e6ffff - m_LastClickedInstanceID: -6592 + m_SelectedInstanceIDs: 10f9ffff + m_LastClickedInstanceID: -1776 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000d03c0000 m_RenameOverlay: @@ -444,7 +444,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 22278 + controlID: 281 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -718,9 +718,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -4.399658, y: -0.4491718, z: -0.021942846} + m_Target: {x: 3.328073, y: 0.08547431, z: -0.07027102} speed: 2 - m_Value: {x: -4.399658, y: -0.4491718, z: -0.021942846} + m_Value: {x: 3.328073, y: 0.08547431, z: -0.07027102} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -771,9 +771,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 0.62474537 + m_Target: 6.6387906 speed: 2 - m_Value: 0.62474537 + m_Value: 6.6387906 m_Ortho: m_Target: 1 speed: 2 @@ -817,8 +817,8 @@ MonoBehaviour: y: 399.2 width: 880 height: 331.59998 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} m_Panes: - {fileID: 2} @@ -843,8 +843,8 @@ MonoBehaviour: y: 0 width: 352 height: 730.8 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -884,7 +884,7 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -6592 + m_LastInspectedObjectInstanceID: -1776 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 8696116..593fa08 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -20,62 +20,11 @@ MonoBehaviour: height: 780.8 m_ShowMode: 4 m_Title: Scene - m_RootView: {fileID: 4} - m_MinSize: {x: 875, y: 300} + m_RootView: {fileID: 2} + m_MinSize: {x: 875, y: 371} 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: 0 - y: 514.4 - width: 879.19995 - height: 216.39996 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 16} - m_Panes: - - {fileID: 16} - 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: 11} - - {fileID: 2} - m_Position: - serializedVersion: 2 - x: 304 - y: 0 - width: 879.19995 - height: 730.8 - m_MinSize: {x: 100, y: 200} - m_MaxSize: {x: 8096, y: 16192} - vertical: 1 - controlID: 85 ---- !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} @@ -124,8 +73,8 @@ MonoBehaviour: height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: ---- !u!114 &6 + m_LastLoadedLayoutName: Main +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -146,7 +95,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &7 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -159,8 +108,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 8} - - {fileID: 3} + - {fileID: 6} + - {fileID: 9} - {fileID: 12} m_Position: serializedVersion: 2 @@ -171,8 +120,8 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 84 ---- !u!114 &8 + controlID: 22822 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -185,8 +134,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - - {fileID: 10} + - {fileID: 7} + - {fileID: 8} m_Position: serializedVersion: 2 x: 0 @@ -196,8 +145,8 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 57 ---- !u!114 &9 + controlID: 22852 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -223,7 +172,7 @@ MonoBehaviour: - {fileID: 14} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &10 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -247,9 +196,35 @@ MonoBehaviour: m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} + - {fileID: 16} m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &11 + m_LastSelected: 1 +--- !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: 0 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 10} + - {fileID: 11} + m_Position: + serializedVersion: 2 + x: 304 + y: 0 + width: 880 + height: 730.8 + m_MinSize: {x: 100, y: 200} + m_MaxSize: {x: 8096, y: 16192} + vertical: 1 + controlID: 22823 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -266,16 +241,41 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 879.19995 - height: 514.4 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + width: 880 + height: 399.2 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} + 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: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 399.2 + width: 880 + height: 331.59998 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 13} + m_Panes: - {fileID: 13} m_Selected: 0 - m_LastSelected: 1 + m_LastSelected: 0 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -291,9 +291,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1183.2 + x: 1184 y: 0 - width: 352.80005 + width: 352 height: 730.8 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -322,10 +322,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 296.80002 - y: 73.6 - width: 918.8 - height: 493.40002 + x: 304 + y: 472.80002 + width: 878 + height: 310.59998 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -372,23 +372,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 918.8 - height: 472.40002 - m_Scale: {x: 0.5467593, y: 0.5467593} - m_Translation: {x: 459.4, y: 236.19998} + width: 878 + height: 289.59998 + m_Scale: {x: 0.3351852, y: 0.33518517} + m_Translation: {x: 439.00003, y: 144.79997} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -840.22345 + x: -1309.7238 y: -431.99994 - width: 1680.4469 + width: 2619.4475 height: 863.99994 m_MinimalGUI: 1 - m_defaultScale: 0.5467593 - m_LastWindowPixelSize: {x: 1148.5, y: 616.75} + m_defaultScale: 0.33518517 + m_LastWindowPixelSize: {x: 1097.5, y: 388.24997} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000100000100 @@ -427,23 +427,23 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0cfbffff + m_ExpandedIDs: c0b0ffff40e6ffff8af0ffff0efbffff m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: PlayerGroundTrigger + m_OriginalName: PlayerGroundTrigger m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: -6764 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 7} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -491,7 +491,8 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 - m_Folders: [] + m_Folders: + - Assets/Prefabs m_Globs: [] m_OriginalText: m_ViewMode: 0 @@ -505,7 +506,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: dc3c0000 m_LastClickedID: 15580 - m_ExpandedIDs: 00000000f8620000fa620000fc620000 + m_ExpandedIDs: ffffffff00000000f2620000f4620000f6620000ae6300001464000016640000b27d00002483000050830000dc920000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -533,7 +534,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000f8620000fa620000fc620000 + m_ExpandedIDs: ffffffff00000000f2620000f4620000f6620000ae6300001464000016640000b27d00002483000050830000dc920000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -549,7 +550,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 8} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -609,10 +610,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 304 - y: 588 - width: 877.19995 - height: 195.39996 + x: 0 + y: 455.2 + width: 303 + height: 328.19998 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -639,8 +640,8 @@ MonoBehaviour: serializedVersion: 2 x: 304 y: 73.6 - width: 877.19995 - height: 493.40002 + width: 878 + height: 378.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -864,9 +865,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.15326892, y: 0.05985144, z: -0.113706104} + m_Target: {x: -4.0644355, y: -0.42835724, z: -0.0249797} speed: 2 - m_Value: {x: 0.007334292, y: 0.0774484, z: -0.1166059} + m_Value: {x: -4.1086316, y: -0.43103167, z: -0.024579894} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -917,9 +918,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 6.153973 + m_Target: 0.9284311 speed: 2 - m_Value: 6.443951 + m_Value: 0.8884508 m_Ortho: m_Target: 1 speed: 2 @@ -964,9 +965,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1183.2001 + x: 1184 y: 73.6 - width: 351.80005 + width: 351 height: 709.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: