Conjure/32bit_jam_conjure
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Dev' of https://bitbucket.clubconjure.com/scm/cegj/32bit_jam_conjure into LevelDesignFix

Browse Source
This commit is contained in:
louishorlaville 2022-10-30 22:13:29 -04:00
commit 6a94a7cee0
2 changed files with 2403 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2465
Assets/Scenes/MainMenu.unity
View File

File diff suppressed because it is too large Load Diff

1
Assets/Scripts/GameController.cs
View File

@ -78,7 +78,6 @@ public class GameController : MonoBehaviour
private void ChangedScene(Scene curr, Scene next){ private void ChangedScene(Scene curr, Scene next){
fadeCoroutine = StartCoroutine(FadeToBlack(string.Empty, false, fadeSpeed)); fadeCoroutine = StartCoroutine(FadeToBlack(string.Empty, false, fadeSpeed));
if(!next.name.Equals(mainScene) && !next.name.Equals(endScene)){ if(!next.name.Equals(mainScene) && !next.name.Equals(endScene)){
Debug.Log(endScene);
coinText.gameObject.SetActive(false); coinText.gameObject.SetActive(false);
}else{ }else{
coinText.gameObject.SetActive(true); coinText.gameObject.SetActive(true);