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

Fixed errors from prev commit

Browse Source
This commit is contained in:
TAASONI3 2023-12-13 13:00:31 +01:00
parent 17a0a22dd4
commit 884a17f330
3 changed files with 43 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Assets/Scenes/GameScene.unity
View File

@ -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

57
Assets/Scripts/Handler/UIHandler.cs
View File

@ -33,7 +33,6 @@ namespace Assets.Scripts
void Start()
{
FileHandler.loadOptions(true);
GameObject.Find("Player").GetComponent<PlayerGameObject>().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<PlayerGameObject>().getPlayerStat("Killcount").getAmount() == -1)
{
GameObject.Find("Player").GetComponent<PlayerGameObject>().getPlayerStat("Killcount").changeAmount(1);
}
updatePlayerHUD();
switchWaterLayer();
updateCoordinates();
if(EventSystem.current.currentSelectedGameObject != null){
if (EventSystem.current.currentSelectedGameObject != null)
{
EventSystem.current.SetSelectedGameObject(null);
}
}
@ -229,7 +233,8 @@ namespace Assets.Scripts
showHUD();
}
public string saveVideoSettings(){
public string saveVideoSettings()
{
GameObject resolution = GameObject.Find("dropResolution");
GameObject mode = GameObject.Find("dropMode");
string result = "";
@ -272,7 +277,8 @@ namespace Assets.Scripts
return result;
}
public string saveLanguage(){
public string saveLanguage()
{
GameObject language = GameObject.Find("dropLanguage");
string result = "";
switch (language.GetComponent<Dropdown>().value)
@ -404,13 +410,8 @@ namespace Assets.Scripts
GameObject.Find("txtHealth").GetComponent<Text>().text = TextHandler.getText("health") + " " + player.getPlayerStat("Health").getAmount() + " (+" + equipment["HP"] + ")";
GameObject.Find("txtSecondary").GetComponent<Text>().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<Text>());
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<string, int> equipment = inventory.GetComponent<Inventory>().getEquipmentBonus();
@ -542,19 +520,24 @@ namespace Assets.Scripts
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)){
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{
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<Dropdown>().value)
{

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

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