diff --git a/Assets/BuildBTN.cs b/Assets/BuildBTN.cs index c5f7cf0..d394ff7 100644 --- a/Assets/BuildBTN.cs +++ b/Assets/BuildBTN.cs @@ -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().getPicID() != 0){ @@ -22,7 +21,6 @@ public void OnClick(){ transform.parent.GetChild(transform.parent.childCount - 4).GetChild(a).GetComponent().ChangePic(myID); transform.parent.GetChild(transform.parent.childCount - 2).GetChild(a).GetChild(0).GetComponent().ChangePic(0); } - DyeBottomSound.Play(); } // Start is called before the first frame update void Start() diff --git a/Assets/ChangingClothes.cs b/Assets/ChangingClothes.cs index b3b2d73..3e01094 100644 --- a/Assets/ChangingClothes.cs +++ b/Assets/ChangingClothes.cs @@ -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() @@ -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(){ diff --git a/Assets/GM.cs b/Assets/GM.cs index b8947f7..afa86b9 100644 --- a/Assets/GM.cs +++ b/Assets/GM.cs @@ -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; @@ -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(); @@ -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")); @@ -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); diff --git a/Assets/Materials/ChooseClothUI/TutorialUI/TutorialUI4.png b/Assets/Materials/ChooseClothUI/TutorialUI/TutorialUI4.png new file mode 100644 index 0000000..366f3e6 Binary files /dev/null and b/Assets/Materials/ChooseClothUI/TutorialUI/TutorialUI4.png differ diff --git a/Assets/Materials/ChooseClothUI/TutorialUI/TutorialUI4.png.meta b/Assets/Materials/ChooseClothUI/TutorialUI/TutorialUI4.png.meta new file mode 100644 index 0000000..61fc1f3 --- /dev/null +++ b/Assets/Materials/ChooseClothUI/TutorialUI/TutorialUI4.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: accf13dd859b12445b27e6dd119d1e70 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/UI/HintUI.meta b/Assets/Materials/UI/HintUI.meta new file mode 100644 index 0000000..ad4c6f5 --- /dev/null +++ b/Assets/Materials/UI/HintUI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9350b9ad752a6c048a3250e118d303f8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/UI/HintUI/HintUI.png b/Assets/Materials/UI/HintUI/HintUI.png new file mode 100644 index 0000000..0842dc2 Binary files /dev/null and b/Assets/Materials/UI/HintUI/HintUI.png differ diff --git a/Assets/Materials/UI/HintUI/HintUI.png.meta b/Assets/Materials/UI/HintUI/HintUI.png.meta new file mode 100644 index 0000000..a167055 --- /dev/null +++ b/Assets/Materials/UI/HintUI/HintUI.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 84228490ac8729e4b9779ac2c52aac7d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/UI/MainUI/hintIcon.png b/Assets/Materials/UI/MainUI/hintIcon.png new file mode 100644 index 0000000..5c8172d Binary files /dev/null and b/Assets/Materials/UI/MainUI/hintIcon.png differ diff --git a/Assets/Materials/UI/MainUI/hintIcon.png.meta b/Assets/Materials/UI/MainUI/hintIcon.png.meta new file mode 100644 index 0000000..ae8508b --- /dev/null +++ b/Assets/Materials/UI/MainUI/hintIcon.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: c5317d9fd053e3f4b83b7fced5f86de0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git "a/Assets/Materials/UI/MainUI/menu\357\274\277stroke.png" "b/Assets/Materials/UI/MainUI/menu\357\274\277stroke.png" index c069e92..c98d68a 100644 Binary files "a/Assets/Materials/UI/MainUI/menu\357\274\277stroke.png" and "b/Assets/Materials/UI/MainUI/menu\357\274\277stroke.png" differ diff --git "a/Assets/Materials/UI/MainUI/menu\357\274\277stroke.png.meta" "b/Assets/Materials/UI/MainUI/menu\357\274\277stroke.png.meta" index 017ee5a..bb068c3 100644 --- "a/Assets/Materials/UI/MainUI/menu\357\274\277stroke.png.meta" +++ "b/Assets/Materials/UI/MainUI/menu\357\274\277stroke.png.meta" @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1efc6e366b254b543b5d044c3eb8ca10 +guid: eef656a89e8b10e4f81accc735815c27 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Scenes/ChooseCloth.unity b/Assets/Scenes/ChooseCloth.unity index ec50d24..363f853 100644 Binary files a/Assets/Scenes/ChooseCloth.unity and b/Assets/Scenes/ChooseCloth.unity differ diff --git a/Assets/Scenes/Demo 01.unity b/Assets/Scenes/Demo 01.unity index b084322..0a0adb8 100644 Binary files a/Assets/Scenes/Demo 01.unity and b/Assets/Scenes/Demo 01.unity differ diff --git a/Assets/SendBTN.cs b/Assets/SendBTN.cs index de233b5..dd43e1e 100644 --- a/Assets/SendBTN.cs +++ b/Assets/SendBTN.cs @@ -4,6 +4,8 @@ public class SendBTN : MonoBehaviour { + public AudioSource WrongOrder; + public void OnClick(){ GameObject Orders = GameObject.Find("MainUI").transform.GetChild(1).gameObject; int order_count = GameObject.Find("GM").transform.GetComponent().order_count; @@ -28,9 +30,11 @@ public void OnClick(){ } if(success){ transform.parent.parent.GetComponent().correct(); + transform.parent.parent.GetComponent().Play(); } else{ transform.parent.parent.GetComponent().incorrect(); + WrongOrder.Play(); } for(int a = 0; a < 3; a++){ transform.parent.GetChild(transform.parent.childCount - 4).GetChild(a).GetComponent().ChangePic(0); diff --git a/Assets/Sound/Bell_OrderDone.wav b/Assets/Sound/Bell_OrderDone.wav new file mode 100644 index 0000000..62c6fcc Binary files /dev/null and b/Assets/Sound/Bell_OrderDone.wav differ diff --git a/Assets/Sound/Bell_OrderDone.wav.meta b/Assets/Sound/Bell_OrderDone.wav.meta new file mode 100644 index 0000000..553376b --- /dev/null +++ b/Assets/Sound/Bell_OrderDone.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6fc88df1c63d69b48be77663cf6c2f75 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/StageClear.wav b/Assets/Sound/StageClear.wav new file mode 100644 index 0000000..880f80a Binary files /dev/null and b/Assets/Sound/StageClear.wav differ diff --git a/Assets/Sound/StageClear.wav.meta b/Assets/Sound/StageClear.wav.meta new file mode 100644 index 0000000..15ddf70 --- /dev/null +++ b/Assets/Sound/StageClear.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 788c50db110af15409a6349159520421 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sound/WrongOrder.wav b/Assets/Sound/WrongOrder.wav new file mode 100644 index 0000000..0d27508 Binary files /dev/null and b/Assets/Sound/WrongOrder.wav differ diff --git a/Assets/Sound/WrongOrder.wav.meta b/Assets/Sound/WrongOrder.wav.meta new file mode 100644 index 0000000..9c8821a --- /dev/null +++ b/Assets/Sound/WrongOrder.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: bf873c28b8a05b540845d061f0e7f849 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: