diff options
| author | chai <chaifix@163.com> | 2022-01-26 20:42:06 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2022-01-26 20:42:06 +0800 |
| commit | 757c316aeaa6f894b81f56bbe944aa4a85069148 (patch) | |
| tree | 6e04ee3f9f2ee329d102fa058dfd9417d32b43b3 /JamTools/Assets/JamTools/Scripts | |
| parent | 3916a752be8ec99f5a03ba71be2bb3ff7b425b3a (diff) | |
*movement
Diffstat (limited to 'JamTools/Assets/JamTools/Scripts')
44 files changed, 729 insertions, 31 deletions
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController.meta b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController.meta new file mode 100644 index 0000000..0156136 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eeff1ca01f3f28c42aad04772c15f8f2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController.cs b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/FPSCharacterController.cs index f1dd6e2..a5387d2 100644 --- a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController.cs +++ b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/FPSCharacterController.cs @@ -6,24 +6,27 @@ using UnityEngine; namespace JamTools
{
- // ��һ�˳ƽ�ɫ����
- public class FPSCharacterController : MonoBehaviour
- {
+ // ��һ�˳ƽ�ɫ����
+ public class FPSCharacterController : MonoBehaviour
+ {
[Flags]
public enum CharacterModule
{
None,
- LookAround, // �������
- MoveAround, // ˮƽ�����ƶ�
- MoveInAir, // �����ƶ�
- Dodge, // ���
- Rush, // ����
- WalkOnSlope, // б���ƶ�
- WalkOnStairs, // ¥���ƶ�
- WallRun, // �����߱�
- Jump, // ��Ծ
- WallJump, // ������
- Slide, // ����
+ LookAround = 1 << 0, // �������
+ MoveAround = 1 << 1, // ˮƽ�����ƶ�
+ MoveInAir = 1 << 2, // �����ƶ�
+ Dodge = 1 << 3, // ���
+ Rush = 1 << 4, // ����
+ WalkOnSlope = 1 << 5 | 1 << 1, // б���ƶ�
+ WalkOnStairs = 1 << 6 | 1 << 1, // ¥���ƶ�
+ WallRun = 1 << 7, // �����߱�
+ Jump = 1 << 8, // ��Ծ
+ WallJump = 1 << 9, // ������
+ Slide = 1 << 10, // ����
+ Shot = 1 << 11, // ���
+ Step = 1 << 12, // �Ų�
+ PullTrick = 1 << 13,
} [SerializeField] private CharacterModule m_Modules; @@ -31,6 +34,9 @@ namespace JamTools [SerializeField] private Transform m_Eye;
[SerializeField] private GroundChecker m_GroundChecker;
+ [SerializeField] private WallChecker m_WallChecker;
+
+ #region Modules
[Header("Look Around")]
[SerializeField] private float m_LookSensitive = 1000f;
@@ -44,12 +50,18 @@ namespace JamTools [SerializeField] private float m_MoveSpeedInAir = 50f;
[Header("Shot")]
- [SerializeField] private GameObject m_Bullet;
[SerializeField] private Transform m_Muzzle;
+ [SerializeField] private LayerMask m_HittableLayers;
+ [SerializeField] private float m_ShotInfiniteDistance = 100f;
+
+ #endregion
+
+ public Func<RaycastHit, bool> checkHit;
+ public Action<Vector3, Transform> shootTarget;
private Rigidbody m_Rigidbody;
- private bool m_LockCursor = false;
+ private bool m_LockCursor = false;
public bool lockCursor
{
get
@@ -59,7 +71,7 @@ namespace JamTools set
{
m_LockCursor = value;
- if(value)
+ if (value)
{
Cursor.lockState = CursorLockMode.Locked;
}
@@ -104,9 +116,28 @@ namespace JamTools float moveX = Input.GetAxis("Horizontal");
float moveZ = Input.GetAxis("Vertical"); - m_MoveDirection = transform.right * moveX + transform.forward * moveZ;
- m_MoveDirection = m_MoveDirection.normalized;
+ Vector3 right = transform.right;
+ Vector3 forward = transform.forward;
+
+ m_MoveDirection = right * moveX + forward * moveZ;
+ if (IsModuleActive(CharacterModule.WalkOnSlope))
+ {
+ if (m_GroundChecker.isOnGround)
+ {
+ RaycastHit hitInfo;
+ if (Physics.Raycast(m_GroundChecker.foot.position, Vector3.down, out hitInfo))
+ {
+ Vector3 normal = hitInfo.normal;
+ m_MoveDirection = Vector3.ProjectOnPlane(m_MoveDirection, normal);
+ GizmosHandle.Instance.DoGizmos(() => {
+ Gizmos.DrawLine(hitInfo.point + new Vector3(0, 0.1f, 0), hitInfo.point + m_MoveDirection);
+ });
+ }
+ }
+ }
+
+ m_MoveDirection = m_MoveDirection.normalized;
}
void MoveAroundFixedUpdate()
@@ -118,9 +149,11 @@ namespace JamTools return;
float vy = m_Rigidbody.velocity.y;
- Vector3 velocity = new Vector3(m_MoveDirection.x * Time.deltaTime * m_MoveSpeed, vy, m_MoveDirection.z * Time.deltaTime * m_MoveSpeed);
+ Vector3 velocity = new Vector3(m_MoveDirection.x * Time.deltaTime * m_MoveSpeed, vy, m_MoveDirection.z * Time.deltaTime * m_MoveSpeed);
m_Rigidbody.velocity = Vector3.Lerp(m_Rigidbody.velocity, velocity, 0.25f);
+
+ Debug.Log("Move");
}
void MoveInAirUpdate()
@@ -131,6 +164,9 @@ namespace JamTools if (m_GroundChecker.isOnGround)
return;
+ if (m_WallChecker.IsOnWall)
+ return;
+
float moveX = Input.GetAxis("Horizontal");
float moveZ = Input.GetAxis("Vertical"); @@ -149,6 +185,9 @@ namespace JamTools if (m_MoveDirection.magnitude == 0)
return;
+ if (m_WallChecker.IsOnWall)
+ return;
+
float vy = m_Rigidbody.velocity.y;
Vector3 velocity = new Vector3(m_MoveDirection.x * Time.deltaTime * m_MoveSpeedInAir, vy, m_MoveDirection.z * Time.deltaTime * m_MoveSpeedInAir);
@@ -163,7 +202,7 @@ namespace JamTools if (!m_GroundChecker.isOnGround)
return;
- if(Input.GetButtonDown("Jump"))
+ if (Input.GetButtonDown("Jump"))
{
m_Rigidbody.AddForce(Vector3.up * 300, ForceMode.Acceleration);
}
@@ -174,7 +213,7 @@ namespace JamTools if (!IsModuleActive(CharacterModule.Dodge))
return;
- if(Input.GetKeyDown(KeyCode.LeftShift))
+ if (Input.GetKeyDown(KeyCode.LeftShift))
{
m_Rigidbody.AddForce(transform.forward * 5000, ForceMode.Acceleration);
}
@@ -182,12 +221,50 @@ namespace JamTools void Shot()
{
- if(Input.GetButtonDown("Fire1"))
+ if (!IsModuleActive(CharacterModule.Shot))
+ return;
+
+ if (Input.GetButtonDown("Fire1"))
+ {
+ Vector3 hitPoint = GetHitPoint();
+ if (shootTarget != null)
+ shootTarget(hitPoint, m_Muzzle);
+ }
+ }
+
+ Vector3 GetHitPoint()
+ {
+ RaycastHit[] hits = Physics.RaycastAll(m_Eye.position, m_Eye.forward, m_HittableLayers, (int)QueryTriggerInteraction.Ignore);
+ if (hits.Length < 1)
{
- GameObject go = GameObject.Instantiate(m_Bullet);
- go.transform.position = m_Muzzle.position;
- go.GetComponent<Rigidbody>().velocity = m_Muzzle.forward * 100;
+ return m_Eye.position + m_Eye.forward * m_ShotInfiniteDistance;
+ }
+ else
+ {
+ for (int i = 0; i < hits.Length; ++i)
+ {
+ if (checkHit != null && checkHit(hits[i]))
+ {
+ return hits[i].point;
+ }
+ }
}
+ return hits[0].point;
+ }
+
+ void WallJumpUpdate()
+ {
+
+ }
+
+ void WallRun()
+ {
+
+ }
+
+ void PullTrick()
+ {
+
}
private void Awake()
@@ -210,6 +287,8 @@ namespace JamTools Jump();
Dodge();
Shot();
+ WallJumpUpdate();
+ PullTrick();
}
private void FixedUpdate()
@@ -218,6 +297,11 @@ namespace JamTools MoveInAirFixedUpdate();
}
- }
+ private void OnDrawGizmos()
+ {
+
+ }
+
+ }
}
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController.cs.meta b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/FPSCharacterController.cs.meta index 555d7fe..555d7fe 100644 --- a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController.cs.meta +++ b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/FPSCharacterController.cs.meta diff --git a/JamTools/Assets/JamTools/Scripts/Character/GroundChecker.cs b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/GroundChecker.cs index 5c18dff..6fa3a60 100644 --- a/JamTools/Assets/JamTools/Scripts/Character/GroundChecker.cs +++ b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/GroundChecker.cs @@ -7,6 +7,15 @@ namespace JamTools public class GroundChecker : MonoBehaviour
{
+ [SerializeField] private Transform m_Foot;
+
+ public Transform foot
+ {
+ get
+ {
+ return m_Foot;
+ }
+ }
private bool m_IsOnGround;
public bool isOnGround
@@ -19,20 +28,18 @@ namespace JamTools private void OnTriggerEnter(Collider other)
{
- Debug.Log("OnTriggerEnter");
m_IsOnGround = true;
}
private void OnTriggerExit(Collider other)
{
- Debug.Log("OnTriggerExit");
m_IsOnGround = false;
}
private void OnTriggerStay(Collider other)
{
- //Debug.Log("OnTriggerStay");
m_IsOnGround = true;
+
}
}
diff --git a/JamTools/Assets/JamTools/Scripts/Character/GroundChecker.cs.meta b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/GroundChecker.cs.meta index 6d7d500..6d7d500 100644 --- a/JamTools/Assets/JamTools/Scripts/Character/GroundChecker.cs.meta +++ b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/GroundChecker.cs.meta diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/Player.cs b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/Player.cs new file mode 100644 index 0000000..f26d6ce --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/Player.cs @@ -0,0 +1,39 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace JamTools
+{
+
+ public class Player : MonoBehaviour
+ {
+ [SerializeField] private GameObject m_Bullet;
+
+ private FPSCharacterController m_Controller;
+
+ private void Awake()
+ {
+ m_Controller = GetComponent<FPSCharacterController>();
+ }
+
+ private void Start()
+ {
+ m_Controller.shootTarget = ShootTarget;
+ m_Controller.checkHit = CheckHit;
+ }
+
+ bool CheckHit(RaycastHit hit)
+ {
+ return true;
+ }
+
+ void ShootTarget(Vector3 target, Transform muzzle)
+ {
+ GameObject go = GameObject.Instantiate(m_Bullet);
+ go.transform.position = muzzle.position;
+ go.GetComponent<Rigidbody>().velocity = (target - muzzle.position).normalized * 100;
+ }
+
+ }
+
+}
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/Player.cs.meta b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/Player.cs.meta new file mode 100644 index 0000000..d39ac17 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/Player.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ec838ef829bbe05498510200c17766a4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/StairChecker.cs b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/StairChecker.cs new file mode 100644 index 0000000..d5b881e --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/StairChecker.cs @@ -0,0 +1,19 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class StairChecker : MonoBehaviour
+{
+ public Transform upper;
+ public Transform lower;
+
+ void Start()
+ {
+
+ }
+
+ void Update()
+ {
+
+ }
+}
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/StairChecker.cs.meta b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/StairChecker.cs.meta new file mode 100644 index 0000000..bf23780 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/StairChecker.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: aa1da003e4adb0a4882351b5858277d2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/WallChecker.cs b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/WallChecker.cs new file mode 100644 index 0000000..e3da563 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/WallChecker.cs @@ -0,0 +1,33 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class WallChecker : MonoBehaviour
+{
+
+ private bool m_IsOnWall;
+ public bool IsOnWall
+ {
+ get
+ {
+ return m_IsOnWall;
+ }
+ }
+
+ private void OnTriggerEnter(Collider other)
+ {
+ m_IsOnWall = true;
+ }
+
+ private void OnTriggerExit(Collider other)
+ {
+ m_IsOnWall = false;
+ }
+
+ private void OnTriggerStay(Collider other)
+ {
+ m_IsOnWall = true;
+
+ }
+
+}
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/WallChecker.cs.meta b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/WallChecker.cs.meta new file mode 100644 index 0000000..2041b9f --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/WallChecker.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 32f00fa7c9bddb34a9f2255a5ad0d669 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController.meta b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController.meta new file mode 100644 index 0000000..63fb953 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 742ef155b03a3b44bbd5473c5d4b86a0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/MovementBase.cs b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/MovementBase.cs new file mode 100644 index 0000000..49de0e8 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/MovementBase.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class MovementBase : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/MovementBase.cs.meta b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/MovementBase.cs.meta new file mode 100644 index 0000000..67dd938 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/MovementBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b8d014a5ab1fb7c45a87ca9b3a98e4b6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerDodge.cs b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerDodge.cs new file mode 100644 index 0000000..3348f33 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerDodge.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PlayerDodge : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerDodge.cs.meta b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerDodge.cs.meta new file mode 100644 index 0000000..9ead883 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerDodge.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e03f84a9302179046a5a707cd01b0968 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerDoubleJump.cs b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerDoubleJump.cs new file mode 100644 index 0000000..c1e774c --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerDoubleJump.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PlayerDoubleJump : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerDoubleJump.cs.meta b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerDoubleJump.cs.meta new file mode 100644 index 0000000..52fde20 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerDoubleJump.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6e3885094e3909544b3c049657600a8a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerJump.cs b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerJump.cs new file mode 100644 index 0000000..e3bcc55 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerJump.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PlayerJump : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerJump.cs.meta b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerJump.cs.meta new file mode 100644 index 0000000..27875fa --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerJump.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 77d5f8aa75e068e45be00c5bbb68cca8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerLookAround.cs b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerLookAround.cs new file mode 100644 index 0000000..6740ce1 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerLookAround.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PlayerLookAround : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerLookAround.cs.meta b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerLookAround.cs.meta new file mode 100644 index 0000000..ed0e65f --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerLookAround.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6b87391c573931f488b024ca3a52bfa3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerMove.cs b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerMove.cs new file mode 100644 index 0000000..e9b0afa --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerMove.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PlayerMove : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerMove.cs.meta b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerMove.cs.meta new file mode 100644 index 0000000..cb395d5 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerMove.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 36c2bc1bec5de074ebdf56273177fa79 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerMoveInAir.cs b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerMoveInAir.cs new file mode 100644 index 0000000..2268803 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerMoveInAir.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PlayerMoveInAir : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerMoveInAir.cs.meta b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerMoveInAir.cs.meta new file mode 100644 index 0000000..113ef33 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerMoveInAir.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b8b86f7a1199b534e88e56011fd956c0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerRush.cs b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerRush.cs new file mode 100644 index 0000000..085b021 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerRush.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PlayerRush : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerRush.cs.meta b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerRush.cs.meta new file mode 100644 index 0000000..0e82a5b --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerRush.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 28a0aba3f0682ed4fab83c19d6d44e7a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerShot.cs b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerShot.cs new file mode 100644 index 0000000..a42c249 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerShot.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PlayerShot : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerShot.cs.meta b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerShot.cs.meta new file mode 100644 index 0000000..a3a78ab --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerShot.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7a806aa778b382c4da672898a35644e3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerSlide.cs b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerSlide.cs new file mode 100644 index 0000000..18d53fa --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerSlide.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PlayerSlide : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerSlide.cs.meta b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerSlide.cs.meta new file mode 100644 index 0000000..67e0b96 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerSlide.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ca7e599f46c5f594f8a5001e66b570fd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWalkOnSlope.cs b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWalkOnSlope.cs new file mode 100644 index 0000000..9619eeb --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWalkOnSlope.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PlayerWalkOnSlope : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWalkOnSlope.cs.meta b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWalkOnSlope.cs.meta new file mode 100644 index 0000000..99cdf55 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWalkOnSlope.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 606b9699cd264e449a853b1cfee94e16 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWalkOnStairs.cs b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWalkOnStairs.cs new file mode 100644 index 0000000..e58f9eb --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWalkOnStairs.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PlayerWalkOnStairs : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWalkOnStairs.cs.meta b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWalkOnStairs.cs.meta new file mode 100644 index 0000000..0f4e3a6 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWalkOnStairs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ab6c2331427fa1d45a87522b13f0abd4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWallJump.cs b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWallJump.cs new file mode 100644 index 0000000..08e4c7b --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWallJump.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PlayerWallJump : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWallJump.cs.meta b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWallJump.cs.meta new file mode 100644 index 0000000..6cbe3a8 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWallJump.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 83636e1de2f182945a83ae5937a8e45a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWallRun.cs b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWallRun.cs new file mode 100644 index 0000000..aab0d9b --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWallRun.cs @@ -0,0 +1,18 @@ +using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PlayerWallRun : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWallRun.cs.meta b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWallRun.cs.meta new file mode 100644 index 0000000..93fe220 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Character/FirstPersonController/PlayerWallRun.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: de561bb24209fdf47bd2057fdeaed188 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamTools/Assets/JamTools/Scripts/Projectile/SphereBullet.cs b/JamTools/Assets/JamTools/Scripts/Projectile/SphereBullet.cs index 44de696..772f8eb 100644 --- a/JamTools/Assets/JamTools/Scripts/Projectile/SphereBullet.cs +++ b/JamTools/Assets/JamTools/Scripts/Projectile/SphereBullet.cs @@ -22,6 +22,6 @@ public class SphereBullet : MonoBehaviour private void OnCollisionExit(Collision collision)
{
- Destroy(this.gameObject);
+ // Destroy(this.gameObject);
}
}
diff --git a/JamTools/Assets/JamTools/Scripts/Utils.meta b/JamTools/Assets/JamTools/Scripts/Utils.meta new file mode 100644 index 0000000..597e961 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Utils.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 293c2bbf046636f45aa82a0bcde4497c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/JamTools/Assets/JamTools/Scripts/Utils/GizmosHandle.cs b/JamTools/Assets/JamTools/Scripts/Utils/GizmosHandle.cs new file mode 100644 index 0000000..360eecd --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Utils/GizmosHandle.cs @@ -0,0 +1,42 @@ +using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace JamTools
+{
+
+ public class GizmosHandle : MonoBehaviour
+ {
+ public Action onDrawGizmos;
+
+ private static GizmosHandle m_Instance;
+
+ public static GizmosHandle Instance
+ {
+ get
+ {
+ return m_Instance;
+ }
+ }
+
+ public void DoGizmos(Action doGizmos)
+ {
+ onDrawGizmos += doGizmos;
+ }
+
+ private void Awake()
+ {
+ m_Instance = this;
+ }
+
+ private void OnDrawGizmos()
+ {
+ if (onDrawGizmos != null)
+ onDrawGizmos();
+ onDrawGizmos = null;
+ }
+
+ }
+
+}
diff --git a/JamTools/Assets/JamTools/Scripts/Utils/GizmosHandle.cs.meta b/JamTools/Assets/JamTools/Scripts/Utils/GizmosHandle.cs.meta new file mode 100644 index 0000000..43d7e19 --- /dev/null +++ b/JamTools/Assets/JamTools/Scripts/Utils/GizmosHandle.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8790b951567cc8942a748fde536a3fe0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: |