Skip to content

Commit 1013182

Browse files
committed
moving prebuilt scenarios configurations to serialized fields
1 parent 549de82 commit 1013182

File tree

2 files changed

+76
-5
lines changed

2 files changed

+76
-5
lines changed

Assets/Prefabs/UI/NetworkSimulator.prefab

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -780,6 +780,62 @@ MonoBehaviour:
780780
m_ScenariosButtonText: {fileID: 3849933660557125965}
781781
m_LagSpikeDuration: {fileID: 8516948734797190670}
782782
m_OpenWindowKeyCode: 9
783+
m_ConnectionsCycleConfigurations:
784+
- m_ClassPreset:
785+
rid: 7422095132946857998
786+
m_ScriptableObjectPreset: {fileID: 0}
787+
ChangeIntervalMilliseconds: 5000
788+
- m_ClassPreset:
789+
rid: 7422095132946858000
790+
m_ScriptableObjectPreset: {fileID: 0}
791+
ChangeIntervalMilliseconds: 5000
792+
- m_ClassPreset:
793+
rid: 7422095132946858002
794+
m_ScriptableObjectPreset: {fileID: 0}
795+
ChangeIntervalMilliseconds: 5000
796+
m_RandomConnectionsSwapConfigurations:
797+
- m_ClassPreset:
798+
rid: 7422095132946857998
799+
m_ScriptableObjectPreset: {fileID: 0}
800+
- m_ClassPreset:
801+
rid: 7422095132946858000
802+
m_ScriptableObjectPreset: {fileID: 0}
803+
- m_ClassPreset:
804+
rid: 7422095132946858002
805+
m_ScriptableObjectPreset: {fileID: 0}
806+
m_RandomConnectionsSwapChangeIntervalMilliseconds: 5000
807+
references:
808+
version: 2
809+
RefIds:
810+
- rid: 7422095132946857998
811+
type: {class: NetworkSimulatorPreset, ns: Unity.Multiplayer.Tools.NetworkSimulator.Runtime, asm: Unity.Multiplayer.Tools.NetworkSimulator.Runtime}
812+
data:
813+
<Name>k__BackingField: None
814+
<Description>k__BackingField:
815+
<PacketDelayMs>k__BackingField: 0
816+
<PacketJitterMs>k__BackingField: 0
817+
<PacketLossInterval>k__BackingField: 0
818+
<PacketLossPercent>k__BackingField: 0
819+
- rid: 7422095132946858000
820+
type: {class: NetworkSimulatorPreset, ns: Unity.Multiplayer.Tools.NetworkSimulator.Runtime, asm: Unity.Multiplayer.Tools.NetworkSimulator.Runtime}
821+
data:
822+
<Name>k__BackingField: Home Broadband [WIFI, Cable, Console, PC]
823+
<Description>k__BackingField: Typical of desktop and console platforms (and
824+
generally speaking most mobile players too).
825+
<PacketDelayMs>k__BackingField: 32
826+
<PacketJitterMs>k__BackingField: 12
827+
<PacketLossInterval>k__BackingField: 0
828+
<PacketLossPercent>k__BackingField: 2
829+
- rid: 7422095132946858002
830+
type: {class: NetworkSimulatorPreset, ns: Unity.Multiplayer.Tools.NetworkSimulator.Runtime, asm: Unity.Multiplayer.Tools.NetworkSimulator.Runtime}
831+
data:
832+
<Name>k__BackingField: Mobile 5G ['20]
833+
<Description>k__BackingField: In many places, expect this to be 'as good
834+
as' or 'better than' home broadband.
835+
<PacketDelayMs>k__BackingField: 30
836+
<PacketJitterMs>k__BackingField: 20
837+
<PacketLossInterval>k__BackingField: 0
838+
<PacketLossPercent>k__BackingField: 4
783839
--- !u!1 &2169802932728833146
784840
GameObject:
785841
m_ObjectHideFlags: 0

Assets/Scripts/Utils/NetworkSimulatorUIMediator.cs

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,15 @@ public class NetworkSimulatorUIMediator : MonoBehaviour
3838
[SerializeField]
3939
KeyCode m_OpenWindowKeyCode = KeyCode.Tilde;
4040

41+
[SerializeField]
42+
List<ConnectionsCycle.Configuration> m_ConnectionsCycleConfigurations;
43+
44+
[SerializeField]
45+
List<RandomConnectionsSwap.Configuration> m_RandomConnectionsSwapConfigurations;
46+
47+
[SerializeField]
48+
int m_RandomConnectionsSwapChangeIntervalMilliseconds;
49+
4150
const int k_NbTouchesToOpenWindow = 5;
4251

4352
Dictionary<string, INetworkSimulatorPreset> m_SimulatorPresets = new Dictionary<string, INetworkSimulatorPreset>();
@@ -106,14 +115,20 @@ void OnScenarioChanged(int optionIndex)
106115
break;
107116
case k_ConnectionCyclesScenarioName:
108117
scenario = new ConnectionsCycle();
109-
((ConnectionsCycle) scenario).Configurations.Add(new ConnectionsCycle.Configuration() { ChangeIntervalMilliseconds = 5000, ConnectionPreset = NetworkSimulatorPresets.HomeBroadband });
110-
((ConnectionsCycle) scenario).Configurations.Add(new ConnectionsCycle.Configuration() { ChangeIntervalMilliseconds = 5000, ConnectionPreset = NetworkSimulatorPresets.Mobile5G });
118+
((ConnectionsCycle) scenario).Configurations.Clear();
119+
foreach (var configuration in m_ConnectionsCycleConfigurations)
120+
{
121+
((ConnectionsCycle) scenario).Configurations.Add(configuration);
122+
}
111123
break;
112124
case k_RandomConnectionSwapScenarioName:
113125
scenario = new RandomConnectionsSwap();
114-
((RandomConnectionsSwap) scenario).ChangeIntervalMilliseconds = 5000;
115-
((RandomConnectionsSwap) scenario).Configurations.Add(new RandomConnectionsSwap.Configuration() { ConnectionPreset = NetworkSimulatorPresets.HomeBroadband });
116-
((RandomConnectionsSwap) scenario).Configurations.Add(new RandomConnectionsSwap.Configuration() { ConnectionPreset = NetworkSimulatorPresets.Mobile5G });
126+
((RandomConnectionsSwap) scenario).Configurations.Clear();
127+
foreach (var configuration in m_RandomConnectionsSwapConfigurations)
128+
{
129+
((RandomConnectionsSwap) scenario).Configurations.Add(configuration);
130+
}
131+
((RandomConnectionsSwap) scenario).ChangeIntervalMilliseconds = m_RandomConnectionsSwapChangeIntervalMilliseconds;
117132
break;
118133
default:
119134
Debug.LogError("Invalid Scenario selected.");

0 commit comments

Comments
 (0)