Add splash screen, Update register screen UI, Update Quiz Answer

2025-05-25 18:39:21 +07:00 · 2025-05-25 18:39:21 +07:00 · 5846dc4702
parent 11563a9729
commit 5846dc4702
21 changed files with 105 additions and 1616 deletions
--- a/SO/Questions/Easy.meta
+++ b/SO/Questions/Easy.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3c67168a49c7a484180fa8f7db5c0837
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/SO/Questions/Hard.meta
+++ b/SO/Questions/Hard.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 905166f012810f145b25f91bcd4ef800
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/SO/Questions/Medium.meta
+++ b/SO/Questions/Medium.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5b68ad9a2679231469f6c60f8e0e3da1
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/SO/Questions/Quis
+++ b/SO/Questions/Quis
@ -16,9 +16,9 @@ MonoBehaviour:
  imageQuestion: {fileID: 0}
  answers:
  - '16 '
-  - '20 '
  - '32 '
  - '28 '
-  answerIndex: 1
+  - '20 '
+  answerIndex: 3
  nextSceneName: Lv1EasyB
  isMateriKesehatanGigi: 1
--- a/SO/Questions/Quis
+++ b/SO/Questions/Quis
@ -15,10 +15,10 @@ MonoBehaviour:
  question: Kapan waktu yang tepat untuk menggosok gigi?
  imageQuestion: {fileID: 0}
  answers:
-  - Setelah makan malam dan sebelum tidur
  - Setelah sarapan dan sebelum tidur
+  - Setelah makan malam dan sebelum tidur
  - Setelah sarapan dan sebelum makan
  - Setelah bangun tidur
-  answerIndex: 1
+  answerIndex: 0
  nextSceneName: Lv3EasyB
  isMateriKesehatanGigi: 1
--- a/SO/Questions/Quis
+++ b/SO/Questions/Quis
@ -15,8 +15,8 @@ MonoBehaviour:
  question: 'Apa nama gigi yang tumbuh setelah gigi susu copot? '
  imageQuestion: {fileID: 0}
  answers:
-  - Gigi taring
  - Gigi premolar
+  - Gigi taring
  - Gigi permanen
  - Gigi susu
  answerIndex: 2
--- a/SO/Questions/Quis
+++ b/SO/Questions/Quis
@ -16,9 +16,9 @@ MonoBehaviour:
  imageQuestion: {fileID: 0}
  answers:
  - Jarang makan sayur
-  - Jarang sikat gigi dan banyak makan makanan manis
  - Jarang minum air putih
+  - Jarang sikat gigi dan banyak makan makanan manis
  - Jarang makan buah
-  answerIndex: 1
+  answerIndex: 2
  nextSceneName: Lv2EasyB
  isMateriKesehatanGigi: 0
--- a/SO/Questions/Quis
+++ b/SO/Questions/Quis
@ -15,10 +15,10 @@ MonoBehaviour:
  question: Berapa kali sebaiknya kita sikat gigi dalam sehari?
  imageQuestion: {fileID: 0}
  answers:
-  - 1 kali
-  - 2 kali
  - 6 kali
  - 5 kali
-  answerIndex: 1
+  - 1 kali
+  - 2 kali
+  answerIndex: 3
  nextSceneName: Lv1MediumB
  isMateriKesehatanGigi: 0
--- a/Assets/ToothyV/Prefabs/UI
+++ b/Assets/ToothyV/Prefabs/UI
--- a/Assets/ToothyV/Scenes/Hard/Lv1HardA.unity
+++ b/Assets/ToothyV/Scenes/Hard/Lv1HardA.unity
@ -1952,7 +1952,7 @@ MonoBehaviour:
  target: {fileID: 717926935}
  health: 0
  maxHealth: 100
-  damage: 20
+  damage: 11
  isBosStage2: 0
  pastaGigi: {fileID: 0}
 --- !u!70 &1879414516
--- a/Assets/ToothyV/Scenes/Hard/Lv1HardB.unity
+++ b/Assets/ToothyV/Scenes/Hard/Lv1HardB.unity
@ -2014,7 +2014,7 @@ MonoBehaviour:
  target: {fileID: 717926935}
  health: 0
  maxHealth: 100
-  damage: 10
+  damage: 7
  isBosStage2: 1
  pastaGigi: {fileID: 460750257}
 --- !u!70 &1879414516
--- a/Assets/ToothyV/Scenes/Hard/Lv2HardA.unity
+++ b/Assets/ToothyV/Scenes/Hard/Lv2HardA.unity
@ -1952,7 +1952,7 @@ MonoBehaviour:
  target: {fileID: 717926935}
  health: 0
  maxHealth: 100
-  damage: 20
+  damage: 11
  isBosStage2: 0
  pastaGigi: {fileID: 0}
 --- !u!70 &1879414516
--- a/Assets/ToothyV/Scenes/Hard/Lv2HardB.unity
+++ b/Assets/ToothyV/Scenes/Hard/Lv2HardB.unity
@ -2014,7 +2014,7 @@ MonoBehaviour:
  target: {fileID: 717926935}
  health: 0
  maxHealth: 100
-  damage: 10
+  damage: 7
  isBosStage2: 1
  pastaGigi: {fileID: 1313510904}
 --- !u!70 &1879414516
--- a/Assets/ToothyV/Scenes/Hard/Lv3HardA.unity
+++ b/Assets/ToothyV/Scenes/Hard/Lv3HardA.unity
@ -1952,7 +1952,7 @@ MonoBehaviour:
  target: {fileID: 717926935}
  health: 0
  maxHealth: 100
-  damage: 20
+  damage: 11
  isBosStage2: 0
  pastaGigi: {fileID: 0}
 --- !u!70 &1879414516
--- a/Assets/ToothyV/Scenes/Hard/Lv3HardB.unity
+++ b/Assets/ToothyV/Scenes/Hard/Lv3HardB.unity
@ -2014,7 +2014,7 @@ MonoBehaviour:
  target: {fileID: 717926935}
  health: 0
  maxHealth: 100
-  damage: 10
+  damage: 7
  isBosStage2: 1
  pastaGigi: {fileID: 241854646}
 --- !u!70 &1879414516
--- a/Assets/ToothyV/Scenes/Medium/Lv1MediumA.unity
+++ b/Assets/ToothyV/Scenes/Medium/Lv1MediumA.unity
@ -1952,7 +1952,7 @@ MonoBehaviour:
  target: {fileID: 717926935}
  health: 0
  maxHealth: 100
-  damage: 20
+  damage: 15
  isBosStage2: 0
  pastaGigi: {fileID: 0}
 --- !u!70 &1879414516
--- a/Assets/ToothyV/Scenes/Medium/Lv2MediumA.unity
+++ b/Assets/ToothyV/Scenes/Medium/Lv2MediumA.unity
@ -1952,7 +1952,7 @@ MonoBehaviour:
  target: {fileID: 717926935}
  health: 0
  maxHealth: 100
-  damage: 20
+  damage: 15
  isBosStage2: 0
  pastaGigi: {fileID: 0}
 --- !u!70 &1879414516
--- a/Assets/ToothyV/Scenes/Medium/Lv3MediumA.unity
+++ b/Assets/ToothyV/Scenes/Medium/Lv3MediumA.unity
@ -1952,7 +1952,7 @@ MonoBehaviour:
  target: {fileID: 717926935}
  health: 0
  maxHealth: 100
-  damage: 20
+  damage: 15
  isBosStage2: 0
  pastaGigi: {fileID: 0}
 --- !u!70 &1879414516
--- a/Assets/ToothyV/Scripts/AuntMenu.cs
+++ b/Assets/ToothyV/Scripts/AuntMenu.cs
@ -1,3 +1,5 @@
+using System;
+using System.Collections;
 using System.Threading.Tasks;
 using TMPro;
 using Unity.Services.Authentication;
@ -6,6 +8,7 @@ using UnityEngine;

 public class AuntMenu : Menu<AuntMenu>
 {
+    [SerializeField] private GameObject loadingScreen;
    [Header("Register")] 
    [SerializeField] private TMP_InputField usernameFieldRegister;
    [SerializeField] private TMP_InputField nameFieldRegister;
@ -35,6 +38,18 @@ public class AuntMenu : Menu<AuntMenu>
        
    }

+    private void Start()
+    {
+        StartCoroutine(LoadingScreen());
+    }
+
+    IEnumerator LoadingScreen()
+    {
+        loadingScreen.SetActive(true);
+        yield return new WaitForSeconds(2);
+        loadingScreen.SetActive(false);
+    }
+
    private void OnDisable()
    {
        AuthenticationService.Instance.SignedIn -= NextToMenu;
--- a/Assets/ToothyV/Scripts/PastaGigi.cs
+++ b/Assets/ToothyV/Scripts/PastaGigi.cs
@ -1,3 +1,4 @@
+using System.Collections;
 using UnityEngine;
 using UnityEngine.EventSystems;

@ -8,29 +9,18 @@ public class PastaGigi : MonoBehaviour
    private void OnEnable()
    {
        enemy = FindObjectOfType<Enemy>();
+        StartCoroutine(LifeTimePowerUp());
    }
    
+    IEnumerator LifeTimePowerUp()
+    {
+        yield return new WaitForSeconds(2f);
+        AddDamage();
+    }
    public void AddDamage()
    {
        enemy.damage += 20;
        Destroy(gameObject);
    }
    
-    void Update()
-    {
-        if (Input.GetMouseButtonDown(0)) // Klik kiri mouse
-        {
-            Vector2 worldPoint = Camera.main.ScreenToWorldPoint(Input.mousePosition);
-            RaycastHit2D hit = Physics2D.Raycast(worldPoint, Vector2.zero);
-
-            if (hit.collider != null)
-            {
-                PastaGigi pasta = hit.collider.GetComponent<PastaGigi>();
-                if (pasta != null)
-                {
-                    pasta.AddDamage();
-                }
-            }
-        }
-    }
 }
--- a/Assets/ToothyV/Scripts/UI/MainMenu.cs
+++ b/Assets/ToothyV/Scripts/UI/MainMenu.cs
@ -9,12 +9,6 @@ public class MainMenu : Menu<MainMenu>
    private void Start()
    {
        audioController.Instance.PlayBGM("Background Music", 0.5f);
-        StartCoroutine(LoadingScreen());
-    }
-
-    IEnumerator LoadingScreen()
-    {
-        yield return new WaitForSeconds(1);
    }

    public void OnPlayPressed()