GJP/GlobalGameJam-2021
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: GJP:aed80e1e8551dcdb4cb6574f16a8cbca94b36947
Branches Tags
GJP:master
GJP:mobile_controls
GJP:hans
...
compare: GJP:18a2f9944dce81a98d00f3fef01f8aad344d61a4
Branches Tags
GJP:mobile_controls
GJP:master
GJP:hans

2 Commits
aed80e1e85 ... 18a2f9944d

Author SHA1 Message Date
haitem
18a2f9944d Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 15:51:12 +01:00
haitem
2dbeaa26b4 Some sound edit 2021-01-31 15:51:03 +01:00
2 changed files with 14 additions and 4 deletions
Show Stats Expand all files Collapse all files

6
Assets/Scripts/AudioManager.cs
View File

@ -22,13 +22,15 @@ public class AudioManager : MonoBehaviour
}
// Update is called once per frame
public void Play(string name)
public void Play(string name, bool checkIfPlay = false)
{
AudioSound s = Array.Find(clips, sound => sound.name == name);
if (s == null) {
return;
}
Debug.Log("Sound is playng");
s.source.Play();
if (!s.source.isPlaying || !checkIfPlay) {
s.source.Play();
}
}
}

12
Assets/Scripts/PlayerManager.cs
View File

@ -249,7 +249,6 @@ public class PlayerManager : MonoBehaviour
if (Input.GetAxis("Horizontal") > 0)
{
playerAnimator.SetBool("Walk", true);
FindObjectOfType<AudioManager>().Play("Walk");
if (pushPullObject == null) {
playerAnimator.transform.rotation = Quaternion.Lerp(
playerAnimator.transform.rotation,
@ -261,7 +260,6 @@ public class PlayerManager : MonoBehaviour
else if (Input.GetAxis("Horizontal") < 0)
{
playerAnimator.SetBool("Walk", true);
FindObjectOfType<AudioManager>().Play("Walk");
if (pushPullObject == null)
{
playerAnimator.transform.rotation = Quaternion.Lerp(
@ -279,6 +277,16 @@ public class PlayerManager : MonoBehaviour
void Move()
{
if (Input.GetAxis("Horizontal") != 0)
{
if (!run) {
FindObjectOfType<AudioManager>().Play("Walk", true);
}
else
{
FindObjectOfType<AudioManager>().Play("Run", true);
}
}
rigidBody.MovePosition(
transform.position +
(onLadder && activeAbility.Count > 0 && activeAbility[0] == 4 ? (transform.up * speed * Input.GetAxis("Vertical") * Time.deltaTime) : Vector3.zero) +