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

Grenade Fix

Browse Source 
Grenade is now a Sphere.
set Commented the [Command] on CmdFireBullet in Shoot.cs to see how it is in multiplayer
This commit is contained in:
Noah4ever
2021-12-09 13:33:54 +01:00
parent 3a1a279530
commit e59b767daf
7 changed files with 342 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/Scripts/Weapons/Shoot.cs
View File

@@ -46,10 +46,7 @@ public class Shoot : NetworkBehaviour
}
if (Input.GetButtonDown("Fire")) {
updateCanvas = true;
if(weapon.GetComponent<BoxCollider>().enabled == true) // NACH ANDERE L<>SUNG SUCHEN
{
weapon.GetComponent<BoxCollider>().enabled = false;
}
// If current weapon kind is a rifle or pistole
string weaponKindString = weapon.WeaponKind.ToString();
if(weaponKindString == "Rifle" || weaponKindString == "Pistole") {
@@ -89,7 +86,7 @@ public class Shoot : NetworkBehaviour
}
}
[Command]
// [Command]
// This code will be executed on the Server.
private void CmdFireBullet() {
ray = new Ray(mCamera.transform.position, mCamera.transform.forward); // Raycast from Camera

14
Assets/Scripts/Weapons/WeaponManager.cs
View File

@@ -104,7 +104,7 @@ public class WeaponManager : NetworkBehaviour
hit.transform.parent = gunHolster.transform; // Parent weapon to gunHolster
hit.rigidbody.isKinematic = true;
hit.rigidbody.useGravity = false;
hit.transform.GetComponent<BoxCollider>().enabled = false; // Disable Boxcollider
SetAllColliderStatus(hit.transform.gameObject, false); // Disable all Collider
switch (hit.transform.GetComponent<Weapon>().WeaponKind.ToString()) { // Adding weapon to inventory slot
case "Rifle": putWeaponInArray(0, hit); break;
case "Pistole": putWeaponInArray(1, hit); break;
@@ -139,7 +139,7 @@ public class WeaponManager : NetworkBehaviour
rigid.useGravity = true;
rigid.isKinematic = false;
rigid.velocity = cam.transform.forward * dropForce + cam.transform.up * 2;
currentWeapon.GetComponent<BoxCollider>().enabled = true;
SetAllColliderStatus(currentWeapon, true); // Activate all Collider
currentWeapon.gameObject.transform.SetParent(null);
activeWeapons[currentWeaponIndex] = null;
return true;
@@ -147,7 +147,15 @@ public class WeaponManager : NetworkBehaviour
else {
return false;
}
}
// Set status to all colliders on a gameobject
private void SetAllColliderStatus(GameObject obj, bool newStatus) {
// For every collider on gameobject
foreach(Collider col in obj.GetComponents<Collider>()) {
// set newStatus (enable, disable)
col.enabled = newStatus;
}
}
}