Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Assets/BuildBTN.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

public class BuildBTN : MonoBehaviour
{
public AudioSource DyeBottomSound;

public void OnClick(){
if(transform.parent.GetChild(transform.parent.childCount - 4).GetChild(0).GetComponent<ItemSlotImg>().getPicID() != 0){
Expand All @@ -22,7 +21,6 @@ public void OnClick(){
transform.parent.GetChild(transform.parent.childCount - 4).GetChild(a).GetComponent<ItemSlotImg>().ChangePic(myID);
transform.parent.GetChild(transform.parent.childCount - 2).GetChild(a).GetChild(0).GetComponent<ItemSlotImg>().ChangePic(0);
}
DyeBottomSound.Play();
}
// Start is called before the first frame update
void Start()
Expand Down
9 changes: 7 additions & 2 deletions Assets/ChangingClothes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class ChangingClothes : MonoBehaviour

string UserId;
public int isTeached, task1, task2 ,task3;
public GameObject TutorialUI, TutorialUI_1, TutorialUI_2, TutorialUI_3;
public GameObject TutorialUI, TutorialUI_1, TutorialUI_2, TutorialUI_3, TutorialUI_4;
public GameObject giftStar;

void Start()
Expand Down Expand Up @@ -77,11 +77,16 @@ public void ToPage3(){
TutorialUI_2.SetActive(false);
TutorialUI_3.SetActive(true);
}
public void ToPage4(){
TutorialUI_3.SetActive(false);
TutorialUI_4.SetActive(true);
}

public void ExitTutorial(){
string url = "https://bkhole.app/islandxes/" + UserId;
RestClient.Put(url, "{\"t8task\":\"1-0-0-0\"}");
Time.timeScale = 1;
TutorialUI_3.SetActive(false);
TutorialUI_4.SetActive(false);
}

public void DefaultOutfit(){
Expand Down
21 changes: 19 additions & 2 deletions Assets/GM.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class GM : MonoBehaviour

public GameObject loading_screen;
public Slider slider;
public GameObject PauseMenuUI;
public GameObject PauseMenuUI, HintUI;
public GameObject FailUI, SuccessUI;
public AudioSource Button, ClockTicking, TimesUp;

Expand Down Expand Up @@ -128,7 +128,7 @@ void Update()
isCountingDown = true;
}
}
if(Timer_.time_left_sec < 0){
if(Timer_.time_left_sec <= 0){
Timer_.time_left_sec = 0;
if(!isTimesUp){
TimesUp.Play();
Expand Down Expand Up @@ -166,11 +166,19 @@ public void PauseGame(){
isPause = true;
Time.timeScale = 0;
PauseMenuUI.SetActive(true);
if (isCountingDown == true){
ClockTicking.Pause();
}
}
public void ResumeGame(){
isPause = false;
Time.timeScale = 1;
PauseMenuUI.SetActive(false);
HintUI.SetActive(false);
GameObject.Find("MainUI").transform.GetChild(GameObject.Find("MainUI").transform.childCount - 1).gameObject.SetActive(true);
if (isCountingDown == true){
ClockTicking.Play();
}
}
public void RestartGame(){
StartCoroutine(LoadScene("Demo 01"));
Expand All @@ -182,6 +190,15 @@ public void NextStage(){
//To Next stage
//StartCoroutine(LoadScene("ChooseCloth"));
}
public void HintInGame(){
isPause = true;
Time.timeScale = 0;
HintUI.SetActive(true);
GameObject.Find("MainUI").transform.GetChild(GameObject.Find("MainUI").transform.childCount - 1).gameObject.SetActive(false);
if (isCountingDown == true){
ClockTicking.Pause();
}
}
IEnumerator LoadScene(string SceneName){
AsyncOperation op = SceneManager.LoadSceneAsync (sceneName: SceneName);

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
108 changes: 108 additions & 0 deletions Assets/Materials/ChooseClothUI/TutorialUI/TutorialUI4.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/Materials/UI/HintUI.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Materials/UI/HintUI/HintUI.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
108 changes: 108 additions & 0 deletions Assets/Materials/UI/HintUI/HintUI.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Materials/UI/MainUI/hintIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading