Merge remote-tracking branch 'origin/main'

This commit is contained in:
Nikita Kruglickiy 2024-03-16 22:19:48 +03:00
commit adf7c5895b
3 changed files with 2 additions and 6 deletions

View File

@ -261,7 +261,7 @@ public class Interactions : NetworkBehaviour
_lightIntensity = Mathf.Lerp(_lightIntensity, (_gunSpread < Time.time) && (controller.currentEnergy >= controller.shootDepletion) ? 1f : 0f, Time.deltaTime * 5f);
if (gunLayerWeight == 1) gun.SetActive(true);
if (gunRig.weight <= 0.1) gun.SetActive(false);
if (gunRig.weight <= 0.1 || controller.currentEnergy <= 0) gun.SetActive(false);
if (gun != null)
{

View File

@ -214,10 +214,7 @@ namespace StarterAssets
{
if (Input.GetKey(KeyCode.LeftShift) && _inputMove.magnitude != 0)
{
if (currentEnergy > 0)
{
currentEnergy = Mathf.MoveTowards(currentEnergy, 0, _depletionSpeed * Time.deltaTime);
}
currentEnergy = Mathf.MoveTowards(currentEnergy, 0, _depletionSpeed * Time.deltaTime);
}
else if (currentEnergy <= _maxEnergy)
{

View File

@ -8,7 +8,6 @@ using TMPro;
public class NetworkManagerUI : MonoBehaviour
{
public NetworkManager manager;
public GameObject adressInputGO;
public TMP_InputField adressInput;
public TMP_InputField nicknameInput;
public TMP_InputField MaxPlayersInput;