diff --git a/Assets/Prefab/Player/Player.prefab b/Assets/Prefab/Player/Player.prefab index da79ff28f8..0c4b2ed3bb 100644 --- a/Assets/Prefab/Player/Player.prefab +++ b/Assets/Prefab/Player/Player.prefab @@ -13,9 +13,10 @@ GameObject: - component: {fileID: 6900886237888737789} - component: {fileID: 3545855248091886352} - component: {fileID: 753209669686786339} + - component: {fileID: 7654157031224772548} m_Layer: 0 m_Name: Player - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -27,13 +28,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3690047765547104160} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7894923954649684004 SpriteRenderer: @@ -118,6 +119,25 @@ BoxCollider2D: m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 @@ -151,7 +171,29 @@ Rigidbody2D: m_AngularDrag: 0.05 m_GravityScale: 1 m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!114 &7654157031224772548 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3690047765547104160} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e826a9a50ef755f439c762ee643c9cde, type: 3} + m_Name: + m_EditorClassIdentifier: + animator: {fileID: 6900886237888737789} + boxCollider2D: {fileID: 3545855248091886352} + speedi: 8 + jumpvalue: 5 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 5514b0c0e4..0a2e4c586a 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -134,7 +134,7 @@ GameObject: - component: {fileID: 209983666} - component: {fileID: 209983665} - component: {fileID: 209983664} - m_Layer: 0 + m_Layer: 6 m_Name: Platform m_TagString: Untagged m_Icon: {fileID: 0} @@ -253,6 +253,37 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &454495634 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 454495635} + m_Layer: 0 + m_Name: groundcheck + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &454495635 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 454495634} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.018, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1532369090} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &592884322 GameObject: m_ObjectHideFlags: 0 @@ -345,45 +376,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &683299677 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3690047765547104160, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - m_PrefabInstance: {fileID: 1311293295106438672} - m_PrefabAsset: {fileID: 0} ---- !u!95 &683299680 stripped -Animator: - m_CorrespondingSourceObject: {fileID: 6900886237888737789, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - m_PrefabInstance: {fileID: 1311293295106438672} - m_PrefabAsset: {fileID: 0} ---- !u!114 &683299683 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 683299677} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e826a9a50ef755f439c762ee643c9cde, type: 3} - m_Name: - m_EditorClassIdentifier: - animator: {fileID: 683299680} - boxCollider2D: {fileID: 683299685} - spr: {fileID: 683299686} ---- !u!61 &683299685 stripped -BoxCollider2D: - m_CorrespondingSourceObject: {fileID: 3545855248091886352, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - m_PrefabInstance: {fileID: 1311293295106438672} - m_PrefabAsset: {fileID: 0} ---- !u!212 &683299686 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 7894923954649684004, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, - type: 3} - m_PrefabInstance: {fileID: 1311293295106438672} - m_PrefabAsset: {fileID: 0} --- !u!1 &1002215249 GameObject: m_ObjectHideFlags: 0 @@ -395,7 +387,7 @@ GameObject: - component: {fileID: 1002215252} - component: {fileID: 1002215251} - component: {fileID: 1002215250} - m_Layer: 0 + m_Layer: 6 m_Name: Platform (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -525,7 +517,7 @@ GameObject: - component: {fileID: 1220312027} - component: {fileID: 1220312026} - component: {fileID: 1220312025} - m_Layer: 0 + m_Layer: 6 m_Name: Platform (4) m_TagString: Untagged m_Icon: {fileID: 0} @@ -644,6 +636,12 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1532369090 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + m_PrefabInstance: {fileID: 1311293295106438672} + m_PrefabAsset: {fileID: 0} --- !u!1 &1722809266 GameObject: m_ObjectHideFlags: 0 @@ -655,7 +653,7 @@ GameObject: - component: {fileID: 1722809269} - component: {fileID: 1722809268} - component: {fileID: 1722809267} - m_Layer: 0 + m_Layer: 6 m_Name: Platform (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -785,7 +783,7 @@ GameObject: - component: {fileID: 1876400615} - component: {fileID: 1876400614} - component: {fileID: 1876400613} - m_Layer: 0 + m_Layer: 6 m_Name: Platform (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -912,10 +910,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + - target: {fileID: 753209669686786339, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, type: 3} - propertyPath: m_RootOrder - value: 1 + propertyPath: m_Constraints + value: 4 objectReference: {fileID: 0} - target: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, type: 3} @@ -972,34 +970,39 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} - - target: {fileID: 3690047765547104160, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + - target: {fileID: 7654157031224772548, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, type: 3} - propertyPath: m_TagString - value: Player + propertyPath: speedi + value: 5 objectReference: {fileID: 0} - - target: {fileID: 7894923954649684004, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + - target: {fileID: 7654157031224772548, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, type: 3} - propertyPath: m_Color.b - value: 1 + propertyPath: jumpvalue + value: 20 objectReference: {fileID: 0} - - target: {fileID: 7894923954649684004, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + - target: {fileID: 7654157031224772548, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, type: 3} - propertyPath: m_Color.g - value: 1 + propertyPath: groundcheck + value: + objectReference: {fileID: 454495635} + - target: {fileID: 7654157031224772548, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + type: 3} + propertyPath: layers.m_Bits + value: 64 objectReference: {fileID: 0} - - target: {fileID: 7894923954649684004, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + - target: {fileID: 7654157031224772548, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, type: 3} - propertyPath: m_Color.r - value: 1 + propertyPath: groundcheckradius + value: 0.4 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3690047765547104160, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1201430245866775938, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, type: 3} insertIndex: -1 - addedObject: {fileID: 683299683} + addedObject: {fileID: 454495635} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fa869cb8a7d0b1b46b0bcf76fc18d070, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: diff --git a/Assets/Scripts/playerController.cs b/Assets/Scripts/playerController.cs index c0c45bedd9..690ce68150 100644 --- a/Assets/Scripts/playerController.cs +++ b/Assets/Scripts/playerController.cs @@ -1,39 +1,54 @@ +using System; +using UnityEditor; using UnityEngine; public class PlayerController : MonoBehaviour { [SerializeField] private Animator animator; [SerializeField] private BoxCollider2D boxCollider2D; - [SerializeField] private SpriteRenderer spr; - + private Vector2 initialBoxSize; private Vector2 initialBoxOffset; +public int speedi; +public int jumpvalue; - private Color colore; - - - - +private bool isJumptrue; +public Transform groundcheck; +public LayerMask layers; +public float groundcheckradius; void Start() { - initialBoxSize = boxCollider2D.size; + initialBoxSize = boxCollider2D.size; initialBoxOffset = boxCollider2D.offset; - colore = spr.color; + } private void Update() { - if (Input.GetKey(KeyCode.Q)){ - spr.color=Color.blue; - } - else { -spr.color=colore; - } - float horizontalInput = Input.GetAxisRaw("Horizontal"); - float verticalInput = Input.GetAxis("Vertical"); - PlayJumpAnimation( verticalInput ); +isJumptrue = Physics2D.OverlapCircle(groundcheck.position,groundcheckradius,layers); - animator.SetFloat("Speed", Mathf.Abs(horizontalInput)); + float horizontalInput = Input.GetAxisRaw("Horizontal"); + float verticalInput = Input.GetAxisRaw("Jump"); + playAnimation(horizontalInput,verticalInput); + Movecharachter(horizontalInput,verticalInput); + + + } + + private void Movecharachter(float horizontalInput , float verticalInput){ + Vector3 position = transform.position; + position.x = position.x + horizontalInput*speedi*Time.deltaTime; + transform.position = position; + if (verticalInput>0 && isJumptrue){ + Vector3 posit = transform.position; + position.y = position.y + verticalInput*jumpvalue*Time.deltaTime; + transform.position = posit; + } + } + + private void playAnimation(float horizontalInput,float verticalInput) +{ + animator.SetFloat("Speed", Mathf.Abs(horizontalInput)); Vector3 scale = transform.localScale; @@ -47,17 +62,23 @@ private void Update() } transform.localScale = scale; - if (Input.GetKey(KeyCode.LeftControl)) - { - - Crouch(true); + + if (verticalInput>0 && isJumptrue){ + animator.SetBool("IsJump",true); } - else - { - Crouch(false); + else{ + animator.SetBool("IsJump",false); } - } + if (Input.GetKey(KeyCode.LeftControl)){ + animator.SetBool("IsCrouch",true); + Crouch(true); + } + else{ + animator.SetBool("IsCrouch",false); + Crouch(false); + } +} public void Crouch(bool crouch) { @@ -81,13 +102,6 @@ public void Crouch(bool crouch) } } - public void PlayJumpAnimation( float vertical ) - { - if ( vertical > 0 ) - { - animator.SetTrigger( "IsJump" ); - } - } } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1c92a7840e..588a62ec23 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -11,7 +11,7 @@ TagManager: - - Water - UI - - + - Ground - - - diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index fdb173c5f9..9f4ecd9264 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,38 +19,12 @@ MonoBehaviour: width: 1920 height: 997 m_ShowMode: 4 - m_Title: Scene - m_RootView: {fileID: 7} - m_MinSize: {x: 875, y: 300} + m_Title: Game + m_RootView: {fileID: 6} + m_MinSize: {x: 875, y: 321} 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: AnimatorControllerTool - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 148 - y: 0 - width: 613 - height: 561 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 14} - m_Panes: - - {fileID: 14} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -63,19 +37,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 4} + - {fileID: 9} + - {fileID: 3} m_Position: serializedVersion: 2 x: 0 y: 30 width: 1920 height: 947 - m_MinSize: {x: 400, y: 100} - m_MaxSize: {x: 32384, y: 16192} + m_MinSize: {x: 503, y: 271} + m_MaxSize: {x: 16192, y: 12117} vertical: 0 - controlID: 146 ---- !u!114 &4 + controlID: 37 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -90,18 +64,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1414 + x: 1466 y: 0 - width: 506 + width: 454 height: 947 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 16} + - {fileID: 13} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &5 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -118,16 +92,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 148 + width: 363 height: 561 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 17} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &6 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -144,18 +118,17 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 561 - width: 1414 + width: 1466 height: 386 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 12} m_Panes: - - {fileID: 15} - - {fileID: 20} - - {fileID: 13} + - {fileID: 12} + - {fileID: 17} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &7 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -168,9 +141,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: + - {fileID: 7} + - {fileID: 2} - {fileID: 8} - - {fileID: 3} - - {fileID: 9} m_Position: serializedVersion: 2 x: 0 @@ -183,7 +156,7 @@ MonoBehaviour: m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &8 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -205,7 +178,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &9 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -226,7 +199,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &10 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -239,19 +212,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 11} - - {fileID: 6} + - {fileID: 10} + - {fileID: 5} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1414 + width: 1466 height: 947 - m_MinSize: {x: 300, y: 100} - m_MaxSize: {x: 24288, y: 16192} + m_MinSize: {x: 403, y: 271} + m_MaxSize: {x: 8096, y: 12117} vertical: 1 - controlID: 93 ---- !u!114 &11 + controlID: 38 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -264,20 +237,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 5} - - {fileID: 2} - - {fileID: 12} + - {fileID: 4} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1414 + width: 1466 height: 561 - m_MinSize: {x: 300, y: 50} - m_MaxSize: {x: 24288, y: 8096} + m_MinSize: {x: 403, y: 221} + m_MaxSize: {x: 8003, y: 4021} vertical: 0 - controlID: 82 ---- !u!114 &12 + controlID: 39 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -292,130 +264,19 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 761 + x: 363 y: 0 - width: 653 + width: 1103 height: 561 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 18} - - {fileID: 19} + - {fileID: 15} + - {fileID: 16} 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: 12071, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animation - m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 634 - width: 1590 - height: 365 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_LockTracker: - m_IsLocked: 0 - m_LastSelectedObjectID: 23682 ---- !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: 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: -1673928668082335149, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 148 - y: 73 - width: 611 - height: 540 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_ViewTransforms: - m_KeySerializationHelper: - - {fileID: 6429399273792195453, guid: 437277285a02f484eb5b8128da830b9b, type: 2} - m_ValueSerializationHelper: - - e00: 0.5438201 - e01: 0 - e02: 0 - e03: -70.69658 - e10: 0 - e11: 0.5438201 - e12: 0 - e13: 129.77167 - 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: 437277285a02f484eb5b8128da830b9b, - type: 2} - m_BreadCrumbs: - - m_Target: {fileID: 6429399273792195453, guid: 437277285a02f484eb5b8128da830b9b, - 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 &15 + m_LastSelected: 1 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -438,7 +299,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 634 - width: 1413 + width: 1465 height: 365 m_SerializedDataModeController: m_DataMode: 0 @@ -461,7 +322,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -469,16 +330,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts + - Assets m_LastFoldersGridSize: -1 m_LastProjectPath: D:\OutscalUnityProjects\2D-Platformer-Game\2D-Platformer-Game m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 405d0000 - m_LastClickedID: 23872 - m_ExpandedIDs: 00000000145d000000ca9a3bffffff7f + m_SelectedIDs: bc5c0000 + m_LastClickedID: 23740 + m_ExpandedIDs: 00000000bc5c000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -506,7 +367,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000145d0000 + m_ExpandedIDs: 00000000bc5c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -534,7 +395,7 @@ MonoBehaviour: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000aaa30000 + m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -562,7 +423,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &16 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -583,9 +444,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1414 + x: 1466 y: 73 - width: 505 + width: 453 height: 926 m_SerializedDataModeController: m_DataMode: 0 @@ -610,7 +471,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &17 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -633,7 +494,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 147 + width: 362 height: 540 m_SerializedDataModeController: m_DataMode: 0 @@ -648,9 +509,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 14060000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 66f9ffff + m_ExpandedIDs: 26fbffff28fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -666,7 +527,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 4} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -674,7 +535,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &18 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -695,9 +556,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 761 + x: 363 y: 73 - width: 651 + width: 1101 height: 540 m_SerializedDataModeController: m_DataMode: 0 @@ -999,9 +860,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -109, y: -98} + snapOffset: {x: 48, y: 48} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 3 + snapCorner: 0 id: AINavigationOverlay index: 9 layout: 4 @@ -1031,9 +892,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.24167925, y: 1.8756015, z: 0.12633026} + m_Target: {x: 1.3375491, y: -0.08291626, z: 0.12999192} speed: 2 - m_Value: {x: -0.24167925, y: 1.8756015, z: 0.12633026} + m_Value: {x: 1.3375491, y: -0.08291626, z: 0.12999192} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1083,9 +944,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 3.120153 + m_Target: 2.7413297 speed: 2 - m_Value: 3.120153 + m_Value: 2.7413297 m_Ortho: m_Target: 1 speed: 2 @@ -1110,7 +971,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &19 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1131,10 +992,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 763 - y: 81 - width: 645 - height: 531 + x: 363 + y: 73 + width: 1101 + height: 540 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1151,7 +1012,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 645, y: 510} + m_TargetSize: {x: 1101, y: 519} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -1166,10 +1027,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -322.5 - m_HBaseRangeMax: 322.5 - m_VBaseRangeMin: -255 - m_VBaseRangeMax: 255 + m_HBaseRangeMin: -550.5 + m_HBaseRangeMax: 550.5 + m_VBaseRangeMin: -259.5 + m_VBaseRangeMax: 259.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -1187,29 +1048,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 645 - height: 510 - m_Scale: {x: 1.304773, y: 1.304773} - m_Translation: {x: 312.3187, y: 275.6497} + width: 1101 + height: 519 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 550.5, y: 259.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -239.36632 - y: -211.26257 - width: 494.33887 - height: 390.8726 + x: -550.5 + y: -259.5 + width: 1101 + height: 519 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 645, y: 531} + m_LastWindowPixelSize: {x: 1101, y: 540} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &20 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1230,10 +1091,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 8 - y: 633 - width: 1401 - height: 358 + x: 2249 + y: 726.5 + width: 920 + height: 250 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0