diff --git a/Assets/Scenes/PlayerAttribute.unity b/Assets/Scenes/PlayerAttribute.unity index 124f446006c8fec97c6dc7d4ca64e72ae57e5e78..0ca8e80814d8a2a0bdfe6d803db64a5dce9fdd8c 100644 --- a/Assets/Scenes/PlayerAttribute.unity +++ b/Assets/Scenes/PlayerAttribute.unity @@ -3512,6 +3512,11 @@ PrefabInstance: propertyPath: upgradeImage value: objectReference: {fileID: 248738325} + - target: {fileID: 8665781967449119952, guid: fd16b34ad2dca9f44a94fad4ea111362, + type: 3} + propertyPath: startingPower + value: 25 + objectReference: {fileID: 0} - target: {fileID: 8665781967449217581, guid: fd16b34ad2dca9f44a94fad4ea111362, type: 3} propertyPath: m_Name diff --git a/Assets/Scripts/Player/PlayerHealth.cs b/Assets/Scripts/Player/PlayerHealth.cs index d4392223edbb8576ed19c7724aa195c58fff15e3..bab08e43b64d9edb9ac78504587a95e23ef55ce7 100644 --- a/Assets/Scripts/Player/PlayerHealth.cs +++ b/Assets/Scripts/Player/PlayerHealth.cs @@ -14,7 +14,6 @@ public class PlayerHealth : MonoBehaviour public float flashSpeed = 5f; public Color flashColour = new Color(1f, 0f, 0f, 0.1f); - Animator anim; AudioSource playerAudio; PlayerMovement playerMovement; diff --git a/Assets/Scripts/Player/PlayerPower.cs b/Assets/Scripts/Player/PlayerPower.cs index c342e4994e70934ebcc3ee1366c2ae863f9c5a4e..ab5adbd240a7c81449ac9eccf40592ee51ac96ed 100644 --- a/Assets/Scripts/Player/PlayerPower.cs +++ b/Assets/Scripts/Player/PlayerPower.cs @@ -6,7 +6,7 @@ using UnityEngine.SceneManagement; public class PlayerPower : MonoBehaviour { - public float startingPower = 12.5f; + public float startingPower = 25f; public float currentPower; public Slider powerSlider; public Image upgradeImage; @@ -21,7 +21,6 @@ public class PlayerPower : MonoBehaviour bool fullPower; bool upgraded; - void Awake() { // Mendapatkan reference komponen @@ -37,6 +36,9 @@ public class PlayerPower : MonoBehaviour { if (upgraded) { + float powerFactor = (currentPower - 12.5f) / 12.5f * 5; + playerShooting.damagePerShot += (int)powerFactor; + // Merubah warna gambar menjadi value dari flashColour upgradeImage.color = flashColour; playerAudio.clip = pickUpClip; diff --git a/Assets/Scripts/Player/PlayerShooting.cs b/Assets/Scripts/Player/PlayerShooting.cs index ebd9aaf206967e9a8c7b15e07c4d6d4da282c9bc..967e50293cc3918746a3892c6d89f9abd358772c 100644 --- a/Assets/Scripts/Player/PlayerShooting.cs +++ b/Assets/Scripts/Player/PlayerShooting.cs @@ -14,7 +14,9 @@ public class PlayerShooting : MonoBehaviour LineRenderer gunLine; AudioSource gunAudio; Light gunLight; - float effectsDisplayTime = 0.2f; + float effectsDisplayTime = 0.2f; + + PlayerPower playerPower; void Awake() { diff --git a/Assets/Scripts/Player/PlayerSpeed.cs b/Assets/Scripts/Player/PlayerSpeed.cs index fef7d3e61c3891eee9753b4eb57b90d6e1473002..ed62e987bc83d27c101354af7588992674495d24 100644 --- a/Assets/Scripts/Player/PlayerSpeed.cs +++ b/Assets/Scripts/Player/PlayerSpeed.cs @@ -6,7 +6,7 @@ using UnityEngine.SceneManagement; public class PlayerSpeed : MonoBehaviour { - public float startingSpeed = 25f; + public float startingSpeed = 12.5f; public float currentSpeed; public Slider speedSlider; public Image upgradeImage;