Nicola/TalesOfNovariel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed player object from main menu, fixed menu/game scene switching. Added translation for new trees but still not displaying.

Browse Source
This commit is contained in:
finnchen123
2026-02-06 14:49:25 +01:00
parent 2562321918
commit 4a3c9fa8c0
9 changed files with 61 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Scripts/Handler/SceneHandler.cs
View File

@@ -31,19 +31,19 @@ namespace Assets.Scripts
public void openMenuScene()
{
SceneManager.LoadSceneAsync("MenuScene", LoadSceneMode.Single);
SceneManager.LoadScene("MenuScene", LoadSceneMode.Single);
}
public void openGameScene()
{
SceneManager.LoadSceneAsync("GameScene", LoadSceneMode.Single);
SceneManager.LoadScene("GameScene", LoadSceneMode.Single);
}
public static void switchGameToMenu()
{
if (!sceneSwitched)
{
SceneManager.LoadSceneAsync("MenuScene", LoadSceneMode.Single);
SceneManager.LoadScene("MenuScene", LoadSceneMode.Single);
sceneSwitched = true;
}
}

58
Assets/Scripts/Menu/UIHandlerMenu.cs
View File

@@ -38,49 +38,6 @@ namespace Assets.Scripts.Menu
sceneHandler.openGameScene();
}
private void setPlayerInformation()
{
string name = GameObject.Find("inName").GetComponent<InputField>().text;
int role = GameObject.Find("dropClass").GetComponent<Dropdown>().value;
int race = GameObject.Find("dropRace").GetComponent<Dropdown>().value;
BasicRace playerRace = new BasicRace();
BasicClass playerClass = new ThiefClass();
switch (role)
{
case 0:
playerClass = new WarriorClass();
break;
case 1:
playerClass = new MageClass();
break;
case 2:
playerClass = new ThiefClass();
break;
}
switch (race)
{
case 0:
playerRace = new HumanRace();
break;
case 1:
playerRace = new ElvenRace();
break;
case 2:
playerRace = new DwarvenRace();
break;
case 3:
playerRace = new GoblinRace();
break;
case 4:
playerRace = new GiantRace();
break;
case 5:
playerRace = new NightelfRace();
break;
}
GameObject.Find("Player").GetComponent<PlayerGameObject>().generatePlayer(playerRace, playerClass, name, GameObject.Find("dropDifficulty").GetComponent<Dropdown>().value);
}
public void openCharacterCreation()
{
options.transform.localScale = new Vector3(0, 0, 0);
@@ -182,21 +139,6 @@ namespace Assets.Scripts.Menu
return result;
}
public void updateCreationInformation()
{
setPlayerInformation();
// health, maxHealth, secondary, maxSecondary, strength, dexterity, intelligence, level, experience, maxExperience, points
PlayerGameObject player = GameObject.Find("Player").GetComponent<PlayerGameObject>();
GameObject.Find("txtStrength_Creation").GetComponent<Text>().text = TextHandler.getText("strength") + " " + player.getPlayerStat("Strength").getAmount();
GameObject.Find("txtDexterity_Creation").GetComponent<Text>().text = TextHandler.getText("dexterity") + " " + player.getPlayerStat("Dexterity").getAmount();
GameObject.Find("txtIntelligence_Creation").GetComponent<Text>().text = TextHandler.getText("intelligence") + " " + player.getPlayerStat("Intelligence").getAmount();
GameObject.Find("txtHealth_Creation").GetComponent<Text>().text = TextHandler.getText("health") + " " + player.getPlayerStat("MaxHealth").getAmount();
GameObject.Find("txtSecondary_Creation").GetComponent<Text>().text = "Mana: " + player.getPlayerStat("MaxSecondary").getAmount();
}
public void loadGame(SceneHandler sceneHandler)
{
PlayerPrefs.SetInt("isLoad", 1);

13
Assets/Scripts/Player/PlayerCamera.cs
View File

@@ -77,7 +77,18 @@ namespace Assets.Scripts.Player
switch (obj.ToLower())
{
case "tree":
displayInformation(TextHandler.getText("tree"));
if (hit.collider.gameObject.name.ToLower().Contains("birch"))
{
displayInformation(TextHandler.translate("Birch"));
}
else if (hit.collider.gameObject.name.ToLower().Contains("oak"))
{
displayInformation(TextHandler.translate("Oak"));
}
else if (hit.collider.gameObject.name.ToLower().Contains("pine"))
{
displayInformation(TextHandler.translate("Pine"));
}
break;
case "stone":
displayInformation(TextHandler.getText("rock"));

5
Assets/Scripts/Player/PlayerGameObject.cs
View File

@@ -36,7 +36,10 @@ namespace Assets.Scripts.Player
private void OnEnable()
{
#if UNITY_EDITOR
SceneHandler.switchGameToMenu();
if (GameObject.Find("SceneHandlerLoaded") == null)
{
SceneHandler.switchGameToMenu();
}
#endif
ControlEvents.OnLookingInput += rotate;
ControlEvents.OnMovingInput += move;