This commit is contained in:
Mister_Nebula 2020-08-09 21:58:03 +01:00
parent 503e08cb57
commit 99064c4572
9 changed files with 26 additions and 17 deletions

View File

@ -161,14 +161,10 @@ namespace QSB.Animation
_bodyAnim.SetTrigger(trigger.ToString());
break;
case AnimTrigger.SuitUp:
_bodyAnim.runtimeAnimatorController = _suitedAnimController;
_unsuitedGraphics.SetActive(false);
_suitedGraphics.SetActive(true);
SuitUp();
break;
case AnimTrigger.SuitDown:
_bodyAnim.runtimeAnimatorController = _unsuitedAnimController;
_unsuitedGraphics.SetActive(true);
_suitedGraphics.SetActive(false);
SuitDown();
break;
case AnimTrigger.Crouch:
_crouchParam.Target = value;
@ -178,6 +174,20 @@ namespace QSB.Animation
}
}
public void SuitUp()
{
_bodyAnim.runtimeAnimatorController = _suitedAnimController;
_unsuitedGraphics.SetActive(false);
_suitedGraphics.SetActive(true);
}
public void SuitDown()
{
_bodyAnim.runtimeAnimatorController = _unsuitedAnimController;
_unsuitedGraphics.SetActive(true);
_suitedGraphics.SetActive(false);
}
private void Update()
{
if (isLocalPlayer)

View File

@ -6,6 +6,7 @@
public static void Init()
{
new PlayerSuitEvent();
new PlayerFlashlightEvent();
new PlayerSignalscopeEvent();
new PlayerTranslatorEvent();

View File

@ -26,7 +26,6 @@ namespace QSB.Events
{
return;
}
DebugLog.ToConsole($"Received game state for id {message.SenderId}");
UnityHelper.Instance.RunWhen(() => PlayerRegistry.GetTransformSync(message.SenderId) != null,
() => PlayerRegistry.HandleFullStateMessage(message));
}
@ -43,7 +42,6 @@ namespace QSB.Events
};
_messageHandler.SendToAll(message);
DebugLog.ToConsole($"* Sent state for {player.NetId}");
}
}
}

View File

@ -23,7 +23,6 @@ namespace QSB.Events
public void Request()
{
DebugLog.ToConsole("Requesting gamestate...");
StartCoroutine(SendRequest());
}
@ -39,7 +38,6 @@ namespace QSB.Events
private void OnServerReceiveMessage(PlayerStatesRequestMessage message)
{
DebugLog.ToConsole("Received request for gamestate.");
PlayerState.LocalInstance.Send();
}
}

View File

@ -46,7 +46,15 @@ namespace QSB
Translator.ChangeEquipState(FlagsHelper.IsSet(State, State.Translator));
ProbeLauncher.ChangeEquipState(FlagsHelper.IsSet(State, State.ProbeLauncher));
Signalscope.ChangeEquipState(FlagsHelper.IsSet(State, State.Signalscope));
DebugLog.ToConsole($"Suit : " + FlagsHelper.IsSet(State, State.Suit));
if (FlagsHelper.IsSet(State, State.Suit))
{
PlayerRegistry.GetAnimationSync(NetId).SuitUp();
}
else
{
PlayerRegistry.GetAnimationSync(NetId).SuitDown();
}
}
public bool GetState(State state)

View File

@ -73,7 +73,6 @@ namespace QSB.TimeSync
private void OnWakeUp()
{
PlayerRegistry.GetPlayer(netId.Value).IsReady = true;
DebugLog.ToConsole($"Set player {netId.Value} to ready.");
PlayerStatesRequest.Instance.Request();
}

View File

@ -20,7 +20,6 @@ namespace QSB.Tools
public static void Init(Transform camera)
{
DebugLog.ToConsole("Init of tools.");
_cameraBody = camera;
CreateStowTransforms();

View File

@ -17,7 +17,6 @@ namespace QSB.TransformSync
protected override Transform InitLocalTransform()
{
DebugLog.ToConsole("Local of playercamerasync " + PlayerId);
var body = Locator.GetPlayerCamera().gameObject.transform;
PlayerToolsManager.Init(body);
@ -29,7 +28,6 @@ namespace QSB.TransformSync
protected override Transform InitRemoteTransform()
{
DebugLog.ToConsole("Remote of playercamerasync " + PlayerId);
var body = new GameObject("PlayerCamera");
PlayerToolsManager.Init(body.transform);

View File

@ -24,7 +24,6 @@ namespace QSB.TransformSync
protected override Transform InitLocalTransform()
{
DebugLog.ToConsole("Local of playertransformsync " + PlayerId);
var body = GetPlayerModel();
bodyTransform = body;
@ -38,7 +37,6 @@ namespace QSB.TransformSync
protected override Transform InitRemoteTransform()
{
DebugLog.ToConsole("Remote of playertransformsync " + PlayerId);
var body = Instantiate(GetPlayerModel());
bodyTransform = body;