Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
This commit is contained in:
@@ -9,6 +9,7 @@ public class EventControls : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private Player player;
|
||||
[SerializeField] private Camera camera;
|
||||
[SerializeField] private GameObject music;
|
||||
[SerializeField] private List<Tile> tiles;
|
||||
[SerializeField] private List<Tile> successTiles;
|
||||
[SerializeField] private List<Tile> failTiles;
|
||||
@@ -159,6 +160,17 @@ public class EventControls : MonoBehaviour
|
||||
.GetValueOrDefault();
|
||||
}
|
||||
|
||||
IEnumerator PlayVictoryMusic()
|
||||
{
|
||||
music = GameObject.Find("Music");
|
||||
var audioSrc = music.GetComponent<AudioSource>();
|
||||
audioSrc.Pause();
|
||||
SoundManagerScript.PlaySound("win");
|
||||
var clipSeconds = SoundManagerScript.audioSrc.clip.length;
|
||||
yield return new WaitForSeconds(clipSeconds);
|
||||
audioSrc.Play();
|
||||
}
|
||||
|
||||
private void PerformControlEvent()
|
||||
{
|
||||
nextControlAccumalator = 0;
|
||||
@@ -185,6 +197,7 @@ public class EventControls : MonoBehaviour
|
||||
// Destroy(currentEnemyCollider.gameObject);
|
||||
// currentEnemyCollider = null;
|
||||
hasFailed = false;
|
||||
StartCoroutine(PlayVictoryMusic());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -274,7 +287,7 @@ public class EventControls : MonoBehaviour
|
||||
// var offset = camera.transform.position.x - (int)camera.transform.position.x;
|
||||
// transform.position = new Vector3(transform.position.x + offset, transform.position.y, 0);
|
||||
//}
|
||||
|
||||
|
||||
private EventControlTile GenerateEventControlTile(Vector3Int position)
|
||||
{
|
||||
var randomNumber = Random.Range(0, TileToKeyMappings.TileToKey.Count);
|
||||
|
||||
Reference in New Issue
Block a user