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

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

View File

@@ -1352,6 +1352,18 @@ MonoBehaviour:
m_Key: txtSensitivityControllerVertical
m_Metadata:
m_Items: []
- m_Id: 343461740212834304
m_Key: Birch
m_Metadata:
m_Items: []
- m_Id: 343461777605054464
m_Key: Oak
m_Metadata:
m_Items: []
- m_Id: 343461779215667200
m_Key: Pine
m_Metadata:
m_Items: []
m_Metadata:
m_Items: []
m_KeyGenerator:

View File

@@ -1363,6 +1363,18 @@ MonoBehaviour:
m_Localized: 'Empf. Vertikal:'
m_Metadata:
m_Items: []
- m_Id: 343461740212834304
m_Localized: Birke
m_Metadata:
m_Items: []
- m_Id: 343461777605054464
m_Localized: Eiche
m_Metadata:
m_Items: []
- m_Id: 343461779215667200
m_Localized: Tanne
m_Metadata:
m_Items: []
references:
version: 2
RefIds:

View File

@@ -1404,6 +1404,18 @@ MonoBehaviour:
m_Localized: 'Sensitivity Vertical:'
m_Metadata:
m_Items: []
- m_Id: 343461740212834304
m_Localized: Birch tree
m_Metadata:
m_Items: []
- m_Id: 343461777605054464
m_Localized: Oak tree
m_Metadata:
m_Items: []
- m_Id: 343461779215667200
m_Localized: Pine tree
m_Metadata:
m_Items: []
references:
version: 2
RefIds: []

View File

@@ -7041,7 +7041,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: K
m_Text: Small (5 cities)
--- !u!222 &929276014
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -7790,19 +7790,7 @@ MonoBehaviour:
m_Image: {fileID: 0}
m_OnValueChanged:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 686373973}
m_TargetAssemblyTypeName: Assets.Scripts.Menu.UIHandlerMenu, Assembly-CSharp
m_MethodName: updateCreationInformation
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_Calls: []
m_AlphaFadeSpeed: 0.15
--- !u!114 &1025440992
MonoBehaviour:
@@ -9602,7 +9590,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 800x600
m_Text: German
--- !u!222 &1225249785
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -14189,19 +14177,7 @@ MonoBehaviour:
m_Image: {fileID: 0}
m_OnValueChanged:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 686373973}
m_TargetAssemblyTypeName: Assets.Scripts.Menu.UIHandlerMenu, Assembly-CSharp
m_MethodName: updateCreationInformation
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_Calls: []
m_AlphaFadeSpeed: 0.15
--- !u!114 &1681093454
MonoBehaviour:

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;
}
}

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);

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"));

View File

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

View File

@@ -18,10 +18,10 @@ EditorUserSettings:
value: 065551555651080c54570d2741715e1541154a79752925322f2c4965b7b0646d
flags: 0
RecentlyUsedSceneGuid-4:
value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
flags: 0
RecentlyUsedSceneGuid-5:
value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a
flags: 0
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d