Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ MonoBehaviour:
- OnHit
- Turbo
- FireMissile
- StartChargingMissile
DisableAutoOpenWizard: 1
ShowSettings: 0
DevRegionSetOnce: 0
50 changes: 30 additions & 20 deletions Assets/Scripts/Gameplay/Tank/TankShooting.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class TankShooting : MonoBehaviour

private float currentLaunchForce;
private float chargeSpeed;
private bool fired;
private bool isChargingMissile;

private void OnEnable()
{
Expand All @@ -41,12 +41,24 @@ private void Start()

private void Update()
{
UpdateMissileCharge();

if (!photonView.IsMine) return;

TryFireMissile();
TryFireHomingMissile();
}

private void UpdateMissileCharge()
{
aimSlider.value = minLaunchForce;

if (!isChargingMissile) return;

currentLaunchForce += chargeSpeed * Time.deltaTime;
aimSlider.value = currentLaunchForce;
}

private void TryFireHomingMissile()
{
if (!Input.GetButtonDown(HOMING_MISSILE_BUTTON)) return;
Expand Down Expand Up @@ -86,50 +98,48 @@ private bool GetClickPosition(out Vector3 clickPos)

private void TryFireMissile()
{
aimSlider.value = minLaunchForce;

if (currentLaunchForce >= maxLaunchForce && !fired)
if (currentLaunchForce >= maxLaunchForce && isChargingMissile)
{
currentLaunchForce = maxLaunchForce;
FireMissile();
}
else if (Input.GetButtonDown(FIRE_BUTTON))
{
fired = false;
currentLaunchForce = minLaunchForce;

shootingAudio.clip = chargingClip;
shootingAudio.Play();
}
else if (Input.GetButton(FIRE_BUTTON) && !fired)
{
currentLaunchForce += chargeSpeed * Time.deltaTime;

aimSlider.value = currentLaunchForce;
photonView.RPC(nameof(StartChargingMissile), RpcTarget.All);
}
else if (Input.GetButtonUp(FIRE_BUTTON) && !fired)
else if (Input.GetButtonUp(FIRE_BUTTON) && isChargingMissile)
{
FireMissile();
}
}

private void FireMissile()
[PunRPC]
private void StartChargingMissile()
{
fired = true;
isChargingMissile = true;
currentLaunchForce = minLaunchForce;

shootingAudio.clip = chargingClip;
shootingAudio.Play();
}


private void FireMissile()
{
photonView.RPC(
nameof(FireMissile),
RpcTarget.All,
fireTransform.position,
fireTransform.rotation,
currentLaunchForce * fireTransform.forward);

currentLaunchForce = minLaunchForce;
}

[PunRPC]
private void FireMissile(Vector3 position, Quaternion rotation, Vector3 velocity)
{
isChargingMissile = false;
currentLaunchForce = minLaunchForce;

Rigidbody shellInstance = Instantiate(shell, position, rotation);
shellInstance.velocity = velocity;

Expand Down