cleanup warnings

This commit is contained in:
Mister_Nebula 2021-03-06 13:00:28 +00:00
parent 3d1c6e02cf
commit 4b80456b31
7 changed files with 23 additions and 26 deletions

View File

@ -23,9 +23,9 @@ namespace QSB.Animation
private CrouchSync _crouchSync;
private RuntimeAnimatorController _chertController;
private readonly RuntimeAnimatorController _eskerController;
private readonly RuntimeAnimatorController _feldsparController;
private readonly RuntimeAnimatorController _gabbroController;
//private readonly RuntimeAnimatorController _eskerController;
//private readonly RuntimeAnimatorController _feldsparController;
//private readonly RuntimeAnimatorController _gabbroController;
private RuntimeAnimatorController _riebeckController;
public AnimatorMirror Mirror { get; private set; }
@ -210,15 +210,15 @@ namespace QSB.Animation
break;
case AnimationType.Esker:
controller = _eskerController;
//controller = _eskerController;
break;
case AnimationType.Feldspar:
controller = _feldsparController;
//controller = _feldsparController;
break;
case AnimationType.Gabbro:
controller = _gabbroController;
//controller = _gabbroController;
break;
case AnimationType.Riebeck:

View File

@ -19,12 +19,12 @@ namespace QSB.Instruments
_rootObj = root;
gameObject.AddComponent<CameraManager>();
QSBInputManager.ChertTaunt += OnChertTaunt;
QSBInputManager.EskerTaunt += OnEskerTaunt;
QSBInputManager.FeldsparTaunt += OnFeldsparTaunt;
QSBInputManager.GabbroTaunt += OnGabbroTaunt;
QSBInputManager.RiebeckTaunt += OnRiebeckTaunt;
QSBInputManager.ExitTaunt += ReturnToPlayer;
//QSBInputManager.ChertTaunt += OnChertTaunt;
//QSBInputManager.EskerTaunt += OnEskerTaunt;
//QSBInputManager.FeldsparTaunt += OnFeldsparTaunt;
//QSBInputManager.GabbroTaunt += OnGabbroTaunt;
//QSBInputManager.RiebeckTaunt += OnRiebeckTaunt;
//QSBInputManager.ExitTaunt += ReturnToPlayer;
QSBCore.Helper.Events.Unity.RunWhen(() => Locator.GetPlayerBody() != null, SetupInstruments);
}
@ -42,12 +42,12 @@ namespace QSB.Instruments
{
return;
}
QSBInputManager.ChertTaunt -= OnChertTaunt;
QSBInputManager.EskerTaunt -= OnEskerTaunt;
QSBInputManager.FeldsparTaunt -= OnFeldsparTaunt;
QSBInputManager.GabbroTaunt -= OnGabbroTaunt;
QSBInputManager.RiebeckTaunt -= OnRiebeckTaunt;
QSBInputManager.ExitTaunt -= ReturnToPlayer;
//QSBInputManager.ChertTaunt -= OnChertTaunt;
//QSBInputManager.EskerTaunt -= OnEskerTaunt;
//QSBInputManager.FeldsparTaunt -= OnFeldsparTaunt;
//QSBInputManager.GabbroTaunt -= OnGabbroTaunt;
//QSBInputManager.RiebeckTaunt -= OnRiebeckTaunt;
//QSBInputManager.ExitTaunt -= ReturnToPlayer;
}
private void OnChertTaunt() => StartInstrument(AnimationType.Chert);

View File

@ -313,7 +313,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="OWML">
<Version>1.1.7</Version>
<Version>1.1.8</Version>
</PackageReference>
</ItemGroup>
<ItemGroup />

View File

@ -5,6 +5,8 @@ namespace QSB
{
public class QSBInputManager : MonoBehaviour
{
// TODO : finish instruments - disabled for 0.7.0 release
/*
public static event Action ChertTaunt;
public static event Action EskerTaunt;
public static event Action RiebeckTaunt;
@ -12,8 +14,6 @@ namespace QSB
public static event Action FeldsparTaunt;
public static event Action ExitTaunt;
// TODO : finish instruments - disabled for 0.7.0 release
/*
public void Update()
{
if (Input.GetKey(KeyCode.T))

View File

@ -45,7 +45,7 @@ namespace QSB
private GameObject _probePrefab;
private bool _everConnected;
public void Awake()
public new void Awake()
{
base.Awake();
Instance = this;

View File

@ -7,10 +7,7 @@ namespace Popcron
{
private static string _prefsKey = null;
private static int? _bufferSize = null;
private static bool? _enabled = null;
private static float? _dashGap = null;
private static bool? _cull = null;
private static int? _pass = null;
private static Vector3? _offset = null;
private static Vector3[] buffer = new Vector3[BufferSize];

View File

@ -5,5 +5,5 @@
"description": "Adds online multiplayer to the game.",
"uniqueName": "Raicuparta.QuantumSpaceBuddies",
"version": "0.9.0",
"owmlVersion": "1.1.7"
"owmlVersion": "1.1.8"
}