Adding custom configurations of built-in scenarios

Author: LPLafontaineB

Assets/Prefabs/UI/NetworkSimulator.prefab

@@ -992,6 +992,64 @@ MonoBehaviour:
   m_ScenariosButtonText: {fileID: 4687414789391785531}
   m_LagSpikeDuration: {fileID: 8516948734797190670}
   m_OpenWindowKeyCode: 9
+  m_ConnectionsCycleScenario:
+    m_Configurations:
+    - m_ClassPreset:
+        rid: 6605000945039310848
+      m_ScriptableObjectPreset: {fileID: 0}
+      ChangeIntervalMilliseconds: 5000
+    - m_ClassPreset:
+        rid: 6605000945039310850
+      m_ScriptableObjectPreset: {fileID: 0}
+      ChangeIntervalMilliseconds: 5000
+    - m_ClassPreset:
+        rid: 6605000945039310851
+      m_ScriptableObjectPreset: {fileID: 0}
+      ChangeIntervalMilliseconds: 5000
+  m_RandomConnectionsSwapScenario:
+    ChangeIntervalMilliseconds: 5000
+    m_Configurations:
+    - m_ClassPreset:
+        rid: 6605000945039310848
+      m_ScriptableObjectPreset: {fileID: 0}
+    - m_ClassPreset:
+        rid: 6605000945039310850
+      m_ScriptableObjectPreset: {fileID: 0}
+    - m_ClassPreset:
+        rid: 6605000945039310851
+      m_ScriptableObjectPreset: {fileID: 0}
+  references:
+    version: 2
+    RefIds:
+    - rid: 6605000945039310848
+      type: {class: NetworkSimulatorPreset, ns: Unity.Multiplayer.Tools.NetworkSimulator.Runtime, asm: Unity.Multiplayer.Tools.NetworkSimulator.Runtime}
+      data:
+        <Name>k__BackingField: None
+        <Description>k__BackingField: 
+        <PacketDelayMs>k__BackingField: 0
+        <PacketJitterMs>k__BackingField: 0
+        <PacketLossInterval>k__BackingField: 0
+        <PacketLossPercent>k__BackingField: 0
+    - rid: 6605000945039310850
+      type: {class: NetworkSimulatorPreset, ns: Unity.Multiplayer.Tools.NetworkSimulator.Runtime, asm: Unity.Multiplayer.Tools.NetworkSimulator.Runtime}
+      data:
+        <Name>k__BackingField: Home Broadband [WIFI, Cable, Console, PC]
+        <Description>k__BackingField: Typical of desktop and console platforms (and
+          generally speaking most mobile players too).
+        <PacketDelayMs>k__BackingField: 32
+        <PacketJitterMs>k__BackingField: 12
+        <PacketLossInterval>k__BackingField: 0
+        <PacketLossPercent>k__BackingField: 2
+    - rid: 6605000945039310851
+      type: {class: NetworkSimulatorPreset, ns: Unity.Multiplayer.Tools.NetworkSimulator.Runtime, asm: Unity.Multiplayer.Tools.NetworkSimulator.Runtime}
+      data:
+        <Name>k__BackingField: Mobile 5G ['20]
+        <Description>k__BackingField: In many places, expect this to be 'as good
+          as' or 'better than' home broadband.
+        <PacketDelayMs>k__BackingField: 1
+        <PacketJitterMs>k__BackingField: 10
+        <PacketLossInterval>k__BackingField: 0
+        <PacketLossPercent>k__BackingField: 2
 --- !u!1 &2414270824810977563
 GameObject:
   m_ObjectHideFlags: 0
@@ -3026,7 +3084,7 @@ MonoBehaviour:
   m_Scenario:
     rid: -2
   m_IsScenarioSettingsFolded: 1
-  AutoRunScenario: 0
+  AutoRunScenario: 1
   references:
     version: 2
     RefIds:

Assets/Scripts/Gameplay/UI/NetworkSimulationUIMediator.cs

@@ -4,6 +4,7 @@
 using System.Text.RegularExpressions;
 using TMPro;
 using Unity.Multiplayer.Tools.NetworkSimulator.Runtime;
+using Unity.Multiplayer.Tools.NetworkSimulator.Runtime.BuiltInScenarios;
 using Unity.Netcode;
 using UnityEngine;
 using UnityEngine.UI;
@@ -36,6 +37,12 @@ public class NetworkSimulationUIMediator : MonoBehaviour
         [SerializeField]
         KeyCode m_OpenWindowKeyCode = KeyCode.Tilde;
 
+        [SerializeField]
+        ConnectionsCycle m_ConnectionsCycleScenario;
+
+        [SerializeField]
+        RandomConnectionsSwap m_RandomConnectionsSwapScenario;
+
         const int k_NbTouchesToOpenWindow = 5;
 
         Dictionary<string, INetworkSimulatorPreset> m_SimulatorPresets = new Dictionary<string, INetworkSimulatorPreset>();
@@ -59,25 +66,26 @@ void Awake()
             m_PresetsDropdown.AddOptions(optionData);
             m_PresetsDropdown.onValueChanged.AddListener(OnPresetChanged);
 
-            // initialize scenarios dropdown
-            var scenariosTypes = AppDomain.CurrentDomain.GetAssemblies()
-                .SelectMany(x => x.GetTypes())
-                .Where(TypeIsValidNetworkScenario)
-                .ToList();
-
+            // initialize scenario dropdown
             optionData = new List<TMP_Dropdown.OptionData>();
+
+            // Adding empty scenario
             optionData.Add(new TMP_Dropdown.OptionData(k_None));
-            foreach (var scenario in scenariosTypes)
-            {
-                var scenarioName = scenario.Name;
-                m_Scenarios[scenarioName] = (NetworkScenario) Activator.CreateInstance(scenario);
-                optionData.Add(new TMP_Dropdown.OptionData(scenarioName));
-            }
+
+            // Adding ConnectionsCycle scenario
+            var scenarioName = m_ConnectionsCycleScenario.GetType().Name;
+            m_Scenarios[scenarioName] = m_ConnectionsCycleScenario;
+            optionData.Add(new TMP_Dropdown.OptionData(scenarioName));
+
+            // Adding RandomConnectionsSwap scenario
+            scenarioName = m_RandomConnectionsSwapScenario.GetType().Name;
+            m_Scenarios[scenarioName] = m_RandomConnectionsSwapScenario;
+            optionData.Add(new TMP_Dropdown.OptionData(scenarioName));
 
             m_ScenariosDropdown.AddOptions(optionData);
             m_ScenariosDropdown.onValueChanged.AddListener(OnScenarioChanged);
 
-            // Hide UI until
+            // Hide UI until ready
             Hide();
         }