diff --git a/Assets/SaveSlotMenu.cs b/Assets/SaveSlotMenu.cs
index 4e43613a310181d3633263c1a70eff55b0d55a5a..aa20adf67cc77ff57602f48ba0d533b000c4a238 100644
--- a/Assets/SaveSlotMenu.cs
+++ b/Assets/SaveSlotMenu.cs
@@ -116,7 +116,7 @@ public class SaveSlotMenu : MonoBehaviour
{
if (nameScene == "Level_01")
{
- sceneNext = "Level_02";
+ sceneNext = "ShopCutscene";
}
else if (nameScene == "Level_02")
{
diff --git a/Assets/Scenes/Level_02.unity b/Assets/Scenes/Level_02.unity
index dea36542477a711135029c1cf32e55df348b7d4e..1fdcef2ecc6b1dcf1026e2c5855d445954d93d20 100644
--- a/Assets/Scenes/Level_02.unity
+++ b/Assets/Scenes/Level_02.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.18028334, g: 0.22571328, b: 0.3069217, a: 1}
+ m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -11663,7 +11663,7 @@ MonoBehaviour:
isPetAlive: 0
isShopOpen: 1
isShopping: 0
- isEnemyActive: 1
+ isEnemyActive: 0
isBoss: 0
isMenu: 0
petFactory: {fileID: 734232483}
diff --git a/Assets/Scenes/Level_Final.unity b/Assets/Scenes/Level_Final.unity
index ef1c6273b1b672f7a99903f3a5ed1b7eaad00ee2..f0b21492ce082c4971549a6ffffd7dd9a84af229 100644
--- a/Assets/Scenes/Level_Final.unity
+++ b/Assets/Scenes/Level_Final.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.18028334, g: 0.22571328, b: 0.3069217, a: 1}
+ m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -2218,7 +2218,6 @@ RectTransform:
- {fileID: 1093198193}
- {fileID: 989723333}
- {fileID: 1232357378}
- - {fileID: 1084676478}
m_Father: {fileID: 0}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3471,6 +3470,11 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 879336556}
m_CullTransparentMesh: 1
+--- !u!1 &879706553 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 7250609702779207134, guid: 433f5e4f5f25c034daf13357456b2ad4, type: 3}
+ m_PrefabInstance: {fileID: 748860720}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &880479554 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 100006, guid: f1d84cc28597f5641a3d9cbc4df7e306, type: 3}
@@ -8872,7 +8876,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4133a988ba6a2734a94e70d74c4e9bda, type: 3}
m_Name:
m_EditorClassIdentifier:
- shopTimer: 7
+ shopTimer: 30
shopTimerUI: {fileID: 991378526}
shopUI: {fileID: 1444128283}
--- !u!114 &991378529
@@ -9339,7 +9343,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!136 &1084676475
CapsuleCollider:
m_ObjectHideFlags: 0
@@ -9412,12 +9416,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1084676474}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -512.012, y: -287.27124, z: -38.179802}
- m_LocalScale: {x: 5.991808, y: 2.3967233, z: 3.595085}
+ m_LocalPosition: {x: -0.010101318, y: 0, z: -32.079983}
+ m_LocalScale: {x: 5.034523, y: 2.0138094, z: 3.020714}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 491809538}
- m_RootOrder: 16
+ m_Father: {fileID: 0}
+ m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1093198192
GameObject:
@@ -11720,14 +11724,13 @@ MonoBehaviour:
isShopOpen: 1
isShopping: 0
isEnemyActive: 0
- isBoss: 0
isMenu: 0
petFactory: {fileID: 1713238116}
pdm: {fileID: 268888277}
currentWeapon: 0
availableWeapon: 01000000
hudManager: {fileID: 491809539}
- enemySpawner: {fileID: 989723332}
+ enemySpawner: {fileID: 879706553}
score: {fileID: 2030411490}
--- !u!114 &1644740160
MonoBehaviour:
diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs
index b1a15b7eca97fbc597a65abddab0c9b54d1979b6..82c5fd553831109fd4ef9da6fd89048439963ef3 100644
--- a/Assets/Scripts/GameManager.cs
+++ b/Assets/Scripts/GameManager.cs
@@ -18,7 +18,6 @@ public class GameManager : MonoBehaviour
public bool isShopOpen = true; // shop only open after finishing quest
public bool isShopping = false; // sedang berbelanja
public bool isEnemyActive = true;
- public bool isBoss = false;
public bool isMenu = false;
public PetFactory petFactory;
public PlayerDataManager pdm;
@@ -44,10 +43,8 @@ public class GameManager : MonoBehaviour
private void Awake()
{
- if (!isBoss) {
- enemySpawner.SetActive(isEnemyActive);
- score.SetActive(isEnemyActive);
- }
+ enemySpawner.SetActive(isEnemyActive);
+ score.SetActive(isEnemyActive);
if (gameManager == null)
{
int slot = PlayerPrefs.GetInt("activeSlot");
diff --git a/Assets/Scripts/Managers/BossQuestManager.cs b/Assets/Scripts/Managers/BossQuestManager.cs
index 7323d571fcd6419c14fa905b8612618e662fb1c1..297d6889c5aca955b5044897aae82ac319632bc6 100644
--- a/Assets/Scripts/Managers/BossQuestManager.cs
+++ b/Assets/Scripts/Managers/BossQuestManager.cs
@@ -5,21 +5,6 @@ using UnityEngine;
public class BossQuestManager : QuestManager
{
public static BossQuestManager questManager;
-
- void Awake() {
- GameManager gameManager = FindObjectOfType<GameManager>();
- gameManager.isBoss = true;
-
-
- if (questManager == null)
- {
- questManager = this;
- }
- else
- {
- Destroy(questManager);
- }
- }
void Start() {
quests[0] = GenerateQuest();
diff --git a/Assets/Scripts/Managers/QuestManager.cs b/Assets/Scripts/Managers/QuestManager.cs
index e9d6e9cd6ec78c2e7553ded27ac320efbd984827..2356aaf95dca69b957016b8922d8728e5bbc4100 100644
--- a/Assets/Scripts/Managers/QuestManager.cs
+++ b/Assets/Scripts/Managers/QuestManager.cs
@@ -26,10 +26,6 @@ public class QuestManager : MonoBehaviour
protected void Awake()
{
GameManager gameManager = FindObjectOfType<GameManager>();
- if (gameManager != null)
- {
- gameManager.isBoss = false;
- }
if (questManager == null)
{
questManager = this;
diff --git a/Assets/Scripts/Shop/ShopTrigger.cs b/Assets/Scripts/Shop/ShopTrigger.cs
index 6df5b3f8daff8ed9ca2b422ea602806ee4b6a44f..b496f9b36e741dc3aca4d0e7aaf5a058edf26537 100644
--- a/Assets/Scripts/Shop/ShopTrigger.cs
+++ b/Assets/Scripts/Shop/ShopTrigger.cs
@@ -29,9 +29,7 @@ public class ShopTrigger : MonoBehaviour
shopTimerUI.SetActive(false);
shopUI.SetActive(false);
GameManager.gameManager.isShopping = false;
- if (!GameManager.gameManager.isBoss) {
- GameManager.gameManager.TriggerSpawningEnemy();
- }
+ GameManager.gameManager.TriggerSpawningEnemy();
}
}
}