janis/defrain-shooter-unity
1
0
Fork 0
mirror of https://github.com/DerTyp7/defrain-shooter-unity.git synced 2025-10-29 20:52:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Weapon Switch/Standard Hand

Browse Source 
ja alles irgendwie
klappt jetzt
This commit is contained in:
Noah4ever
2021-11-25 11:24:16 +01:00
parent a5fef8f5e0
commit c09ff3ca75
11 changed files with 580 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Assets/Scripts/Player/ProcedualAnimationController.cs
View File

@@ -30,8 +30,8 @@ public class ProcedualAnimationController : NetworkBehaviour
[SerializeField] private float currentCameraRecoilX = 0f;
[SerializeField] private float currentCameraRecoilY = 0f;
[Header("GameObjects")]
[SerializeField] private GameObject gun; // The gun object with the animator on it.
[SerializeField] private GameObject gunHolder;
[SerializeField] private WeaponManager weaponManager;
[Header("General Settings")]
@@ -94,15 +94,14 @@ public class ProcedualAnimationController : NetworkBehaviour
public Quaternion[] rotationMod = new Quaternion[3];
public void OnSwitchWeapon(float fireRate)
public void OnSwitchWeapon(GameObject currentWeapon)
{
if (isLocalPlayer)
{
//gun = newGun;
gunAnimator = gun.GetComponent<Animator>();
gunAnimator.SetFloat("ShootSpeed", 1f / (60f / fireRate));
//startPos = gunPositionObj.transform.localPosition;
//startRot = gunRotationObj.transform.localRotation.eulerAngles;
if (isLocalPlayer) {
if(currentWeapon != null) {
gunHolder = currentWeapon;
gunAnimator = currentWeapon.GetComponent<Weapon>().WeaponAnimator;
gunAnimator.SetFloat("ShootSpeed", 1f / (60f / currentWeapon.GetComponent<Weapon>().Firerate));
}
}
}