Adding cheat usage to message feed

LPLafontaineB · LPLafontaineB · commit f5c919fcbfdd · 2022-04-21T13:35:02.000-04:00
diff --git a/Assets/BossRoom/Prefabs/Game/StaticNetworkObjects/GlobalStaticNetworkObjects.prefab b/Assets/BossRoom/Prefabs/Game/StaticNetworkObjects/GlobalStaticNetworkObjects.prefab
@@ -99,6 +99,14 @@ PrefabInstance:
       propertyPath: m_RuntimeNetworkObjectsSeparator
       value: 
       objectReference: {fileID: 0}
+    - target: {fileID: 5762482089640033414, guid: 8b9c63e7d70c5ff48a03aad51e17103c, type: 3}
+      propertyPath: m_GameObjectsThatWillBeInjectedAutomatically.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5762482089640033414, guid: 8b9c63e7d70c5ff48a03aad51e17103c, type: 3}
+      propertyPath: m_GameObjectsThatWillBeInjectedAutomatically.Array.data[0]
+      value: 
+      objectReference: {fileID: 8528489606206953337}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8b9c63e7d70c5ff48a03aad51e17103c, type: 3}
 --- !u!4 &6803673045227533488 stripped
@@ -167,6 +175,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d026428052f506a4a99ce1b7c94c4d45, type: 3}
+--- !u!1 &8528489606206953337 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 776943915682426285, guid: d026428052f506a4a99ce1b7c94c4d45, type: 3}
+  m_PrefabInstance: {fileID: 8976529767578041044}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &6432827414648884918 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 2726635115303138402, guid: d026428052f506a4a99ce1b7c94c4d45, type: 3}
diff --git a/Assets/BossRoom/Scripts/Client/UI/UIMessageFeed.cs b/Assets/BossRoom/Scripts/Client/UI/UIMessageFeed.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
 using UnityEngine;
@@ -28,16 +27,31 @@ public class UIMessageFeed : MonoBehaviour
         DisposableGroup m_Subscriptions;
 
         [Inject]
-        void InjectDependencies(ISubscriber<DoorStateChangedEventMessage> doorStateChangedSubscriber,
+        void InjectDependencies(
+#if UNITY_EDITOR || DEVELOPMENT_BUILD
+            ISubscriber<CheatUsedMessage> cheatUsedMessageSubscriber,
+#endif
+            ISubscriber<DoorStateChangedEventMessage> doorStateChangedSubscriber,
             ISubscriber<ConnectionEventMessage> connectionEventSubscriber,
-            ISubscriber<LifeStateChangedEventMessage> lifeStateChangedEventSubscriber)
+            ISubscriber<LifeStateChangedEventMessage> lifeStateChangedEventSubscriber
+        )
         {
             m_Subscriptions = new DisposableGroup();
+#if UNITY_EDITOR || DEVELOPMENT_BUILD
+            m_Subscriptions.Add(cheatUsedMessageSubscriber.Subscribe(OnCheatUsedEvent));
+#endif
             m_Subscriptions.Add(doorStateChangedSubscriber.Subscribe(OnDoorStateChangedEvent));
             m_Subscriptions.Add(connectionEventSubscriber.Subscribe(OnConnectionEvent));
             m_Subscriptions.Add(lifeStateChangedEventSubscriber.Subscribe(OnLifeStateChangedEvent));
         }
 
+#if UNITY_EDITOR || DEVELOPMENT_BUILD
+        void OnCheatUsedEvent(CheatUsedMessage eventMessage)
+        {
+            DisplayMessage($"Cheat {eventMessage.CheatUsed} used by {eventMessage.CheaterName}");
+        }
+#endif
+
         void OnDoorStateChangedEvent(DoorStateChangedEventMessage eventMessage)
         {
             DisplayMessage(eventMessage.IsDoorOpen ? "The Door has been opened!" : "The Door is closing.");
diff --git a/Assets/BossRoom/Scripts/DebugCheats/DebugCheatsManager.cs b/Assets/BossRoom/Scripts/DebugCheats/DebugCheatsManager.cs
@@ -1,5 +1,6 @@
 using System;
 using Unity.Multiplayer.Samples.BossRoom.Server;
+using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;
 using Unity.Multiplayer.Samples.Utilities;
 using Unity.Netcode;
 using UnityEngine;
@@ -46,6 +47,14 @@ ServerSwitchedDoor ServerSwitchedDoor
 
         bool m_DestroyPortalsOnNextToggle = true;
 
+        IPublisher<CheatUsedMessage> m_CheatUsedMessagePublisher;
+
+        [Inject]
+        void InjectDependencies(IPublisher<CheatUsedMessage> publisher)
+        {
+            m_CheatUsedMessagePublisher = publisher;
+        }
+
         void Update()
         {
             if (Input.touchCount == k_NbTouchesToOpenWindow && AnyTouchDown() ||
@@ -127,15 +136,15 @@ void SpawnEnemyServerRpc(ServerRpcParams serverRpcParams = default)
         {
             var newEnemy = Instantiate(m_EnemyPrefab);
             newEnemy.SpawnWithOwnership(NetworkManager.Singleton.LocalClientId, true);
-            LogCheatUsedClientRPC(serverRpcParams.Receive.SenderClientId, "SpawnEnemy");
+            PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "SpawnEnemy");
         }
 
         [ServerRpc(RequireOwnership = false)]
         void SpawnBossServerRpc(ServerRpcParams serverRpcParams = default)
         {
             var newEnemy = Instantiate(m_BossPrefab);
             newEnemy.SpawnWithOwnership(NetworkManager.Singleton.LocalClientId, true);
-            LogCheatUsedClientRPC(serverRpcParams.Receive.SenderClientId, "SpawnBoss");
+            PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "SpawnBoss");
         }
 
         [ServerRpc(RequireOwnership = false)]
@@ -152,7 +161,7 @@ void KillTargetServerRpc(ServerRpcParams serverRpcParams = default)
                     if (damageable != null && damageable.IsDamageable())
                     {
                         damageable.ReceiveHP(playerServerCharacter, int.MinValue);
-                        LogCheatUsedClientRPC(serverRpcParams.Receive.SenderClientId, "KillTarget");
+                        PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "KillTarget");
                     }
                     else
                     {
@@ -176,7 +185,7 @@ void KillAllEnemiesServerRpc(ServerRpcParams serverRpcParams = default)
                     }
                 }
             }
-            LogCheatUsedClientRPC(serverRpcParams.Receive.SenderClientId, "KillAllEnemies");
+            PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "KillAllEnemies");
         }
 
         [ServerRpc(RequireOwnership = false)]
@@ -187,7 +196,7 @@ void ToggleGodModeServerRpc(ServerRpcParams serverRpcParams = default)
             if (playerServerCharacter != null)
             {
                 playerServerCharacter.NetState.NetworkLifeState.IsGodMode.Value = !playerServerCharacter.NetState.NetworkLifeState.IsGodMode.Value;
-                LogCheatUsedClientRPC(clientId, "ToggleGodMode");
+                PublishCheatUsedMessage(clientId, "ToggleGodMode");
             }
         }
 
@@ -210,7 +219,7 @@ void HealPlayerServerRpc(ServerRpcParams serverRpcParams = default)
                         damageable.ReceiveHP(null, baseHp);
                     }
                 }
-                LogCheatUsedClientRPC(serverRpcParams.Receive.SenderClientId, "HealPlayer");
+                PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "HealPlayer");
             }
         }
 
@@ -226,7 +235,7 @@ void ToggleSuperSpeedServerRpc(ServerRpcParams serverRpcParams = default)
                     break;
                 }
             }
-            LogCheatUsedClientRPC(clientId, "ToggleSuperSpeed");
+            PublishCheatUsedMessage(clientId, "ToggleSuperSpeed");
         }
 
         [ServerRpc(RequireOwnership = false)]
@@ -241,7 +250,7 @@ void ToggleTeleportModeServerRpc(ServerRpcParams serverRpcParams = default)
                     break;
                 }
             }
-            LogCheatUsedClientRPC(serverRpcParams.Receive.SenderClientId, "ToggleTeleportMode");
+            PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "ToggleTeleportMode");
         }
 
         [ServerRpc(RequireOwnership = false)]
@@ -250,7 +259,7 @@ void ToggleDoorServerRpc(ServerRpcParams serverRpcParams = default)
             if (ServerSwitchedDoor != null)
             {
                 ServerSwitchedDoor.ForceOpen = !ServerSwitchedDoor.ForceOpen;
-                LogCheatUsedClientRPC(serverRpcParams.Receive.SenderClientId, "ToggleDoor");
+                PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "ToggleDoor");
             }
             else
             {
@@ -277,20 +286,23 @@ void TogglePortalsServerRpc(ServerRpcParams serverRpcParams = default)
             }
 
             m_DestroyPortalsOnNextToggle = !m_DestroyPortalsOnNextToggle;
-            LogCheatUsedClientRPC(serverRpcParams.Receive.SenderClientId, "TogglePortals");
+            PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "TogglePortals");
         }
 
         [ServerRpc(RequireOwnership = false)]
         void GoToPostGameServerRpc(ServerRpcParams serverRpcParams = default)
         {
             SceneLoaderWrapper.Instance.LoadScene("PostGame", useNetworkSceneManager: true);
-            LogCheatUsedClientRPC(serverRpcParams.Receive.SenderClientId, "GoToPostGame");
+            PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "GoToPostGame");
         }
 
-        [ClientRpc]
-        void LogCheatUsedClientRPC(ulong clientId, string cheatUsed)
+        void PublishCheatUsedMessage(ulong clientId, string cheatUsed)
         {
-            UnityEngine.Debug.Log($"Cheat {cheatUsed} used by client {clientId}");
+            var playerData = SessionManager<SessionPlayerData>.Instance.GetPlayerData(clientId);
+            if (playerData.HasValue)
+            {
+                m_CheatUsedMessagePublisher.Publish(new CheatUsedMessage(cheatUsed, playerData.Value.PlayerName));
+            }
         }
 
         static void LogCheatNotImplemented(string cheat)
diff --git a/Assets/BossRoom/Scripts/Shared/ApplicationController.cs b/Assets/BossRoom/Scripts/Shared/ApplicationController.cs
@@ -47,20 +47,18 @@ private void Awake()
             scope.BindAsSingle<LocalLobbyUser>();
             scope.BindAsSingle<LocalLobby>();
 
-            //this message channel is essential and persists for the lifetime of the lobby and relay services
+            //these message channels are essential and persist for the lifetime of the lobby and relay services
             scope.BindMessageChannelInstance<UnityServiceErrorMessage>();
-
-            //this message channel is essential and persists for the lifetime of the lobby and relay services
             scope.BindMessageChannelInstance<ConnectStatus>();
-
-            //this message channel is essential and persists for the lifetime of the lobby and relay services
             scope.BindMessageChannelInstance<DoorStateChangedEventMessage>();
 
-            //this message channel is essential and persists for the lifetime of the lobby and relay services
+            //these message channels are essential and persist for the lifetime of the lobby and relay services
+            //they are networked so that the clients can subscribe to those messages that are published by the server
             scope.BindNetworkedMessageChannelInstance<LifeStateChangedEventMessage>();
-
-            //this message channel is essential and persists for the lifetime of the lobby and relay services
             scope.BindNetworkedMessageChannelInstance<ConnectionEventMessage>();
+#if UNITY_EDITOR || DEVELOPMENT_BUILD
+            scope.BindNetworkedMessageChannelInstance<CheatUsedMessage>();
+#endif
 
             //buffered message channels hold the latest received message in buffer and pass to any new subscribers
             scope.BindBufferedMessageChannelInstance<LobbyListFetchedMessage>();
diff --git a/Assets/BossRoom/Scripts/Shared/Game/GameEventMessage.cs b/Assets/BossRoom/Scripts/Shared/Game/GameEventMessage.cs
@@ -1,3 +1,5 @@
+using Unity.Collections;
+
 namespace Unity.Multiplayer.Samples.BossRoom
 {
     public struct LifeStateChangedEventMessage
@@ -17,4 +19,22 @@ public struct ConnectionEventMessage
         public ConnectStatus ConnectStatus;
         public FixedPlayerName PlayerName;
     }
+
+
+#if UNITY_EDITOR || DEVELOPMENT_BUILD
+    public struct CheatUsedMessage
+    {
+        FixedString32Bytes m_CheatUsed;
+        FixedPlayerName m_CheaterName;
+
+        public string CheatUsed => m_CheatUsed.ToString();
+        public string CheaterName => m_CheaterName.ToString();
+
+        public CheatUsedMessage(string cheatUsed, string cheaterName)
+        {
+            m_CheatUsed = cheatUsed;
+            m_CheaterName = cheaterName;
+        }
+    }
+#endif
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using Unity.Multiplayer.Samples.BossRoom.Server;`
	`3`	`+using Unity.Multiplayer.Samples.BossRoom.Shared.Infrastructure;`
`3`	`4`	`using Unity.Multiplayer.Samples.Utilities;`
`4`	`5`	`using Unity.Netcode;`
`5`	`6`	`using UnityEngine;`
`@@ -46,6 +47,14 @@ ServerSwitchedDoor ServerSwitchedDoor`
`46`	`47`
`47`	`48`	`bool m_DestroyPortalsOnNextToggle = true;`
`48`	`49`
	`50`	`+ IPublisher<CheatUsedMessage> m_CheatUsedMessagePublisher;`
	`51`	`+`
	`52`	`+ [Inject]`
	`53`	`+ void InjectDependencies(IPublisher<CheatUsedMessage> publisher)`
	`54`	`+ {`
	`55`	`+ m_CheatUsedMessagePublisher = publisher;`
	`56`	`+ }`
	`57`	`+`
`49`	`58`	`void Update()`
`50`	`59`	`{`
`51`	`60`	`if (Input.touchCount == k_NbTouchesToOpenWindow && AnyTouchDown() \|\|`
`@@ -127,15 +136,15 @@ void SpawnEnemyServerRpc(ServerRpcParams serverRpcParams = default)`
`127`	`136`	`{`
`128`	`137`	`var newEnemy = Instantiate(m_EnemyPrefab);`
`129`	`138`	`newEnemy.SpawnWithOwnership(NetworkManager.Singleton.LocalClientId, true);`
`130`		`- LogCheatUsedClientRPC(serverRpcParams.Receive.SenderClientId, "SpawnEnemy");`
	`139`	`+ PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "SpawnEnemy");`
`131`	`140`	`}`
`132`	`141`
`133`	`142`	`[ServerRpc(RequireOwnership = false)]`
`134`	`143`	`void SpawnBossServerRpc(ServerRpcParams serverRpcParams = default)`
`135`	`144`	`{`
`136`	`145`	`var newEnemy = Instantiate(m_BossPrefab);`
`137`	`146`	`newEnemy.SpawnWithOwnership(NetworkManager.Singleton.LocalClientId, true);`
`138`		`- LogCheatUsedClientRPC(serverRpcParams.Receive.SenderClientId, "SpawnBoss");`
	`147`	`+ PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "SpawnBoss");`
`139`	`148`	`}`
`140`	`149`
`141`	`150`	`[ServerRpc(RequireOwnership = false)]`
`@@ -152,7 +161,7 @@ void KillTargetServerRpc(ServerRpcParams serverRpcParams = default)`
`152`	`161`	`if (damageable != null && damageable.IsDamageable())`
`153`	`162`	`{`
`154`	`163`	`damageable.ReceiveHP(playerServerCharacter, int.MinValue);`
`155`		`- LogCheatUsedClientRPC(serverRpcParams.Receive.SenderClientId, "KillTarget");`
	`164`	`+ PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "KillTarget");`
`156`	`165`	`}`
`157`	`166`	`else`
`158`	`167`	`{`
`@@ -176,7 +185,7 @@ void KillAllEnemiesServerRpc(ServerRpcParams serverRpcParams = default)`
`176`	`185`	`}`
`177`	`186`	`}`
`178`	`187`	`}`
`179`		`- LogCheatUsedClientRPC(serverRpcParams.Receive.SenderClientId, "KillAllEnemies");`
	`188`	`+ PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "KillAllEnemies");`
`180`	`189`	`}`
`181`	`190`
`182`	`191`	`[ServerRpc(RequireOwnership = false)]`
`@@ -187,7 +196,7 @@ void ToggleGodModeServerRpc(ServerRpcParams serverRpcParams = default)`
`187`	`196`	`if (playerServerCharacter != null)`
`188`	`197`	`{`
`189`	`198`	`playerServerCharacter.NetState.NetworkLifeState.IsGodMode.Value = !playerServerCharacter.NetState.NetworkLifeState.IsGodMode.Value;`
`190`		`- LogCheatUsedClientRPC(clientId, "ToggleGodMode");`
	`199`	`+ PublishCheatUsedMessage(clientId, "ToggleGodMode");`
`191`	`200`	`}`
`192`	`201`	`}`
`193`	`202`
`@@ -210,7 +219,7 @@ void HealPlayerServerRpc(ServerRpcParams serverRpcParams = default)`
`210`	`219`	`damageable.ReceiveHP(null, baseHp);`
`211`	`220`	`}`
`212`	`221`	`}`
`213`		`- LogCheatUsedClientRPC(serverRpcParams.Receive.SenderClientId, "HealPlayer");`
	`222`	`+ PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "HealPlayer");`
`214`	`223`	`}`
`215`	`224`	`}`
`216`	`225`
`@@ -226,7 +235,7 @@ void ToggleSuperSpeedServerRpc(ServerRpcParams serverRpcParams = default)`
`226`	`235`	`break;`
`227`	`236`	`}`
`228`	`237`	`}`
`229`		`- LogCheatUsedClientRPC(clientId, "ToggleSuperSpeed");`
	`238`	`+ PublishCheatUsedMessage(clientId, "ToggleSuperSpeed");`
`230`	`239`	`}`
`231`	`240`
`232`	`241`	`[ServerRpc(RequireOwnership = false)]`
`@@ -241,7 +250,7 @@ void ToggleTeleportModeServerRpc(ServerRpcParams serverRpcParams = default)`
`241`	`250`	`break;`
`242`	`251`	`}`
`243`	`252`	`}`
`244`		`- LogCheatUsedClientRPC(serverRpcParams.Receive.SenderClientId, "ToggleTeleportMode");`
	`253`	`+ PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "ToggleTeleportMode");`
`245`	`254`	`}`
`246`	`255`
`247`	`256`	`[ServerRpc(RequireOwnership = false)]`
`@@ -250,7 +259,7 @@ void ToggleDoorServerRpc(ServerRpcParams serverRpcParams = default)`
`250`	`259`	`if (ServerSwitchedDoor != null)`
`251`	`260`	`{`
`252`	`261`	`ServerSwitchedDoor.ForceOpen = !ServerSwitchedDoor.ForceOpen;`
`253`		`- LogCheatUsedClientRPC(serverRpcParams.Receive.SenderClientId, "ToggleDoor");`
	`262`	`+ PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "ToggleDoor");`
`254`	`263`	`}`
`255`	`264`	`else`
`256`	`265`	`{`
`@@ -277,20 +286,23 @@ void TogglePortalsServerRpc(ServerRpcParams serverRpcParams = default)`
`277`	`286`	`}`
`278`	`287`
`279`	`288`	`m_DestroyPortalsOnNextToggle = !m_DestroyPortalsOnNextToggle;`
`280`		`- LogCheatUsedClientRPC(serverRpcParams.Receive.SenderClientId, "TogglePortals");`
	`289`	`+ PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "TogglePortals");`
`281`	`290`	`}`
`282`	`291`
`283`	`292`	`[ServerRpc(RequireOwnership = false)]`
`284`	`293`	`void GoToPostGameServerRpc(ServerRpcParams serverRpcParams = default)`
`285`	`294`	`{`
`286`	`295`	`SceneLoaderWrapper.Instance.LoadScene("PostGame", useNetworkSceneManager: true);`
`287`		`- LogCheatUsedClientRPC(serverRpcParams.Receive.SenderClientId, "GoToPostGame");`
	`296`	`+ PublishCheatUsedMessage(serverRpcParams.Receive.SenderClientId, "GoToPostGame");`
`288`	`297`	`}`
`289`	`298`
`290`		`- [ClientRpc]`
`291`		`- void LogCheatUsedClientRPC(ulong clientId, string cheatUsed)`
	`299`	`+ void PublishCheatUsedMessage(ulong clientId, string cheatUsed)`
`292`	`300`	`{`
`293`		`- UnityEngine.Debug.Log($"Cheat {cheatUsed} used by client {clientId}");`
	`301`	`+ var playerData = SessionManager<SessionPlayerData>.Instance.GetPlayerData(clientId);`
	`302`	`+ if (playerData.HasValue)`
	`303`	`+ {`
	`304`	`+ m_CheatUsedMessagePublisher.Publish(new CheatUsedMessage(cheatUsed, playerData.Value.PlayerName));`
	`305`	`+ }`
`294`	`306`	`}`
`295`	`307`
`296`	`308`	`static void LogCheatNotImplemented(string cheat)`