Skip to content

Commit 8160543

Browse files
feat: upgrade to NGO v1.8.1, conversion to universal Rpcs, utility assembly includes Unity.Collections [MTT-8188] (#883)
* upgrade to NGO v1.8.1, conversion to universal Rpcs, utility assembly includes Unity.Collections * fix for connected clients receiving new shutdown message from host * Utilities package also upgraded to NGO v1.8.1 * changelog additions * readme badge with NGO upgrade updated * added Server/Client prefixes for previous Rpc methods * update to Utilities changelog * using RpcTargetUse Temp since clientId may change frequently
1 parent aa73d28 commit 8160543

30 files changed

+113
-104
lines changed

Assets/Scripts/ConnectionManagement/ConnectionState/ClientConnectedState.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using System;
21
using Unity.BossRoom.UnityServices.Lobbies;
32
using UnityEngine;
43
using VContainer;
@@ -27,7 +26,8 @@ public override void Exit() { }
2726
public override void OnClientDisconnect(ulong _)
2827
{
2928
var disconnectReason = m_ConnectionManager.NetworkManager.DisconnectReason;
30-
if (string.IsNullOrEmpty(disconnectReason))
29+
if (string.IsNullOrEmpty(disconnectReason) ||
30+
disconnectReason == "Disconnected due to host shutting down.")
3131
{
3232
m_ConnectStatusPublisher.Publish(ConnectStatus.Reconnecting);
3333
m_ConnectionManager.ChangeState(m_ConnectionManager.m_ClientReconnecting);

Assets/Scripts/Gameplay/Action/ConcreteActions/AOEAction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public override bool OnStart(ServerCharacter serverCharacter)
3535
// This means we are responsible for triggering reaction-anims ourselves, which we do in PerformAoe()
3636
Data.TargetIds = new ulong[0];
3737
serverCharacter.serverAnimationHandler.NetworkAnimator.SetTrigger(Config.Anim);
38-
serverCharacter.clientCharacter.RecvDoActionClientRPC(Data);
38+
serverCharacter.clientCharacter.ClientPlayActionRpc(Data);
3939
return ActionConclusion.Continue;
4040
}
4141

Assets/Scripts/Gameplay/Action/ConcreteActions/ChargedLaunchProjectileAction.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public override bool OnStart(ServerCharacter serverCharacter)
5353
serverCharacter.serverAnimationHandler.NetworkAnimator.SetTrigger(Config.Anim);
5454

5555
// start the "charging up" ActionFX
56-
serverCharacter.clientCharacter.RecvDoActionClientRPC(Data);
56+
serverCharacter.clientCharacter.ClientPlayActionRpc(Data);
5757

5858
// sanity-check our data a bit
5959
Debug.Assert(Config.Projectiles.Length > 1, $"Action {name} has {Config.Projectiles.Length} Projectiles. Expected at least 2!");
@@ -122,7 +122,7 @@ private void StopChargingUp(ServerCharacter parent)
122122
parent.serverAnimationHandler.NetworkAnimator.SetTrigger(Config.Anim2);
123123
}
124124

125-
parent.clientCharacter.RecvStopChargingUpClientRpc(GetPercentChargedUp());
125+
parent.clientCharacter.ClientStopChargingUpRpc(GetPercentChargedUp());
126126
if (!m_HitByAttack)
127127
{
128128
LaunchProjectile(parent);

Assets/Scripts/Gameplay/Action/ConcreteActions/ChargedShieldAction.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public override bool OnStart(ServerCharacter serverCharacter)
5252
// raise the start trigger to start the animation loop!
5353
serverCharacter.serverAnimationHandler.NetworkAnimator.SetTrigger(Config.Anim);
5454

55-
serverCharacter.clientCharacter.RecvDoActionClientRPC(Data);
55+
serverCharacter.clientCharacter.ClientPlayActionRpc(Data);
5656
return true;
5757
}
5858

@@ -145,7 +145,7 @@ private void StopChargingUp(ServerCharacter parent)
145145
if (IsChargingUp())
146146
{
147147
m_StoppedChargingUpTime = Time.time;
148-
parent.clientCharacter.RecvStopChargingUpClientRpc(GetPercentChargedUp());
148+
parent.clientCharacter.ClientStopChargingUpRpc(GetPercentChargedUp());
149149

150150
parent.serverAnimationHandler.NetworkAnimator.SetTrigger(Config.Anim2);
151151

Assets/Scripts/Gameplay/Action/ConcreteActions/DashAttackAction.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public override bool OnStart(ServerCharacter serverCharacter)
3838
serverCharacter.serverAnimationHandler.NetworkAnimator.SetTrigger(Config.Anim);
3939

4040
// tell clients to visualize this action
41-
serverCharacter.clientCharacter.RecvDoActionClientRPC(Data);
41+
serverCharacter.clientCharacter.ClientPlayActionRpc(Data);
4242

4343
return ActionConclusion.Continue;
4444
}
@@ -80,7 +80,7 @@ public override void Cancel(ServerCharacter serverCharacter)
8080

8181
// because the client-side visualization of the action moves the character visualization around,
8282
// we need to explicitly end the client-side visuals when we abort
83-
serverCharacter.clientCharacter.RecvCancelActionsByPrototypeIDClientRpc(ActionID);
83+
serverCharacter.clientCharacter.ClientCancelActionsByPrototypeIDRpc(ActionID);
8484

8585
}
8686

Assets/Scripts/Gameplay/Action/ConcreteActions/FXProjectileTargetedAction.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public override bool OnStart(ServerCharacter serverCharacter)
4949

5050
serverCharacter.serverAnimationHandler.NetworkAnimator.SetTrigger(Config.Anim);
5151
// tell clients to visualize this action
52-
serverCharacter.clientCharacter.RecvDoActionClientRPC(Data);
52+
serverCharacter.clientCharacter.ClientPlayActionRpc(Data);
5353
return true;
5454
}
5555

@@ -84,7 +84,7 @@ public override void Cancel(ServerCharacter serverCharacter)
8484
{
8585
if (!m_ImpactedTarget)
8686
{
87-
serverCharacter.clientCharacter.RecvCancelActionsByPrototypeIDClientRpc(ActionID);
87+
serverCharacter.clientCharacter.ClientCancelActionsByPrototypeIDRpc(ActionID);
8888
}
8989
}
9090

Assets/Scripts/Gameplay/Action/ConcreteActions/LaunchProjectileAction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public override bool OnStart(ServerCharacter serverCharacter)
2121
serverCharacter.physicsWrapper.Transform.forward = Data.Direction;
2222

2323
serverCharacter.serverAnimationHandler.NetworkAnimator.SetTrigger(Config.Anim);
24-
serverCharacter.clientCharacter.RecvDoActionClientRPC(Data);
24+
serverCharacter.clientCharacter.ClientPlayActionRpc(Data);
2525
return true;
2626
}
2727

Assets/Scripts/Gameplay/Action/ConcreteActions/MeleeAction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public override bool OnStart(ServerCharacter serverCharacter)
5151
}
5252

5353
serverCharacter.serverAnimationHandler.NetworkAnimator.SetTrigger(Config.Anim);
54-
serverCharacter.clientCharacter.RecvDoActionClientRPC(Data);
54+
serverCharacter.clientCharacter.ClientPlayActionRpc(Data);
5555
return true;
5656
}
5757

Assets/Scripts/Gameplay/Action/ConcreteActions/StealthModeAction.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public override bool OnStart(ServerCharacter serverCharacter)
2828
{
2929
serverCharacter.serverAnimationHandler.NetworkAnimator.SetTrigger(Config.Anim);
3030

31-
serverCharacter.clientCharacter.RecvDoActionClientRPC(Data);
31+
serverCharacter.clientCharacter.ClientPlayActionRpc(Data);
3232

3333
return true;
3434
}
@@ -90,7 +90,7 @@ private void EndStealth(ServerCharacter parent)
9090
// presses the Stealth button twice in a row: "end this Stealth action and start a new one". If we cancelled
9191
// all actions of this type in Cancel(), we'd end up cancelling both the old AND the new one, because
9292
// the new one would already be in the clients' actionFX queue.
93-
parent.clientCharacter.RecvCancelActionsByPrototypeIDClientRpc(ActionID);
93+
parent.clientCharacter.ClientCancelActionsByPrototypeIDRpc(ActionID);
9494
}
9595
}
9696

Assets/Scripts/Gameplay/Action/ConcreteActions/TossAction.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public override bool OnStart(ServerCharacter serverCharacter)
4040
}
4141

4242
serverCharacter.serverAnimationHandler.NetworkAnimator.SetTrigger(Config.Anim);
43-
serverCharacter.clientCharacter.RecvDoActionClientRPC(Data);
43+
serverCharacter.clientCharacter.ClientPlayActionRpc(Data);
4444
return true;
4545
}
4646

0 commit comments

Comments
 (0)