From 884a17f330a0cc1cd7c0bcd04811c224bc8b5402 Mon Sep 17 00:00:00 2001 From: TAASONI3 Date: Wed, 13 Dec 2023 13:00:31 +0100 Subject: [PATCH] Fixed errors from prev commit --- Assets/Scenes/GameScene.unity | 26 ++++---- Assets/Scripts/Handler/UIHandler.cs | 77 +++++++++-------------- Assets/Scripts/Player/PlayerGameObject.cs | 9 --- 3 files changed, 43 insertions(+), 69 deletions(-) diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 612405a..605d39f 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -7483,7 +7483,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &395851980 RectTransform: m_ObjectHideFlags: 0 @@ -8271,7 +8271,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &426763427 RectTransform: m_ObjectHideFlags: 0 @@ -11742,7 +11742,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &583695243 RectTransform: m_ObjectHideFlags: 0 @@ -13825,7 +13825,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &718596642 RectTransform: m_ObjectHideFlags: 0 @@ -15954,7 +15954,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &814591216 RectTransform: m_ObjectHideFlags: 0 @@ -22195,7 +22195,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1114695177 RectTransform: m_ObjectHideFlags: 0 @@ -22940,7 +22940,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1156143265 RectTransform: m_ObjectHideFlags: 0 @@ -24671,7 +24671,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1225828337 RectTransform: m_ObjectHideFlags: 0 @@ -29444,7 +29444,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1509962781 MonoBehaviour: m_ObjectHideFlags: 0 @@ -30375,7 +30375,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1568120507 RectTransform: m_ObjectHideFlags: 0 @@ -31053,7 +31053,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1601343528 RectTransform: m_ObjectHideFlags: 0 @@ -35069,7 +35069,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1849127266 RectTransform: m_ObjectHideFlags: 0 @@ -37983,7 +37983,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2038188362 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Handler/UIHandler.cs b/Assets/Scripts/Handler/UIHandler.cs index 8f4e1fd..c10a66f 100644 --- a/Assets/Scripts/Handler/UIHandler.cs +++ b/Assets/Scripts/Handler/UIHandler.cs @@ -33,7 +33,6 @@ namespace Assets.Scripts void Start() { FileHandler.loadOptions(true); - GameObject.Find("Player").GetComponent().getPlayerStat("Killcount").changeAmount(1); } // Update is called once per frame @@ -41,10 +40,15 @@ namespace Assets.Scripts { if (state == UIState.GAME) { + if (GameObject.Find("Player").GetComponent().getPlayerStat("Killcount").getAmount() == -1) + { + GameObject.Find("Player").GetComponent().getPlayerStat("Killcount").changeAmount(1); + } updatePlayerHUD(); switchWaterLayer(); updateCoordinates(); - if(EventSystem.current.currentSelectedGameObject != null){ + if (EventSystem.current.currentSelectedGameObject != null) + { EventSystem.current.SetSelectedGameObject(null); } } @@ -148,7 +152,7 @@ namespace Assets.Scripts public void closeInventory() { inventory.transform.localScale = new Vector3(0, 0, 0); - GameObject.Find("pnlInventoryActions").transform.localScale = new Vector3(0,0,0); + GameObject.Find("pnlInventoryActions").transform.localScale = new Vector3(0, 0, 0); showHUD(); state = UIState.GAME; } @@ -169,7 +173,7 @@ namespace Assets.Scripts public void showHUD() { - playerHUD.transform.localScale = new Vector3(1,1,1); + playerHUD.transform.localScale = new Vector3(1, 1, 1); compass.transform.localScale = new Vector3(1, 1, 1); } @@ -224,12 +228,13 @@ namespace Assets.Scripts public void closeQuestLog() { - questlog.transform.localScale = new Vector3(0,0,0); + questlog.transform.localScale = new Vector3(0, 0, 0); state = UIState.GAME; showHUD(); } - public string saveVideoSettings(){ + public string saveVideoSettings() + { GameObject resolution = GameObject.Find("dropResolution"); GameObject mode = GameObject.Find("dropMode"); string result = ""; @@ -267,12 +272,13 @@ namespace Assets.Scripts } break; } - result = result + "Resolution:"+resolution.GetComponent().value+"\r\n"; - result = result + "Mode:"+mode.GetComponent().value; + result = result + "Resolution:" + resolution.GetComponent().value + "\r\n"; + result = result + "Mode:" + mode.GetComponent().value; return result; } - public string saveLanguage(){ + public string saveLanguage() + { GameObject language = GameObject.Find("dropLanguage"); string result = ""; switch (language.GetComponent().value) @@ -284,7 +290,7 @@ namespace Assets.Scripts result = "en"; break; } - result = "Language:"+result; + result = "Language:" + result; return result; } @@ -404,13 +410,8 @@ namespace Assets.Scripts GameObject.Find("txtHealth").GetComponent().text = TextHandler.getText("health") + " " + player.getPlayerStat("Health").getAmount() + " (+" + equipment["HP"] + ")"; GameObject.Find("txtSecondary").GetComponent().text = "Mana: " + player.getPlayerStat("Secondary").getAmount() + " (+" + equipment["MP"] + ")"; - updateHealthUI(player.getPlayerStat("Health").getAmount(), player.getPlayerStat("MaxHealth").getAmount() + equipment["HP"]); - updateSecondaryUI(player.getPlayerStat("Secondary").getAmount(), player.getPlayerStat("MaxSecondary").getAmount() + equipment["MP"]); - updateExperienceUI(player.getPlayerStat("Experience").getAmount(), player.getPlayerStat("MaxExperience").getAmount()); - player.updateName(GameObject.Find("txtName").GetComponent()); updatePoints(player.getPlayerStat("Points").getAmount()); - player.displaySkills(GameObject.Find("pnlSkills")); } private void updatePoints(int points) @@ -442,29 +443,6 @@ namespace Assets.Scripts } } - private void updateHealthUI(int health, int maxHealth) - { - GameObject fill = GameObject.Find("pnlHealthBar"); - GameObject text = GameObject.Find("healthTextInformation"); - - updateFill(fill, text, maxHealth, health); - } - - private void updateSecondaryUI(int secondary, int maxSecondary) - { - GameObject fill = GameObject.Find("pnlSecondaryBar"); - GameObject text = GameObject.Find("secondaryTextInformation"); - - updateFill(fill, text, maxSecondary, secondary); - } - - private void updateExperienceUI(int experience, int maxExperience) - { - GameObject fill = GameObject.Find("pnlExperience"); - - updateFill(fill, null, maxExperience, experience); - } - public void updateHUD(PlayerGameObject player) { Dictionary equipment = inventory.GetComponent().getEquipmentBonus(); @@ -529,7 +507,7 @@ namespace Assets.Scripts FileHandler.loadGame(GameObject.Find("Player").GetComponent(), GameObject.Find("WorldGenerator").GetComponent(), GameObject.Find("Inventory").GetComponent(), GameObject.Find("QuestLog").GetComponent()); hideOtherElements(introduction); introduction.transform.localScale = new Vector3(0, 0, 0); - tutorial.transform.localScale = new Vector3(0,0,0); + tutorial.transform.localScale = new Vector3(0, 0, 0); showHUD(); state = UIState.GAME; } @@ -538,23 +516,28 @@ namespace Assets.Scripts public void closeTutorial() { - tutorial.transform.localScale = new Vector3(0,0,0); + tutorial.transform.localScale = new Vector3(0, 0, 0); state = UIState.GAME; } - public void showOptionView(string key){ + public void showOptionView(string key) + { GameObject optionContent = GameObject.Find("pnlContent"); - for(int i = 0; i < optionContent.transform.childCount; i++){ - if(optionContent.transform.GetChild(i).name.ToLower().Contains(key)){ - optionContent.transform.GetChild(i).transform.localScale = new Vector3(1,1,1); + for (int i = 0; i < optionContent.transform.childCount; i++) + { + if (optionContent.transform.GetChild(i).name.ToLower().Contains(key)) + { + optionContent.transform.GetChild(i).transform.localScale = new Vector3(1, 1, 1); } - else{ - optionContent.transform.GetChild(i).transform.localScale = new Vector3(0,0,0); + else + { + optionContent.transform.GetChild(i).transform.localScale = new Vector3(0, 0, 0); } } } - public void switchLanguage(){ + public void switchLanguage() + { GameObject language = GameObject.Find("dropLanguage"); switch (language.GetComponent().value) { diff --git a/Assets/Scripts/Player/PlayerGameObject.cs b/Assets/Scripts/Player/PlayerGameObject.cs index 98d7a93..b06059b 100644 --- a/Assets/Scripts/Player/PlayerGameObject.cs +++ b/Assets/Scripts/Player/PlayerGameObject.cs @@ -316,15 +316,6 @@ namespace Assets.Scripts.Player } } - public void displaySkills(GameObject pnlSkills) - { - for (int i = 1; i <= 3; i++) - { - GameObject skill = pnlSkills.transform.Find("skill" + i).gameObject; - player.getSkill(i - 1).displaySkill(skill.transform.Find("imgAction").gameObject, skill.transform.Find("descAction").gameObject); - } - } - public PlayerStat getPlayerStat(string identifier){ return player.getStat(identifier); }