From 1d33c9af36c0e2e7ff5af540601fd64d572baf8a Mon Sep 17 00:00:00 2001
From: afifahfq <afifahfq@gmail.com>
Date: Thu, 7 Apr 2022 14:25:24 +0700
Subject: [PATCH] connect player power to shooting
---
Assets/Scenes/PlayerAttribute.unity | 5 +++++
Assets/Scripts/Player/PlayerHealth.cs | 1 -
Assets/Scripts/Player/PlayerPower.cs | 6 ++++--
Assets/Scripts/Player/PlayerShooting.cs | 4 +++-
Assets/Scripts/Player/PlayerSpeed.cs | 2 +-
5 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/Assets/Scenes/PlayerAttribute.unity b/Assets/Scenes/PlayerAttribute.unity
index 124f446..0ca8e80 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 d439222..bab08e4 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 c342e49..ab5adbd 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 ebd9aaf..967e502 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 fef7d3e..ed62e98 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;
--
GitLab