crayonix/fatal-exception
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020

Browse Source
This commit is contained in:
Giovani
2020-02-02 16:45:37 -05:00
parent 9c6bf8eb14 b00811a8b0
commit b2c4010ddb
9 changed files with 690 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/GameIntroCutscene.cs
View File

@@ -79,6 +79,7 @@ public class GameIntroCutscene : Cutscene
yield return new WaitForSeconds(.8f);
sceneC.sprite = sprites[3];
SoundManagerScript.PlaySound("slam");
Shake(15);
yield return new WaitForSeconds(1f);
@@ -120,6 +121,7 @@ public class GameIntroCutscene : Cutscene
sceneC.sprite = sprites[2];
sceneB.sprite = sprites[6];
SoundManagerScript.PlaySound("slam");
Shake(20);
yield return new WaitForSeconds(1.5f);

22
Assets/Scripts/Player.cs
View File

@@ -53,28 +53,6 @@ public class Player : MonoBehaviour
private void Update()
{
MovePlayer();
//if (IsPlayerOnWall(true))
//{
// if (collider.sharedMaterial == null || collider.sharedMaterial.friction != 0f)
// {
// collider.sharedMaterial = new PhysicsMaterial2D();
// collider.sharedMaterial.friction = 0f;
// collider.enabled = false;
// collider.enabled = true;
// }
//}
//else
//{
// if (collider.sharedMaterial == null || collider.sharedMaterial.friction == 0f)
// {
// collider.sharedMaterial = new PhysicsMaterial2D();
// collider.sharedMaterial.friction = 0.5f;
// collider.enabled = false;
// collider.enabled = true;
// }
//}
}
public void OnConsumable(Collider2D collision)

6
Assets/Scripts/SoundManagerScript.cs
View File

@@ -7,7 +7,7 @@ public class SoundManagerScript : MonoBehaviour
public static AudioClip jumpSound, screamSound, wrongButtonSound,
bugLaughSound, drinkSound, eatSound, punchSound, hardPunchSound,
slapSound, hardSlapSound, winSound;
slapSound, hardSlapSound, winSound, slamSound;
public static AudioSource audioSrc;
// Start is called before the first frame update
@@ -24,6 +24,7 @@ public class SoundManagerScript : MonoBehaviour
slapSound = Resources.Load<AudioClip>("Audio/Slap");
hardSlapSound = Resources.Load<AudioClip>("Audio/HardSlap");
winSound = Resources.Load<AudioClip>("Audio/Win");
slamSound = Resources.Load<AudioClip>("Audio/Slam");
audioSrc = GetComponent<AudioSource>();
}
@@ -72,6 +73,9 @@ public class SoundManagerScript : MonoBehaviour
case "win":
sound = winSound;
break;
case "slam":
sound = slamSound;
break;
}