mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-02-22 21:40:39 +00:00
Code Issues Projects Releases Wiki Activity

more animation fixes (and fix orbs)

Browse Source
This commit is contained in:
Mister_Nebula 2021-04-29 23:57:55 +01:00
parent 200e344064
commit 4fae2dfa6f
6 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
QSB/Animation/NPC/CharacterAnimManager.cs
View File

@ -1,5 +1,7 @@
using QSB.Animation.NPC.WorldObjects;
using QSB.WorldSync;
using System.Linq;
using UnityEngine;
namespace QSB.Animation.NPC
{
@ -9,6 +11,10 @@ namespace QSB.Animation.NPC
{
QSBWorldSync.Init<QSBCharacterAnimController, CharacterAnimController>();
QSBWorldSync.Init<QSBTravelerController, TravelerController>();
//TODO : this is the wrong place to put this... move it to Conversations?
QSBWorldSync.OldDialogueTrees.Clear();
QSBWorldSync.OldDialogueTrees = Resources.FindObjectsOfTypeAll<CharacterDialogueTree>().ToList();
}
}
}

2
QSB/Animation/NPC/Patches/CharacterAnimationPatches.cs
View File

@ -70,7 +70,7 @@ namespace QSB.Animation.NPC.Patches
: player;
}
}
else if (!___lookOnlyWhenTalking && qsbObj.GetPlayersInHeadZone().Count != 0)
else if (!___lookOnlyWhenTalking && qsbObj.GetPlayersInHeadZone().Count != 0) // TODO : maybe this would be more fun if characters looked between players at random times? :P
{
playerToUse = QSBPlayerManager.GetClosestPlayerToWorldPoint(qsbObj.GetPlayersInHeadZone(), __instance.transform.position);
}

4
QSB/OrbSync/TransformSync/NomaiOrbTransformSync.cs
View File

@ -22,7 +22,7 @@ namespace QSB.OrbSync.TransformSync
private void OnReady()
{
if (QSBWorldSync.OldOrbList == null || QSBWorldSync.OldOrbList.Count < _index)
if (QSBWorldSync.OldOrbList == null || QSBWorldSync.OldOrbList.Count <= _index)
{
DebugLog.ToConsole($"Error - OldOrbList is null or does not contain index {_index}.", OWML.Common.MessageType.Error);
return;
@ -33,7 +33,7 @@ namespace QSB.OrbSync.TransformSync
protected override void OnDestroy()
{
OrbTransformSyncs.Remove(this);
base.OnDestroy();
QSBSceneManager.OnSceneLoaded -= OnSceneLoaded;
}
protected override void Init()

4
QSB/QSBCore.cs
View File

@ -179,7 +179,9 @@ namespace QSB
foreach (var player in QSBPlayerManager.PlayerList.Where(x => x.PlayerStates.IsReady))
{
var networkTransform = player.TransformSync;
GUI.Label(new Rect(220, offset, 400f, 20f), $"- {player.PlayerId} : {networkTransform.transform.localPosition} from {networkTransform.ReferenceSector.Name}");
var sector = networkTransform.ReferenceSector;
GUI.Label(new Rect(220, offset, 400f, 20f), $"- {player.PlayerId} : {networkTransform.transform.localPosition} from {(sector == null ? "NULL" : sector.Name)}");
offset += _debugLineSpacing;
}

10
QSB/QSBNetworkManager.cs
View File

@ -91,7 +91,6 @@ namespace QSB
spawnPrefabs.Add(_stickPrefab);
ConfigureNetworkManager();
QSBSceneManager.OnUniverseSceneLoaded += OnSceneLoaded;
}
private void SetupNetworkId(GameObject go)
@ -114,15 +113,6 @@ namespace QSB
Destroy(go.GetComponent<NetworkIdentity>());
}
public void OnDestroy() =>
QSBSceneManager.OnUniverseSceneLoaded -= OnSceneLoaded;
private void OnSceneLoaded(OWScene scene)
{
QSBWorldSync.OldDialogueTrees.Clear();
QSBWorldSync.OldDialogueTrees = Resources.FindObjectsOfTypeAll<CharacterDialogueTree>().ToList();
}
private void ConfigureNetworkManager()
{
networkAddress = QSBCore.DefaultServerIP;

2
QSB/TransformSync/UnparentedBaseTransformSync.cs
View File

@ -52,7 +52,7 @@ namespace QSB.TransformSync
QSBSceneManager.OnSceneLoaded -= OnSceneLoaded;
}
private void OnSceneLoaded(OWScene scene, bool isInUniverse) =>
protected void OnSceneLoaded(OWScene scene, bool isInUniverse) =>
_isInitialized = false;
protected virtual void Init()