bugfixing after playtest; v1.4.0
This commit is contained in:
@@ -23,7 +23,6 @@ namespace Assets.Scripts
|
||||
public GameObject introduction;
|
||||
public GameObject tooltip;
|
||||
public GameObject tutorial;
|
||||
public GameObject buttonsHUD;
|
||||
public GameObject inventory;
|
||||
public GameObject waterLayer;
|
||||
|
||||
@@ -107,7 +106,7 @@ namespace Assets.Scripts
|
||||
introduction.transform.localScale = new Vector3(0, 0, 0);
|
||||
tutorial.transform.localScale = new Vector3(1, 1, 1);
|
||||
showHUD();
|
||||
state = UIState.GAME;
|
||||
state = UIState.TUTORIAL;
|
||||
}
|
||||
|
||||
public void switchCharactersheet()
|
||||
@@ -171,6 +170,7 @@ namespace Assets.Scripts
|
||||
|
||||
public void closeInventory()
|
||||
{
|
||||
inventory.GetComponent<Inventory>().OnMouseUp();
|
||||
inventory.transform.localScale = new Vector3(0, 0, 0);
|
||||
showHUD();
|
||||
state = UIState.GAME;
|
||||
@@ -194,7 +194,6 @@ namespace Assets.Scripts
|
||||
{
|
||||
playerHUD.transform.localScale = new Vector3(1,1,1);
|
||||
compass.transform.localScale = new Vector3(1, 1, 1);
|
||||
buttonsHUD.transform.localScale = new Vector3(1, 1, 1);
|
||||
}
|
||||
|
||||
public void openMainMenu()
|
||||
@@ -204,7 +203,7 @@ namespace Assets.Scripts
|
||||
|
||||
public void switchPauseMenu()
|
||||
{
|
||||
if (state == UIState.GAME || state == UIState.CHARACTER || state == UIState.PAUSE || state == UIState.QUEST)
|
||||
if (state == UIState.GAME || state == UIState.CHARACTER || state == UIState.PAUSE || state == UIState.QUEST || state == UIState.INVENTORY || state == UIState.INTRODUCTION)
|
||||
{
|
||||
if (state == UIState.PAUSE)
|
||||
{
|
||||
@@ -533,7 +532,7 @@ namespace Assets.Scripts
|
||||
GameObject.Find("Player").GetComponent<Player>().generatePlayer();
|
||||
GameObject.Find("Player").GetComponent<Player>().finishPlayerCreation();
|
||||
hideOtherElements(introduction);
|
||||
state = UIState.TUTORIAL;
|
||||
state = UIState.INTRODUCTION;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -550,6 +549,7 @@ namespace Assets.Scripts
|
||||
public void closeTutorial()
|
||||
{
|
||||
tutorial.transform.localScale = new Vector3(0,0,0);
|
||||
state = UIState.GAME;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user