trying to resolve merge conflict

This commit is contained in:
Ayumi
2023-06-22 22:47:45 +02:00
3 changed files with 8 additions and 296 deletions

View File

@@ -5,19 +5,10 @@ using UnityEngine.SceneManagement;
public class MainMenu : MonoBehaviour
{
public string newGameScene;
public string continueGameScene;
public void startGame()
{
Debug.Log("Main Menu: New Game");
SceneManager.LoadScene(newGameScene);
}
public void continueGame()
{
Debug.Log("Main Menu: Continue Game");
SceneManager.LoadScene(continueGameScene);
SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex+1);
}
public void endGame()