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

SearchForNext Overhaul

Browse Source
This commit is contained in:
juliuse98
2021-11-29 12:21:32 +01:00
parent 59ff72d498
commit cf5d47eca9
4 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/Player/PlayerController.cs
View File

@@ -124,8 +124,6 @@ public class PlayerController : NetworkBehaviour
if(isGrounded && velocity.y < -fallDamageSpeed)
{
Debug.Log(velocity.y);
Debug.Log("Fall Damage");
CmdFallDamage((int)Mathf.Abs(velocity.y));
}

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

@@ -27,13 +27,15 @@ public class WeaponManager : NetworkBehaviour
if (isLocalPlayer) {
if (Input.GetAxis("Mouse ScrollWheel") > 0f) { // Scroll up
lastWeaponIndex = currentWeaponIndex;
activeWeapons[currentWeaponIndex].SetActive(false);
switchWeapon(-1);
}
else if (Input.GetAxis("Mouse ScrollWheel") < 0f) { // Scroll down
lastWeaponIndex = currentWeaponIndex;
activeWeapons[currentWeaponIndex].SetActive(false);
switchWeapon(1);
}
activeWeapons[currentWeaponIndex].SetActive(true);
if (Input.GetButtonDown("Interact")) { // e
PickupWeapon();
@@ -41,6 +43,7 @@ public class WeaponManager : NetworkBehaviour
if (activeWeapons[currentWeaponIndex] != null) {
dropWeapon(); // Throws weapon away
switchWeapon(1);
activeWeapons[currentWeaponIndex].SetActive(true);
}
}
}
@@ -48,21 +51,46 @@ public class WeaponManager : NetworkBehaviour
private bool switchWeapon(int direction) {
int nextActive = searchForNext(activeWeapons, lastWeaponIndex, direction);
if (nextActive != -1) { // -1 no next found
currentWeaponIndex = nextActive;
activeWeapons[currentWeaponIndex].SetActive(true);
procedualAnimationController.OnSwitchWeapon(activeWeapons[currentWeaponIndex]);
shoot.setWeapon(activeWeapons[currentWeaponIndex]);
Weapon weaponData = activeWeapons[currentWeaponIndex].GetComponent<Weapon>();
procedualAnimationController.GunRightHandREF = weaponData.GunRightREF;
procedualAnimationController.GunLeftHandREF = weaponData.GunLeftREF;
// play weapon switch animation
}
return false;
}
private int searchForNext(List<GameObject> l, int lastActive = 0, int direction = 1) {
private int searchForNext(List<GameObject> l, int lastActive = 0, int direction = 1)
{
int current = lastActive + direction;
for (int trys = 0; trys < l.Count; trys++)
{
//Check if you are at the start or end of the list and loop around accordingly
if (current < 0) current = l.Count - 1;
else if (current >= l.Count) current = 0;
//Check if in the current position is a gun or not
if (l[current] != null)
{
return current;
}
//if there is no gun go to the next
current = current + direction;
}
//If no next gun can be found return the index of the gun that was already selected
return lastActive;
}
private int searchForNextOld(List<GameObject> l, int lastActive = 0, int direction = 1) {
int size = l.Count;
bool condition = true;
int counter = 0;