From 642aad795ac1d3a70ab5b0b0f1360707698e98f2 Mon Sep 17 00:00:00 2001 From: Mister_Nebula <41904486+misternebula@users.noreply.github.com> Date: Sun, 4 Jul 2021 19:10:50 +0100 Subject: [PATCH] remove logs --- QSB/ProbeSync/Events/PlayerProbeEvent.cs | 2 -- QSB/ProbeSync/ProbeListener.cs | 37 +++++++----------------- QSB/ProbeSync/QSBProbe.cs | 10 ++++--- QSB/ProbeSync/QSBProbeEffects.cs | 18 ++++-------- QSB/ProbeSync/QSBProbeLantern.cs | 14 ++------- QSB/ProbeSync/QSBProbeSpotlight.cs | 5 ---- QSB/Tools/PlayerToolsManager.cs | 1 - 7 files changed, 25 insertions(+), 62 deletions(-) diff --git a/QSB/ProbeSync/Events/PlayerProbeEvent.cs b/QSB/ProbeSync/Events/PlayerProbeEvent.cs index 062d48f2..56712a8e 100644 --- a/QSB/ProbeSync/Events/PlayerProbeEvent.cs +++ b/QSB/ProbeSync/Events/PlayerProbeEvent.cs @@ -33,8 +33,6 @@ namespace QSB.ProbeSync.Events public override void OnReceiveRemote(bool server, EnumMessage message) { - DebugLog.DebugWrite($"recieve probe event type:{message.EnumValue} from:{message.AboutId}"); - var player = QSBPlayerManager.GetPlayer(message.AboutId); var probe = player.Probe; diff --git a/QSB/ProbeSync/ProbeListener.cs b/QSB/ProbeSync/ProbeListener.cs index a3e0748c..5f529140 100644 --- a/QSB/ProbeSync/ProbeListener.cs +++ b/QSB/ProbeSync/ProbeListener.cs @@ -34,39 +34,24 @@ namespace QSB.ProbeSync _attachedProbe.OnStartRetrieveProbe -= OnStartRetrieveProbe; } - private void OnLaunchProbe() - { - DebugLog.DebugWrite($"LOCAL OnLaunchProbe"); - QSBEventManager.FireEvent(EventNames.QSBProbeEvent, ProbeEvent.Launch); - } + private void OnLaunchProbe() + => QSBEventManager.FireEvent(EventNames.QSBProbeEvent, ProbeEvent.Launch); - private void OnAnchorProbe() - { - DebugLog.DebugWrite($"LOCAL OnAnchorProbe"); - QSBEventManager.FireEvent(EventNames.QSBProbeEvent, ProbeEvent.Anchor); - } + private void OnAnchorProbe() + => QSBEventManager.FireEvent(EventNames.QSBProbeEvent, ProbeEvent.Anchor); - private void OnUnanchorProbe() - { - DebugLog.DebugWrite($"LOCAL OnUnanchorProbe"); - QSBEventManager.FireEvent(EventNames.QSBProbeEvent, ProbeEvent.Unanchor); - } + private void OnUnanchorProbe() + => QSBEventManager.FireEvent(EventNames.QSBProbeEvent, ProbeEvent.Unanchor); - private void OnRetrieveProbe() - { - DebugLog.DebugWrite($"LOCAL OnRetrieveProbe"); - QSBEventManager.FireEvent(EventNames.QSBProbeEvent, ProbeEvent.Retrieve); - } + private void OnRetrieveProbe() + => QSBEventManager.FireEvent(EventNames.QSBProbeEvent, ProbeEvent.Retrieve); - private void OnProbeDestroyed() - { - DebugLog.DebugWrite($"LOCAL OnProbeDestroyed"); - QSBEventManager.FireEvent(EventNames.QSBProbeEvent, ProbeEvent.Destroy); - } + private void OnProbeDestroyed() + => QSBEventManager.FireEvent(EventNames.QSBProbeEvent, ProbeEvent.Destroy); private void OnStartRetrieveProbe(float length) { - DebugLog.DebugWrite($"LOCAL OnStartRetrieveProbe length:{length}"); + } } } diff --git a/QSB/ProbeSync/QSBProbe.cs b/QSB/ProbeSync/QSBProbe.cs index da6427f2..8600621e 100644 --- a/QSB/ProbeSync/QSBProbe.cs +++ b/QSB/ProbeSync/QSBProbe.cs @@ -38,7 +38,6 @@ namespace QSB.ProbeSync break; } - DebugLog.DebugWrite($"OnLaunchProbe"); OnLaunchProbe(); break; case ProbeEvent.Anchor: @@ -48,7 +47,6 @@ namespace QSB.ProbeSync break; } - DebugLog.DebugWrite($"OnAnchorProbe"); OnAnchorProbe(); break; case ProbeEvent.Unanchor: @@ -62,11 +60,15 @@ namespace QSB.ProbeSync break; } - DebugLog.DebugWrite($"OnRetrieveProbe"); OnRetrieveProbe(); break; case ProbeEvent.Destroy: - DebugLog.DebugWrite($"OnDestroyProbe"); + if (OnProbeDestroyed == null) + { + DebugLog.ToConsole($"Warning - OnProbeDestroyed is null!", OWML.Common.MessageType.Warning); + break; + } + OnProbeDestroyed(); break; case ProbeEvent.Invalid: diff --git a/QSB/ProbeSync/QSBProbeEffects.cs b/QSB/ProbeSync/QSBProbeEffects.cs index a8d52c7b..e911a465 100644 --- a/QSB/ProbeSync/QSBProbeEffects.cs +++ b/QSB/ProbeSync/QSBProbeEffects.cs @@ -15,7 +15,6 @@ namespace QSB.ProbeSync private void Awake() { - DebugLog.DebugWrite("Awake"); _probe = Resources.FindObjectsOfTypeAll().First(x => gameObject.transform.IsChildOf(x.transform)); if (_probe == null) { @@ -36,10 +35,7 @@ namespace QSB.ProbeSync _probe.OnStartRetrieveProbe -= OnStartRetrieve; } - private void OnLaunch() - { - _flightLoopAudio.FadeIn(0.1f, true, true, 1f); - } + private void OnLaunch() => _flightLoopAudio.FadeIn(0.1f, true, true, 1f); private void OnAnchor() { @@ -57,14 +53,10 @@ namespace QSB.ProbeSync _anchorAudio.PlayOneShot(AudioType.ToolProbeAttach, 1f); } - private void OnUnanchor() - { - _flightLoopAudio.FadeIn(0.5f, false, false, 1f); - } + private void OnUnanchor() + => _flightLoopAudio.FadeIn(0.5f, false, false, 1f); - private void OnStartRetrieve(float retrieveLength) - { - _flightLoopAudio.FadeOut(retrieveLength, OWAudioSource.FadeOutCompleteAction.STOP, 0f); - } + private void OnStartRetrieve(float retrieveLength) + => _flightLoopAudio.FadeOut(retrieveLength, OWAudioSource.FadeOutCompleteAction.STOP, 0f); } } diff --git a/QSB/ProbeSync/QSBProbeLantern.cs b/QSB/ProbeSync/QSBProbeLantern.cs index c901272c..7590b574 100644 --- a/QSB/ProbeSync/QSBProbeLantern.cs +++ b/QSB/ProbeSync/QSBProbeLantern.cs @@ -22,7 +22,6 @@ namespace QSB.ProbeSync private void Awake() { - DebugLog.DebugWrite($"Awake"); _probe = Resources.FindObjectsOfTypeAll().First(x => gameObject.transform.IsChildOf(x.transform)); if (_probe == null) { @@ -37,7 +36,6 @@ namespace QSB.ProbeSync private void Start() { - DebugLog.DebugWrite($"Start"); if (_emissiveRenderer != null) { _emissiveRenderer.SetEmissiveScale(0f); @@ -50,7 +48,6 @@ namespace QSB.ProbeSync private void OnDestroy() { - DebugLog.DebugWrite($"OnDestroy"); _probe.OnAnchorProbe -= OnProbeAnchorToSurface; _probe.OnStartRetrieveProbe -= OnStartRetrieveProbe; _probe.OnRetrieveProbe -= OnFinishRetrieveProbe; @@ -86,7 +83,6 @@ namespace QSB.ProbeSync private void FadeTo(float fade, float duration) { - DebugLog.DebugWrite($"Fade to {fade} in {duration}"); _startFadeTime = Time.time; _fadeDuration = duration; _startFade = _fadeFraction; @@ -96,7 +92,7 @@ namespace QSB.ProbeSync private void OnProbeAnchorToSurface() { - DebugLog.DebugWrite($"OnProbeAnchorToSurface"); + //TODO : look at this //if (!_probe.IsRetrieving()) //{ _light.GetLight().enabled = true; @@ -105,15 +101,11 @@ namespace QSB.ProbeSync //} } - private void OnStartRetrieveProbe(float retrieveLength) - { - DebugLog.DebugWrite($"OnStartRetrieveProbe"); - FadeTo(0f, retrieveLength); - } + private void OnStartRetrieveProbe(float retrieveLength) + => FadeTo(0f, retrieveLength); private void OnFinishRetrieveProbe() { - DebugLog.DebugWrite($"OnFinishRetrieveProbe"); _light.GetLight().enabled = false; _light.range = 0f; _fadeFraction = 0f; diff --git a/QSB/ProbeSync/QSBProbeSpotlight.cs b/QSB/ProbeSync/QSBProbeSpotlight.cs index 62b0d795..545ff4c5 100644 --- a/QSB/ProbeSync/QSBProbeSpotlight.cs +++ b/QSB/ProbeSync/QSBProbeSpotlight.cs @@ -17,7 +17,6 @@ namespace QSB.ProbeSync private void Awake() { - DebugLog.DebugWrite("Awake"); _probe = Resources.FindObjectsOfTypeAll().First(x => gameObject.transform.IsChildOf(x.transform)); if (_probe == null) { @@ -35,7 +34,6 @@ namespace QSB.ProbeSync private void OnDestroy() { - DebugLog.DebugWrite("OnDestroy"); _probe.OnLaunchProbe -= OnLaunch; _probe.OnAnchorProbe -= OnAnchorOrRetrieve; _probe.OnRetrieveProbe -= OnAnchorOrRetrieve; @@ -51,7 +49,6 @@ namespace QSB.ProbeSync private void StartFadeIn() { - DebugLog.DebugWrite("StartFadeIn"); if (!enabled) { _light.GetLight().enabled = true; @@ -63,7 +60,6 @@ namespace QSB.ProbeSync private void OnLaunch() { - DebugLog.DebugWrite("OnLaunch"); if (_id == ProbeCamera.ID.Forward) { StartFadeIn(); @@ -74,7 +70,6 @@ namespace QSB.ProbeSync private void OnAnchorOrRetrieve() { - DebugLog.DebugWrite("OnAnchorOrRetrieve"); _light.GetLight().enabled = false; enabled = false; _inFlight = false; diff --git a/QSB/Tools/PlayerToolsManager.cs b/QSB/Tools/PlayerToolsManager.cs index f2ba82eb..52f23620 100644 --- a/QSB/Tools/PlayerToolsManager.cs +++ b/QSB/Tools/PlayerToolsManager.cs @@ -42,7 +42,6 @@ namespace QSB.Tools public static void CreateProbe(Transform newProbe, PlayerInfo player) { - DebugLog.DebugWrite($"Added QSBProbe"); var qsbProbe = newProbe.gameObject.AddComponent(); player.Probe = qsbProbe;