diff --git a/Assets/Scenes/Quest.unity b/Assets/Scenes/Quest.unity
index 9b67835daf5a41c0f467921bfb2b7f00b21be7a6..f7099db2c76d280e771b49e39bc8a4e61fe65eac 100644
--- a/Assets/Scenes/Quest.unity
+++ b/Assets/Scenes/Quest.unity
@@ -945,7 +945,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2145307755}
- m_RootOrder: 7
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -1281,7 +1281,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2145307755}
- m_RootOrder: 13
+ m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -1561,7 +1561,7 @@ RectTransform:
m_Children:
- {fileID: 535099969}
m_Father: {fileID: 2145307755}
- m_RootOrder: 9
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2260,7 +2260,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2145307755}
- m_RootOrder: 5
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -3000,7 +3000,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2145307755}
- m_RootOrder: 10
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -10223,7 +10223,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2145307755}
- m_RootOrder: 6
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -10409,7 +10409,7 @@ RectTransform:
- {fileID: 2053406481}
- {fileID: 1009634668}
m_Father: {fileID: 2145307755}
- m_RootOrder: 8
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -10841,7 +10841,7 @@ RectTransform:
- {fileID: 845113956}
- {fileID: 520206062}
m_Father: {fileID: 2145307755}
- m_RootOrder: 4
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -11080,99 +11080,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0c9cc319abb8ef1419bdfa93964b83c0, type: 3}
---- !u!1 &1565704978
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1565704979}
- - component: {fileID: 1565704981}
- - component: {fileID: 1565704980}
- - component: {fileID: 1565704982}
- m_Layer: 5
- m_Name: Score
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1565704979
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1565704978}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 2145307755}
- m_RootOrder: 3
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 1}
- m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: 0, y: -90}
- m_SizeDelta: {x: 295, y: 75}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1565704980
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1565704978}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 0
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_FontData:
- m_Font: {fileID: 12800000, guid: 46238fb1ad7a7a84ba8954c1c860994c, type: 3}
- m_FontSize: 57
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 10
- m_MaxSize: 84
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 0
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: New Text
---- !u!222 &1565704981
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1565704978}
- m_CullTransparentMesh: 1
---- !u!114 &1565704982
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1565704978}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 86e378bc199fbd343bceabbd3a16d73e, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1 &1610099473
GameObject:
m_ObjectHideFlags: 0
@@ -11469,7 +11376,7 @@ RectTransform:
- {fileID: 1738438702}
- {fileID: 124826758}
m_Father: {fileID: 2145307755}
- m_RootOrder: 11
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -11734,7 +11641,7 @@ RectTransform:
m_Children:
- {fileID: 276396668}
m_Father: {fileID: 2145307755}
- m_RootOrder: 12
+ m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -12905,7 +12812,6 @@ RectTransform:
- {fileID: 556587519}
- {fileID: 167059736}
- {fileID: 2081210583}
- - {fileID: 1565704979}
- {fileID: 1495738172}
- {fileID: 454507866}
- {fileID: 1233385368}
diff --git a/Assets/Scripts/Boss/ElementalHealth.cs b/Assets/Scripts/Boss/ElementalHealth.cs
index cf626562b30eaa60a30349c5a5758f002461dc70..aba84924b3b0c69b69fada4c0d84b43103e142ad 100644
--- a/Assets/Scripts/Boss/ElementalHealth.cs
+++ b/Assets/Scripts/Boss/ElementalHealth.cs
@@ -72,7 +72,6 @@ public class ElementalHealth : MonoBehaviour, IEnemyHealthHandler
GetComponent<UnityEngine.AI.NavMeshAgent>().enabled = false;
GetComponent<Rigidbody>().isKinematic = true;
GameControl.control.currency += 50;
- ScoreManager.score += scoreValue;
StartCoroutine(GameControl.control.StartFade(enemyAudio, 2f, 0f, gameObject));
}
}
diff --git a/Assets/Scripts/Enemy/EnemyHealth.cs b/Assets/Scripts/Enemy/EnemyHealth.cs
index 7174196242dec53cb9edb5c6a0ed5b01f080c41d..fbf05ce49f3aabef2da6a1de946d24a630a5aff2 100644
--- a/Assets/Scripts/Enemy/EnemyHealth.cs
+++ b/Assets/Scripts/Enemy/EnemyHealth.cs
@@ -101,7 +101,6 @@ public class EnemyHealth : MonoBehaviour, IEnemyHealthHandler
isSinking = true;
if (!GameControl.control.motherLoadOn)
GameControl.control.currency += 5;
- ScoreManager.score += scoreValue;
Destroy(gameObject, 2f);
}
}