mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-01-01 03:32:38 +00:00
Code Issues Projects Releases Wiki Activity

AnimationSync: simplify send initial state

Browse Source
This commit is contained in:
JohnCorby 2022-08-15 12:14:10 -07:00
parent 763b4177ab
commit 327e17edab
2 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
QSB/Animation/Player/AnimationSync.cs
View File

@ -8,7 +8,6 @@ using QSB.Player;
using QSB.Utility;
using QSB.WorldSync;
using System;
using System.Reflection;
using UnityEngine;
namespace QSB.Animation.Player;
@ -39,37 +38,18 @@ public class AnimationSync : PlayerSyncObject
protected void OnDestroy()
=> RequestInitialStatesMessage.SendInitialState -= SendInitialState;
private void SendInitialState(uint to)
{
if (PlayerId == to)
{
return;
}
/*
* This wipes the NetworkAnimator's "last_X_Parameters" fields, so it assumes the parameters have changed.
* Basically just forces the networkanimator to set all it's dirty flags.
* I tried just manually sending the parameter message myself, but that made the client get very angry and disconnect.
*/
var parameters = (AnimatorControllerParameter[])NetworkAnimator.GetType().GetField("parameters", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(NetworkAnimator);
var lastIntParams = NetworkAnimator.GetType().GetField("lastIntParameters", BindingFlags.NonPublic | BindingFlags.Instance);
var lastFloatParams = NetworkAnimator.GetType().GetField("lastFloatParameters", BindingFlags.NonPublic | BindingFlags.Instance);
var lastBoolParams = NetworkAnimator.GetType().GetField("lastBoolParameters", BindingFlags.NonPublic | BindingFlags.Instance);
lastIntParams.SetValue(NetworkAnimator, new int[parameters.Length]);
lastFloatParams.SetValue(NetworkAnimator, new float[parameters.Length]);
lastBoolParams.SetValue(NetworkAnimator, new bool[parameters.Length]);
}
private void SendInitialState(uint to) =>
// This wipes the NetworkAnimator's fields, so it assumes the parameters have changed.
// Basically just forces it to set all its dirty flags.
NetworkAnimator.Invoke("Awake");
private void InitCommon(Transform modelRoot)
{
try
{
if (modelRoot == null)
{
DebugLog.ToConsole($"Error - Trying to InitCommon with null body!", MessageType.Error);
DebugLog.ToConsole("Error - Trying to InitCommon with null body!", MessageType.Error);
return;
}
@ -214,4 +194,4 @@ public class AnimationSync : PlayerSyncObject
Mirror.RebuildFloatParams();
NetworkAnimator.Invoke("Awake");
}
}
}

4
QSB/SaveSync/Patches/TitleScreenManagerPatchesGamepass.cs
View File

@ -1,6 +1,6 @@
using HarmonyLib;
using OWML.Utils;
using QSB.Patches;
using System.Reflection;
using UnityEngine.UI;
namespace QSB.SaveSync.Patches;
@ -15,7 +15,7 @@ internal class TitleScreenManagerPatchesGamepass : QSBPatch
[HarmonyPatch("SetUserAccountDisplayInfo")]
public static bool SetUserAccountDisplayInfo(TitleScreenManager __instance)
{
var text = (Text)__instance.GetType().GetField("_gamertagDisplay", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(__instance);
var text = __instance.GetValue<Text>("_gamertagDisplay");
text.text = ""; // no idea why, mobius be like
text.text = QSBMSStoreProfileManager.SharedInstance.userDisplayName;
return false;