Skip to content

Commit 8d45972

Browse files
committedAug 28, 2022
Spojene scene
1 parent 6be541c commit 8d45972

18 files changed

+2693
-275
lines changed
 

‎Assets/GameManager.cs

+18-6
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
using UnityEngine;
77
using UnityEngine.UI;
88
using TMPro;
9+
using UnityEngine.SceneManagement;
910

1011

1112
public class GameManager : MonoBehaviour
1213
{
1314
[SerializeField]
14-
GameObject ball, startButton, highScoreText, scoreText, quitButton, restartButton;
15+
GameObject ball, highScoreText, scoreText, quitButton, restartButton;
16+
Name nameScript;
1517

1618
int score, highScore;
1719

@@ -46,7 +48,16 @@ private void Awake()
4648
canPlay = false;
4749

4850
}
49-
51+
private void Start()
52+
{
53+
GameStart();
54+
if (GameObject.FindObjectOfType<Name>() != null)
55+
{
56+
nameScript = GameObject.FindObjectOfType<Name>();
57+
}
58+
59+
60+
}
5061
private void Update()
5162
{
5263
if (!canPlay) return;
@@ -93,10 +104,10 @@ public void GameEnd()
93104
highScoreText.GetComponent<TMP_Text>().text = "HighScore: " + highScore;
94105
}
95106

96-
public void GameStart()
107+
void GameStart()
97108
{
98109
highScoreText.SetActive(false);
99-
startButton.SetActive(false);
110+
100111
scoreText.SetActive(true);
101112
Instantiate(ball, startPos, Quaternion.identity);
102113
Debug.Log("Tekst");
@@ -107,8 +118,9 @@ public void GameQuit()
107118
{
108119
#if UNITY_EDITOR
109120
UnityEditor.EditorApplication.isPlaying = false;
110-
#endif
111-
Application.Quit();
121+
SceneManager.LoadScene(0);
122+
#endif
123+
112124
}
113125

114126
public void GameRestart()

‎Assets/Loader.cs

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
using System.Collections;
2+
using System.Collections.Generic;
3+
using UnityEngine;
4+
using UnityEngine.SceneManagement;
5+
6+
public class Loader : MonoBehaviour
7+
{
8+
Name nameScript;
9+
private void Start()
10+
{
11+
nameScript = GameObject.FindObjectOfType<Name>();
12+
}
13+
public void LoadNexLevel()
14+
{
15+
SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex + 1);
16+
nameScript.GetPlayerName();
17+
}
18+
}

‎Assets/Loader.cs.meta

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Name.cs

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
using System.Collections;
2+
using System.Collections.Generic;
3+
using UnityEngine;
4+
using UnityEngine.UI;
5+
using TMPro;
6+
7+
public class Name : MonoBehaviour
8+
{
9+
public string playerName;
10+
[SerializeField]
11+
TMP_InputField input;
12+
13+
public static Name instance;
14+
15+
private void Awake()
16+
{
17+
if(instance != null)
18+
{
19+
Destroy(gameObject);
20+
return;
21+
}
22+
23+
instance = this;
24+
DontDestroyOnLoad(gameObject);
25+
}
26+
public void GetPlayerName()
27+
{
28+
playerName = input.text;
29+
Debug.Log(playerName);
30+
}
31+
}

‎Assets/Name.cs.meta

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Scenes/SampleScene1.unity ‎Assets/Scenes/igrica.unity

+265-250
Large diffs are not rendered by default.
File renamed without changes.

‎Assets/Scenes/pocetna.unity

+1,335
Large diffs are not rendered by default.

‎Assets/Scenes/pocetna.unity.meta

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Slike/FINALNI MENI-01.png

1.08 MB
Loading

‎Assets/Slike/FINALNI MENI-01.png.meta

+98
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Slike/quit-01.png

18.6 KB
Loading

‎Assets/Slike/quit-01.png.meta

+98
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/TextChanger.cs

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using System.Collections;
2+
using System.Collections.Generic;
3+
using UnityEngine;
4+
using TMPro;
5+
6+
public class TextChanger : MonoBehaviour
7+
{
8+
Name nameScript;
9+
[SerializeField]
10+
TMP_Text playerName;
11+
12+
void Start()
13+
{
14+
15+
nameScript = GameObject.FindObjectOfType<Name>();
16+
playerName.text = "Player: \n" + nameScript.playerName;
17+
}
18+
19+
20+
}

‎Assets/TextChanger.cs.meta

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset

+745-13
Large diffs are not rendered by default.

‎Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset

+18-5
Large diffs are not rendered by default.

‎ProjectSettings/EditorBuildSettings.asset

+7-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@ EditorBuildSettings:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
77
m_Scenes:
8-
- enabled: 1
8+
- enabled: 0
99
path: Assets/Scenes/SampleScene.unity
1010
guid: 2cda990e2423bbf4892e6590ba056729
11+
- enabled: 1
12+
path: Assets/Scenes/pocetna.unity
13+
guid: 1c1ccd1faaff41241aae1d5103791846
14+
- enabled: 1
15+
path: Assets/Scenes/igrica.unity
16+
guid: b05ec6f62d6562c45a6dd96eb432d4c6
1117
m_configObjects: {}

0 commit comments

Comments
 (0)
Please sign in to comment.