mirror of
https://github.com/boudji-ludwig-pett/cnam-geometry-dash.git
synced 2024-12-18 21:44:51 +01:00
feat: able to jump on obstacle
This commit is contained in:
parent
1b7912893f
commit
d188120ef7
@ -5069,6 +5069,7 @@ GameObject:
|
|||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 874939978}
|
- component: {fileID: 874939978}
|
||||||
- component: {fileID: 874939979}
|
- component: {fileID: 874939979}
|
||||||
|
- component: {fileID: 874939980}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: ObstacleSafe
|
m_Name: ObstacleSafe
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@ -5121,7 +5122,7 @@ BoxCollider2D:
|
|||||||
m_CallbackLayers:
|
m_CallbackLayers:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Bits: 4294967295
|
m_Bits: 4294967295
|
||||||
m_IsTrigger: 0
|
m_IsTrigger: 1
|
||||||
m_UsedByEffector: 0
|
m_UsedByEffector: 0
|
||||||
m_CompositeOperation: 0
|
m_CompositeOperation: 0
|
||||||
m_CompositeOrder: 0
|
m_CompositeOrder: 0
|
||||||
@ -5137,6 +5138,20 @@ BoxCollider2D:
|
|||||||
m_AutoTiling: 0
|
m_AutoTiling: 0
|
||||||
m_Size: {x: 5.068964, y: 5.1134825}
|
m_Size: {x: 5.068964, y: 5.1134825}
|
||||||
m_EdgeRadius: 0
|
m_EdgeRadius: 0
|
||||||
|
--- !u!114 &874939980
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 874939977}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 982954923c829c546bed40ee7f6b946a, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
playerScript: {fileID: 0}
|
||||||
|
playerObject: {fileID: 1267397455}
|
||||||
--- !u!1 &1009490386
|
--- !u!1 &1009490386
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -5495,6 +5510,7 @@ MonoBehaviour:
|
|||||||
initialPosition: {x: 0, y: 0, z: 0}
|
initialPosition: {x: 0, y: 0, z: 0}
|
||||||
initialRotation: {x: 0, y: 0, z: 0, w: 0}
|
initialRotation: {x: 0, y: 0, z: 0, w: 0}
|
||||||
particle: {fileID: 725779776}
|
particle: {fileID: 725779776}
|
||||||
|
isColliding: 1
|
||||||
--- !u!61 &1267397460
|
--- !u!61 &1267397460
|
||||||
BoxCollider2D:
|
BoxCollider2D:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -5862,7 +5878,7 @@ GameObject:
|
|||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 1914709940}
|
- component: {fileID: 1914709940}
|
||||||
- component: {fileID: 1914709942}
|
- component: {fileID: 1914709942}
|
||||||
- component: {fileID: 1914709941}
|
- component: {fileID: 1914709943}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: ObstacleKiller
|
m_Name: ObstacleKiller
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@ -5885,20 +5901,6 @@ Transform:
|
|||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1009490389}
|
m_Father: {fileID: 1009490389}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!114 &1914709941
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1914709939}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: e105dbba5bf85a944a8270ed72ebd3d2, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
playerScript: {fileID: 0}
|
|
||||||
playerObject: {fileID: 1267397455}
|
|
||||||
--- !u!61 &1914709942
|
--- !u!61 &1914709942
|
||||||
BoxCollider2D:
|
BoxCollider2D:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -5945,6 +5947,20 @@ BoxCollider2D:
|
|||||||
m_AutoTiling: 0
|
m_AutoTiling: 0
|
||||||
m_Size: {x: 5.0600605, y: 3.5822077}
|
m_Size: {x: 5.0600605, y: 3.5822077}
|
||||||
m_EdgeRadius: 0
|
m_EdgeRadius: 0
|
||||||
|
--- !u!114 &1914709943
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1914709939}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 4ad4baca6c852a00b8bf21afdd5fba8c, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
playerScript: {fileID: 0}
|
||||||
|
playerObject: {fileID: 1267397455}
|
||||||
--- !u!1660057539 &9223372036854775807
|
--- !u!1660057539 &9223372036854775807
|
||||||
SceneRoots:
|
SceneRoots:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: e105dbba5bf85a944a8270ed72ebd3d2
|
|
@ -1,6 +1,6 @@
|
|||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
public class Obstacle : MonoBehaviour
|
public class ObstacleKiller : MonoBehaviour
|
||||||
{
|
{
|
||||||
public PlayerScript playerScript;
|
public PlayerScript playerScript;
|
||||||
public GameObject playerObject;
|
public GameObject playerObject;
|
||||||
@ -19,5 +19,6 @@ public class Obstacle : MonoBehaviour
|
|||||||
{
|
{
|
||||||
playerObject.transform.rotation = playerScript.initialRotation;
|
playerObject.transform.rotation = playerScript.initialRotation;
|
||||||
playerObject.transform.position = playerScript.initialPosition;
|
playerObject.transform.position = playerScript.initialPosition;
|
||||||
|
playerScript.isColliding = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
2
Assets/Scripts/ObstacleKiller.cs.meta
Normal file
2
Assets/Scripts/ObstacleKiller.cs.meta
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 4ad4baca6c852a00b8bf21afdd5fba8c
|
27
Assets/Scripts/ObstacleSafe.cs
Normal file
27
Assets/Scripts/ObstacleSafe.cs
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class ObstacleSafe : MonoBehaviour
|
||||||
|
{
|
||||||
|
public PlayerScript playerScript;
|
||||||
|
public GameObject playerObject;
|
||||||
|
|
||||||
|
public void Start()
|
||||||
|
{
|
||||||
|
playerScript = GameObject.FindGameObjectWithTag("Player").GetComponent<PlayerScript>();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Update()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnCollisionEnter()
|
||||||
|
{
|
||||||
|
playerScript.isColliding = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnCollisionExit()
|
||||||
|
{
|
||||||
|
playerScript.isColliding = false;
|
||||||
|
}
|
||||||
|
}
|
2
Assets/Scripts/ObstacleSafe.cs.meta
Normal file
2
Assets/Scripts/ObstacleSafe.cs.meta
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 982954923c829c546bed40ee7f6b946a
|
@ -11,6 +11,7 @@ public class PlayerScript : MonoBehaviour
|
|||||||
public ParticleSystem particle;
|
public ParticleSystem particle;
|
||||||
|
|
||||||
private bool wantsToJump = false;
|
private bool wantsToJump = false;
|
||||||
|
public bool isColliding = true;
|
||||||
|
|
||||||
public void Start()
|
public void Start()
|
||||||
{
|
{
|
||||||
@ -66,7 +67,8 @@ public class PlayerScript : MonoBehaviour
|
|||||||
|
|
||||||
private bool IsJumping()
|
private bool IsJumping()
|
||||||
{
|
{
|
||||||
return Mathf.Abs(initialPosition.y - transform.position.y) > 0.05f;
|
// return Mathf.Abs(initialPosition.y - transform.position.y) > 0.05f;
|
||||||
|
return !isColliding;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void AlignRotation()
|
private void AlignRotation()
|
||||||
|
@ -19,5 +19,6 @@ public class SpikeScript : MonoBehaviour
|
|||||||
{
|
{
|
||||||
playerObject.transform.rotation = playerScript.initialRotation;
|
playerObject.transform.rotation = playerScript.initialRotation;
|
||||||
playerObject.transform.position = playerScript.initialPosition;
|
playerObject.transform.position = playerScript.initialPosition;
|
||||||
|
playerScript.isColliding = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user