From 4c7900d435876e2a6116285cb1e6e2b16cffbd5d Mon Sep 17 00:00:00 2001 From: Zoe J Date: Tue, 22 Feb 2022 00:17:57 -0600 Subject: [PATCH] hehe forgor to push double jump memes --- Assets/Scene 1 Assets/Movement.cs | 6 +++++ Assets/Scene 1 Assets/PlayerMovement.cs | 4 +-- Assets/Scenes/Benji's Scene.unity | 33 ++++++++++++------------- ProjectSettings/TagManager.asset | 5 +++- UserSettings/EditorUserSettings.asset | 7 ++++-- 5 files changed, 33 insertions(+), 22 deletions(-) diff --git a/Assets/Scene 1 Assets/Movement.cs b/Assets/Scene 1 Assets/Movement.cs index 21f13b3..9b69943 100644 --- a/Assets/Scene 1 Assets/Movement.cs +++ b/Assets/Scene 1 Assets/Movement.cs @@ -21,6 +21,7 @@ public class Movement : MonoBehaviour private bool m_FacingRight = true; // For determining which way the player is currently facing. private Vector3 m_Velocity = Vector3.zero; public static bool pause = false; + private bool dj = false; [Header("Events")] [Space] @@ -135,6 +136,11 @@ public class Movement : MonoBehaviour // Add a vertical force to the player. m_Grounded = false; m_Rigidbody2D.AddForce(new Vector2(0f, m_JumpForce)); + dj = false; + }else if (jump && dj == false){ + m_Grounded = false; + m_Rigidbody2D.AddForce(new Vector2(0f, m_JumpForce)); + dj = true; } } } diff --git a/Assets/Scene 1 Assets/PlayerMovement.cs b/Assets/Scene 1 Assets/PlayerMovement.cs index c4a900f..da4f824 100644 --- a/Assets/Scene 1 Assets/PlayerMovement.cs +++ b/Assets/Scene 1 Assets/PlayerMovement.cs @@ -5,7 +5,7 @@ using UnityEngine; public class PlayerMovement : MonoBehaviour { public Movement controller; - public Animator animator; + //public Animator animator; public float runSpeed = 40f; float horizontalMove = 0f; bool jump = false; @@ -14,7 +14,7 @@ public class PlayerMovement : MonoBehaviour // Update is called once per frame void Update() { // Horizontal value is for the animation state machine. No code required, wow! - animator.SetFloat("Horizontal", Input.GetAxis("Horizontal")); + //animator.SetFloat("Horizontal", Input.GetAxis("Horizontal")); horizontalMove = Input.GetAxisRaw("Horizontal") * runSpeed; diff --git a/Assets/Scenes/Benji's Scene.unity b/Assets/Scenes/Benji's Scene.unity index 1a088e4..d53e05e 100644 --- a/Assets/Scenes/Benji's Scene.unity +++ b/Assets/Scenes/Benji's Scene.unity @@ -147,7 +147,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 15059982} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.73, z: 0} + m_LocalPosition: {x: 0, y: -0.747, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 101316509} @@ -204,7 +204,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: controller: {fileID: 101316514} - animator: {fileID: 1494078893} runSpeed: 40 --- !u!58 &101316511 CircleCollider2D: @@ -235,7 +234,7 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0.06, y: 0.19} + m_Offset: {x: 0.06, y: 0.31} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -246,7 +245,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 0.76, y: 0.63} + m_Size: {x: 0.76, y: 0.85} m_EdgeRadius: 0 --- !u!50 &101316513 Rigidbody2D: @@ -281,13 +280,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 90da90214d3bb324a8ed8f5b046ba4b9, type: 3} m_Name: m_EditorClassIdentifier: - m_JumpForce: 800 + m_JumpForce: 700 m_CrouchSpeed: 0.4 m_MovementSmoothing: 0.05 m_AirControl: 1 m_WhatIsGround: serializedVersion: 2 - m_Bits: 55 + m_Bits: 567 m_GroundCheck: {fileID: 15059983} m_CeilingCheck: {fileID: 838052152} m_CrouchDisableCollider: {fileID: 101316512} @@ -523,7 +522,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 717061314} - m_Layer: 3 + m_Layer: 9 m_Name: Ground Check m_TagString: Untagged m_Icon: {fileID: 0} @@ -538,7 +537,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 717061313} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0.73, z: 0} + m_LocalPosition: {x: 0, y: -0.716, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1641807371} @@ -553,7 +552,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 804516416} - m_Layer: 3 + m_Layer: 9 m_Name: Ceiling Check m_TagString: Untagged m_Icon: {fileID: 0} @@ -568,7 +567,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 804516415} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.64, z: 0} + m_LocalPosition: {x: 0, y: 0.746, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1641807371} @@ -598,7 +597,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 838052151} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.79, z: 0} + m_LocalPosition: {x: 0, y: 0.767, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 101316509} @@ -931,7 +930,7 @@ GameObject: - component: {fileID: 1641807375} - component: {fileID: 1641807374} - component: {fileID: 1641807373} - m_Layer: 3 + m_Layer: 9 m_Name: Char Movement m_TagString: Untagged m_Icon: {fileID: 0} @@ -984,7 +983,7 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0.06, y: 0.19} + m_Offset: {x: 0.06, y: 0.31} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -995,7 +994,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 0.76, y: 0.63} + m_Size: {x: 0.76, y: 0.92} m_EdgeRadius: 0 --- !u!50 &1641807375 Rigidbody2D: @@ -1036,7 +1035,7 @@ MonoBehaviour: m_AirControl: 1 m_WhatIsGround: serializedVersion: 2 - m_Bits: 55 + m_Bits: 63 m_GroundCheck: {fileID: 717061314} m_CeilingCheck: {fileID: 804516416} m_CrouchDisableCollider: {fileID: 1641807374} @@ -1113,7 +1112,7 @@ GameObject: m_Component: - component: {fileID: 2067235194} - component: {fileID: 2067235195} - m_Layer: 3 + m_Layer: 9 m_Name: Fuki m_TagString: Untagged m_Icon: {fileID: 0} @@ -1197,7 +1196,7 @@ GameObject: - component: {fileID: 2105389526} - component: {fileID: 2105389527} - component: {fileID: 2105389528} - m_Layer: 3 + m_Layer: 9 m_Name: Char Art m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index f8e5034..7eb03bf 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -14,7 +14,7 @@ TagManager: - Background - - - - + - Fuki - - - @@ -44,6 +44,9 @@ TagManager: - name: Player layer uniqueID: 1027733709 locked: 0 + - name: Fuki + uniqueID: 1196539433 + locked: 0 - name: UI layer uniqueID: 1458967083 locked: 0 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 4cedf1c..0fe4c46 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -12,10 +12,13 @@ EditorUserSettings: value: 22424703114646680e0b0227036c4b1505032b292926237e38271427fb flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c6c1313191d7b623d28393930 + value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c72111f1958072926337e38271427fb + value: 22424703114646680e0b0227036c6c1313191d7b623d28393930 + flags: 0 + RecentlyUsedScenePath-4: + value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb flags: 0 vcSharedLogLevel: value: 0d5e400f0650