Added some stuff that belongs somewhere else

This commit is contained in:
juliuse98
2021-12-10 15:04:14 +01:00
parent cf5d47eca9
commit 8289548927
42 changed files with 5485 additions and 179 deletions

17
Assets/Scripts/Bullet.cs Normal file
View File

@@ -0,0 +1,17 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Bullet : MonoBehaviour
{
int seconds = 30;
private void Start()
{
StartCoroutine("dest");
}
IEnumerator dest()
{
yield return new WaitForSeconds(seconds);
Destroy(this);
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 6edc64fed0b209c4da9e92035149367d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -87,7 +87,6 @@ public class GameMaster : NetworkBehaviour
break;
case 3:
gameState = 0;
Debug.Log("Team died");
break;
default:
break;

View File

@@ -95,7 +95,6 @@ public class Player : NetworkBehaviour
{
isAlive = false;
AddDeaths(1);
Debug.Log("DIE");
}
//Health

View File

@@ -244,7 +244,8 @@ public class ProcedualAnimationController : NetworkBehaviour
}
void AimDownSights()
{
aimVal = gravityValue(aimVal, aimSpeed, 1, 0, isAiming);
//aimVal = gravityValue(aimVal, aimSpeed, 1, 0, isAiming);
aimVal = gravityValue(aimVal, aimSpeed, 1, 0, true);
positionMod[2] = Vector3.Lerp(HoldPoint.transform.localPosition, AimPoint.transform.localPosition, Mathf.Pow(aimVal, 1.3f));
}
void calcRecoilOffset()