remove logs, fix it

This commit is contained in:
Mister_Nebula 2021-12-29 12:20:35 +00:00
parent 5a49df9061
commit eaeedd14c5
3 changed files with 19 additions and 5 deletions

View File

@ -4,6 +4,7 @@ using QSB.Utility;
using QSB.WorldSync; using QSB.WorldSync;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using UnityEngine;
namespace QSB.EyeOfTheUniverse.VesselSync namespace QSB.EyeOfTheUniverse.VesselSync
{ {
@ -26,22 +27,27 @@ namespace QSB.EyeOfTheUniverse.VesselSync
{ {
QSBWorldSync.Init<QSBVesselWarpController, VesselWarpController>(); QSBWorldSync.Init<QSBVesselWarpController, VesselWarpController>();
_warpController = QSBWorldSync.GetWorldObjects<QSBVesselWarpController>().First(); _warpController = QSBWorldSync.GetWorldObjects<QSBVesselWarpController>().First();
_warpController.AttachedObject._cageTrigger.OnExit -= _warpController.AttachedObject.OnExitCageTrigger;
} }
public void Enter(PlayerInfo player) public void Enter(PlayerInfo player)
{ {
DebugLog.DebugWrite($"{player.PlayerId} enter");
_playersInCage.Add(player); _playersInCage.Add(player);
} }
public void Exit(PlayerInfo player) public void Exit(PlayerInfo player)
{ {
DebugLog.DebugWrite($"{player.PlayerId} exit");
_playersInCage.Remove(player); _playersInCage.Remove(player);
if (_playersInCage.Count == 0 && _warpController.AttachedObject._hasPower) if (_playersInCage.Count == 0 && _warpController.AttachedObject._hasPower)
{ {
DebugLog.DebugWrite($"NO PLAYERS LEFT"); var obj = _warpController.AttachedObject;
obj._cageClosed = true;
obj._cageAnimator.TranslateToLocalPosition(new Vector3(0f, -8.1f, 0f), 5f);
obj._cageAnimator.RotateToLocalEulerAngles(new Vector3(0f, 180f, 0f), 5f);
obj._cageAnimator.OnTranslationComplete -= obj.OnCageAnimationComplete;
obj._cageAnimator.OnTranslationComplete += obj.OnCageAnimationComplete;
obj._cageLoopingAudio.FadeIn(1f, false, false, 1f);
} }
} }
} }

View File

@ -18,7 +18,6 @@ namespace QSB.EyeOfTheUniverse.VesselSync.WorldObjects
{ {
if (hitObj.CompareTag("PlayerDetector")) if (hitObj.CompareTag("PlayerDetector"))
{ {
DebugLog.DebugWrite($"On entry");
new EnterLeaveMessage(Player.EnterLeaveType.EnterVesselCage).Send(); new EnterLeaveMessage(Player.EnterLeaveType.EnterVesselCage).Send();
} }
} }
@ -27,7 +26,6 @@ namespace QSB.EyeOfTheUniverse.VesselSync.WorldObjects
{ {
if (hitObj.CompareTag("PlayerDetector")) if (hitObj.CompareTag("PlayerDetector"))
{ {
DebugLog.DebugWrite($"On exit");
new EnterLeaveMessage(Player.EnterLeaveType.ExitVesselCage).Send(); new EnterLeaveMessage(Player.EnterLeaveType.ExitVesselCage).Send();
} }
} }

View File

@ -272,6 +272,16 @@ namespace QSB.Utility
foreach (var obj in QSBWorldSync.GetWorldObjects()) foreach (var obj in QSBWorldSync.GetWorldObjects())
{ {
if (obj == null)
{
return;
}
if (obj.ReturnObject() == null)
{
return;
}
if (obj.ShouldDisplayLabel()) if (obj.ShouldDisplayLabel())
{ {
DrawLabel(obj.ReturnObject().transform, obj.ReturnLabel()); DrawLabel(obj.ReturnObject().transform, obj.ReturnLabel());