Skip to content

Commit 0ec8343

Browse files
NoelStephensUnityNoelStephensUnity
committed
style: Mutli to Multi
Changed all occurrences of Mutli to Multi
1 parent 4a4d142 commit 0ec8343

File tree

4 files changed

+75
-70
lines changed

4 files changed

+75
-70
lines changed

‎testproject/Assets/ManualTests/ClientCounterBehaviour.cs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ public class ClientCounterBehaviour : NetworkBehaviour
3737
private List<ulong> m_ClientIds = new List<ulong>();
3838
private List<ulong> m_ClientIndices = new List<ulong>();
3939

40-
private bool m_MutliParameterCanSend;
40+
private bool m_MultiParameterCanSend;
4141

42-
private int m_MutliParameterIntValue;
43-
private int m_MutliParameterValuesCount;
44-
private int m_MutliParameterNoneCount;
42+
private int m_MultiParameterIntValue;
43+
private int m_MultiParameterValuesCount;
44+
private int m_MultiParameterNoneCount;
4545
private int m_RpcMessagesSent;
4646
private int m_GlobalCounter;
4747
private int m_GlobalDirectCounter;
@@ -51,10 +51,10 @@ public class ClientCounterBehaviour : NetworkBehaviour
5151
private int m_RpcPerSecond;
5252
private int m_GlobalDirectScale;
5353

54-
private long m_MutliParameterLongValue;
54+
private long m_MultiParameterLongValue;
5555
private ulong m_LocalClientId;
5656

57-
private float m_MutliParameterFloatValue;
57+
private float m_MultiParameterFloatValue;
5858
private float m_GlobalCounterDelay;
5959
private float m_DirectGlobalCounterDelay;
6060
private float m_LocalCounterDelay;
@@ -130,7 +130,7 @@ private void InitializeNetworkManager()
130130
m_ClientParamsMultiParameter.Send.TargetClientIds = new ulong[] { 0 };
131131
m_ClientRpcDirectTestingMode = ClientRpcDirectTestingModes.Single;
132132
m_ConnectionModeButtonParent.SetActive(false);
133-
m_MutliParameterCanSend = true;
133+
m_MultiParameterCanSend = true;
134134

135135
m_GlobalDirectScale = 2;
136136
m_GlobalDirectFrequency = 1.0f / (100.0f / (float)m_GlobalDirectScale);
@@ -297,16 +297,16 @@ private void Update()
297297
else if (m_LocalMultiDelay < Time.realtimeSinceStartup)
298298
{
299299
m_LocalMultiDelay = Time.realtimeSinceStartup + 0.325f;
300-
if (m_MutliParameterCanSend)
300+
if (m_MultiParameterCanSend)
301301
{
302-
m_MutliParameterCanSend = false;
302+
m_MultiParameterCanSend = false;
303303
//Multi Parameters
304-
OnSendMultiParametersServerRpc(m_MutliParameterIntValue, m_MutliParameterFloatValue, m_MutliParameterLongValue);
304+
OnSendMultiParametersServerRpc(m_MultiParameterIntValue, m_MultiParameterFloatValue, m_MultiParameterLongValue);
305305
m_RpcMessagesSent++;
306306
}
307307
else
308308
{
309-
m_MutliParameterCanSend = true;
309+
m_MultiParameterCanSend = true;
310310
OnSendNoParametersServerRpc();
311311
m_RpcMessagesSent++;
312312
}
@@ -487,7 +487,7 @@ private void OnSendMultiParametersServerRpc(int count, float floatValue, long lo
487487
[ClientRpc]
488488
private void OnSendNoParametersClientRpc(ClientRpcParams parameters = default)
489489
{
490-
m_MutliParameterNoneCount++;
490+
m_MultiParameterNoneCount++;
491491
}
492492

493493

@@ -499,17 +499,17 @@ private void OnSendNoParametersClientRpc(ClientRpcParams parameters = default)
499499
[ClientRpc]
500500
private void OnSendMultiParametersClientRpc(int count, float floatValue, long longValue, ClientRpcParams parameters = default)
501501
{
502-
if (m_MutliParameterIntValue == count && floatValue == m_MutliParameterFloatValue && m_MutliParameterLongValue == longValue)
502+
if (m_MultiParameterIntValue == count && floatValue == m_MultiParameterFloatValue && m_MultiParameterLongValue == longValue)
503503
{
504-
m_MutliParameterValuesCount++;
504+
m_MultiParameterValuesCount++;
505505
}
506506
else
507507
{
508-
m_MutliParameterValuesCount--;
508+
m_MultiParameterValuesCount--;
509509
}
510-
m_MutliParameterIntValue = Random.Range(0, 100);
511-
m_MutliParameterFloatValue = Random.Range(0.0f, 1.0f);
512-
m_MutliParameterLongValue = (long)Random.Range(0, 10000);
510+
m_MultiParameterIntValue = Random.Range(0, 100);
511+
m_MultiParameterFloatValue = Random.Range(0.0f, 1.0f);
512+
m_MultiParameterLongValue = (long)Random.Range(0, 10000);
513513
}
514514

515515
/// <summary>
@@ -569,7 +569,7 @@ private void UpdateClientInfo()
569569
}
570570

571571
m_CounterTextObject.text = $"Client-ID [{m_LocalClientId}] Broadcast Rpcs Received: {m_GlobalCounter - m_GlobalCounterOffset} | Direct Rpcs Received: {m_GlobalDirectCounter} \n";
572-
m_CounterTextObject.text += $"{nameof(m_MutliParameterValuesCount)} : {m_MutliParameterValuesCount} | {nameof(m_MutliParameterNoneCount)} : {m_MutliParameterNoneCount}";
572+
m_CounterTextObject.text += $"{nameof(m_MultiParameterValuesCount)} : {m_MultiParameterValuesCount} | {nameof(m_MultiParameterNoneCount)} : {m_MultiParameterNoneCount}";
573573

574574
if (m_ClientProgressBar)
575575
{
@@ -588,7 +588,7 @@ private void UpdateServerInfo()
588588
if (entry.Key == 0 && IsHost)
589589
{
590590
updatedCounters += $"Client-ID [{entry.Key}] Client to Server Rpcs Received: {entry.Value} | Broadcast Rpcs Sent:{m_GlobalCounter} -- Direct Rpcs Sent:{m_GlobalDirectCounter}\n";
591-
updatedCounters += $"{nameof(m_MutliParameterValuesCount)} : {m_MutliParameterValuesCount} | {nameof(m_MutliParameterNoneCount)} : {m_MutliParameterNoneCount}\n";
591+
updatedCounters += $"{nameof(m_MultiParameterValuesCount)} : {m_MultiParameterValuesCount} | {nameof(m_MultiParameterNoneCount)} : {m_MultiParameterNoneCount}\n";
592592
updatedCounters += $"{nameof(m_RpcPerSecond)} : {m_RpcPerSecond}\n ";
593593
}
594594
else

‎testproject/Packages/manifest.json

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11
{
2-
"dependencies": {
3-
"com.unity.collab-proxy": "1.2.16",
4-
"com.unity.ide.rider": "1.1.4",
5-
"com.unity.ide.vscode": "1.2.3",
6-
"com.unity.multiplayer.mlapi": "file:../../com.unity.multiplayer.mlapi",
7-
"com.unity.package-validation-suite": "0.19.2-preview",
8-
"com.unity.test-framework": "1.1.19",
9-
"com.unity.textmeshpro": "2.1.1",
10-
"com.unity.timeline": "1.2.17",
11-
"com.unity.ugui": "1.0.0",
12-
"com.unity.modules.ai": "1.0.0",
13-
"com.unity.modules.androidjni": "1.0.0",
14-
"com.unity.modules.animation": "1.0.0",
15-
"com.unity.modules.assetbundle": "1.0.0",
16-
"com.unity.modules.audio": "1.0.0",
17-
"com.unity.modules.cloth": "1.0.0",
18-
"com.unity.modules.director": "1.0.0",
19-
"com.unity.modules.imageconversion": "1.0.0",
20-
"com.unity.modules.imgui": "1.0.0",
21-
"com.unity.modules.jsonserialize": "1.0.0",
22-
"com.unity.modules.particlesystem": "1.0.0",
23-
"com.unity.modules.physics": "1.0.0",
24-
"com.unity.modules.physics2d": "1.0.0",
25-
"com.unity.modules.screencapture": "1.0.0",
26-
"com.unity.modules.terrain": "1.0.0",
27-
"com.unity.modules.terrainphysics": "1.0.0",
28-
"com.unity.modules.tilemap": "1.0.0",
29-
"com.unity.modules.ui": "1.0.0",
30-
"com.unity.modules.uielements": "1.0.0",
31-
"com.unity.modules.umbra": "1.0.0",
32-
"com.unity.modules.unityanalytics": "1.0.0",
33-
"com.unity.modules.unitywebrequest": "1.0.0",
34-
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
35-
"com.unity.modules.unitywebrequestaudio": "1.0.0",
36-
"com.unity.modules.unitywebrequesttexture": "1.0.0",
37-
"com.unity.modules.unitywebrequestwww": "1.0.0",
38-
"com.unity.modules.vehicles": "1.0.0",
39-
"com.unity.modules.video": "1.0.0",
40-
"com.unity.modules.vr": "1.0.0",
41-
"com.unity.modules.wind": "1.0.0",
42-
"com.unity.modules.xr": "1.0.0"
43-
},
44-
"testables": [
45-
"com.unity.multiplayer.mlapi"
46-
]
47-
}
48-
2+
"dependencies": {
3+
"com.unity.collab-proxy": "1.3.9",
4+
"com.unity.ide.rider": "2.0.7",
5+
"com.unity.ide.visualstudio": "2.0.7",
6+
"com.unity.ide.vscode": "1.2.3",
7+
"com.unity.multiplayer.mlapi": "file:../../com.unity.multiplayer.mlapi",
8+
"com.unity.package-validation-suite": "0.19.2-preview",
9+
"com.unity.test-framework": "1.1.22",
10+
"com.unity.textmeshpro": "3.0.1",
11+
"com.unity.timeline": "1.4.6",
12+
"com.unity.ugui": "1.0.0",
13+
"com.unity.modules.ai": "1.0.0",
14+
"com.unity.modules.androidjni": "1.0.0",
15+
"com.unity.modules.animation": "1.0.0",
16+
"com.unity.modules.assetbundle": "1.0.0",
17+
"com.unity.modules.audio": "1.0.0",
18+
"com.unity.modules.cloth": "1.0.0",
19+
"com.unity.modules.director": "1.0.0",
20+
"com.unity.modules.imageconversion": "1.0.0",
21+
"com.unity.modules.imgui": "1.0.0",
22+
"com.unity.modules.jsonserialize": "1.0.0",
23+
"com.unity.modules.particlesystem": "1.0.0",
24+
"com.unity.modules.physics": "1.0.0",
25+
"com.unity.modules.physics2d": "1.0.0",
26+
"com.unity.modules.screencapture": "1.0.0",
27+
"com.unity.modules.terrain": "1.0.0",
28+
"com.unity.modules.terrainphysics": "1.0.0",
29+
"com.unity.modules.tilemap": "1.0.0",
30+
"com.unity.modules.ui": "1.0.0",
31+
"com.unity.modules.uielements": "1.0.0",
32+
"com.unity.modules.umbra": "1.0.0",
33+
"com.unity.modules.unityanalytics": "1.0.0",
34+
"com.unity.modules.unitywebrequest": "1.0.0",
35+
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
36+
"com.unity.modules.unitywebrequestaudio": "1.0.0",
37+
"com.unity.modules.unitywebrequesttexture": "1.0.0",
38+
"com.unity.modules.unitywebrequestwww": "1.0.0",
39+
"com.unity.modules.vehicles": "1.0.0",
40+
"com.unity.modules.video": "1.0.0",
41+
"com.unity.modules.vr": "1.0.0",
42+
"com.unity.modules.wind": "1.0.0",
43+
"com.unity.modules.xr": "1.0.0"
44+
},
45+
"testables": [
46+
"com.unity.multiplayer.mlapi"
47+
]
48+
}

‎testproject/ProjectSettings/PackageManagerSettings.asset

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@ MonoBehaviour:
99
m_GameObject: {fileID: 0}
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
12-
m_Script: {fileID: 13960, guid: 0000000000000000e000000000000000, type: 0}
12+
m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
1313
m_Name:
1414
m_EditorClassIdentifier:
15+
m_EnablePreviewPackages: 0
16+
m_EnablePackageDependencies: 0
17+
m_AdvancedSettingsExpanded: 1
1518
m_ScopedRegistriesSettingsExpanded: 1
1619
oneTimeWarningShown: 0
1720
m_Registries:
@@ -20,6 +23,7 @@ MonoBehaviour:
2023
m_Url: https://packages.unity.com
2124
m_Scopes: []
2225
m_IsDefault: 1
26+
m_Capabilities: 7
2327
m_UserSelectedRegistryName:
2428
m_UserAddingNewScopedRegistry: 0
2529
m_RegistryInfoDraft:
@@ -30,6 +34,7 @@ MonoBehaviour:
3034
m_Url:
3135
m_Scopes: []
3236
m_IsDefault: 0
37+
m_Capabilities: 0
3338
m_Modified: 0
3439
m_Name:
3540
m_Url:

‎testproject/ProjectSettings/ProjectVersion.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2019.4.17f1
2-
m_EditorVersionWithRevision: 2019.4.17f1 (667c8606c536)
1+
m_EditorVersion: 2020.3.0f1
2+
m_EditorVersionWithRevision: 2020.3.0f1 (c7b5465681fb)

0 commit comments

Comments
 (0)