Merge branch 'master' of https://gitlab.informatika.org/moonawar/if3210-2024-unity-ngk

Assets/Scenes/Abil's/MainMenu.unity.meta

+fileFormatVersion: 2
+guid: a9bb3b0b730dca946b5b3037c90a21bc
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/MainMenu.unity.meta

+fileFormatVersion: 2
+guid: 7459c871b99894cc9b1d7c309a50946e
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Cutscene/TimelineManager.cs

@@ -27,15 +27,15 @@ public class TimelineManager : MonoBehaviour
             return;
         }
 
-    }
-
-    protected virtual void Start() {
         for (int i = 0; i < markCount; i++)
         {
             marks.Add(i * framePerMark);
         }
     }
 
+    protected virtual void Start() {
+    }
+
     public void InstanlyMoveToNextMark()
     {
         if (currentMarkIndex + 1 < marks.Count)

Assets/Scripts/Main Scene/MainSceneController.cs

@@ -109,7 +109,7 @@ public class MainSceneController : MonoBehaviour
         questManager = managers.GetComponent<QuestManager>();
 
         gamePlayUI = GameObject.Find("Gameplay UI");
-        gamePlayUI.SetActive(false);
+        // gamePlayUI.SetActive(false);
     }
     void Update()
     {

Assets/Scripts/Quest/QuestManager.cs

@@ -84,14 +84,14 @@ public class QuestManager : MonoBehaviour
                 {
                     SpawnArea = new SpawnArea { Origin = spawnTransform, Radius = 36},
                     Mob = Keroco,
-                    MobCount = 7,
+                    MobCount = 10,
                     SpawnInterval = 5f
                 },
                 new SpawnerData
                 {
                     SpawnArea = new SpawnArea { Origin = spawnTransform, Radius = 50},
                     Mob = Thrower,
-                    MobCount = 2,
+                    MobCount = 10,
                     SpawnInterval = 30f
                 }
             }
@@ -120,7 +120,7 @@ public class QuestManager : MonoBehaviour
                 {
                     SpawnArea = new SpawnArea { Origin = spawnTransform, Radius = 36},
                     Mob = General,
-                    MobCount = 5,
+                    MobCount = 6,
                     SpawnInterval = 2f
                 },
             }

Assets/Scripts/Shop/Shop.cs

@@ -57,9 +57,10 @@ public class Shop : MonoBehaviour
     public void SpawnAllPets(List<int> spawnedPets) {
         foreach (int pet in spawnedPets) {
             if (pet == 0) {
-                petSpawner.SpawnJavier();
+                BuyJavier();
             } else if (pet == 1) {
                 petSpawner.SpawnBagas();
+                BuyBagas();
             }
         }
     }